Skip to content

Commit ed0ac32

Browse files
committed
fix golangci reported issuers
Signed-off-by: Martin Schuppert <[email protected]>
1 parent 5aff398 commit ed0ac32

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

tests/functional/ctlplane/base_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ func CreateCertSecret(name types.NamespacedName) *k8s_corev1.Secret {
496496
key, _ := base64.StdEncoding.DecodeString(keyBase64)
497497

498498
s := &k8s_corev1.Secret{}
499-
Eventually(func(g Gomega) {
499+
Eventually(func(_ Gomega) {
500500
s = th.CreateSecret(
501501
name,
502502
map[string][]byte{
@@ -512,7 +512,7 @@ func CreateCertSecret(name types.NamespacedName) *k8s_corev1.Secret {
512512
func CreateClusterConfigCM() client.Object {
513513
var cm client.Object
514514

515-
Eventually(func(g Gomega) {
515+
Eventually(func(_ Gomega) {
516516
cm = th.CreateConfigMap(
517517
types.NamespacedName{
518518
Name: "cluster-config-v1",
@@ -636,7 +636,7 @@ func SimulateControlplaneReady() {
636636
}
637637

638638
// simulate pod ready for openstackclient
639-
Eventually(func(g Gomega) {
639+
Eventually(func(_ Gomega) {
640640
th.SimulatePodReady(names.OpenStackClientName)
641641
th.Logger.Info("Simulated OpenStackClient ready")
642642

tests/functional/ctlplane/openstackoperator_controller_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ var _ = Describe("OpenStackOperator controller", func() {
585585
Expect(OSCtlplane.Spec.TLS.PodLevel.Enabled).Should(BeFalse())
586586

587587
// creates selfsigned issuer
588-
Eventually(func(g Gomega) {
588+
Eventually(func(_ Gomega) {
589589
crtmgr.GetIssuer(names.SelfSignedIssuerName)
590590
}, timeout, interval).Should(Succeed())
591591

@@ -852,7 +852,7 @@ var _ = Describe("OpenStackOperator controller", func() {
852852
Expect(OSCtlplane.Spec.TLS.PodLevel.Enabled).Should(BeTrue())
853853

854854
// creates selfsigned issuer
855-
Eventually(func(g Gomega) {
855+
Eventually(func(_ Gomega) {
856856
crtmgr.GetIssuer(names.SelfSignedIssuerName)
857857
}, timeout, interval).Should(Succeed())
858858

@@ -1137,12 +1137,12 @@ var _ = Describe("OpenStackOperator controller", func() {
11371137

11381138
It("should have OpenStackControlPlaneCAReadyCondition ready when custom issuer exist", func() {
11391139
// creates selfsigned issuer
1140-
Eventually(func(g Gomega) {
1140+
Eventually(func(_ Gomega) {
11411141
crtmgr.GetIssuer(names.SelfSignedIssuerName)
11421142
}, timeout, interval).Should(Succeed())
11431143

11441144
// does not create public CA, as custom issuer is used
1145-
Eventually(func(g Gomega) {
1145+
Eventually(func(_ Gomega) {
11461146
crtmgr.AssertCertDoesNotExist(names.RootCAPublicName)
11471147
}, timeout, interval).Should(Succeed())
11481148

@@ -1371,7 +1371,7 @@ var _ = Describe("OpenStackOperator controller", func() {
13711371
keystone.SimulateKeystoneAPIReady(names.KeystoneAPIName)
13721372

13731373
// expect the ready status to propagate to control plane object
1374-
Eventually(func(g Gomega) {
1374+
Eventually(func(_ Gomega) {
13751375
th.ExpectCondition(
13761376
names.OpenStackControlplaneName,
13771377
ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
@@ -1446,7 +1446,7 @@ var _ = Describe("OpenStackOperator controller", func() {
14461446
}, timeout, interval).Should(Succeed())
14471447

14481448
// expect the ready status to propagate to control plane object
1449-
Eventually(func(g Gomega) {
1449+
Eventually(func(_ Gomega) {
14501450
th.ExpectCondition(
14511451
names.OpenStackControlplaneName,
14521452
ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
@@ -1486,7 +1486,7 @@ var _ = Describe("OpenStackOperator controller", func() {
14861486
}, timeout, interval).Should(Succeed())
14871487

14881488
// expect the ready status to propagate to control plane object
1489-
Eventually(func(g Gomega) {
1489+
Eventually(func(_ Gomega) {
14901490
th.ExpectCondition(
14911491
names.OpenStackControlplaneName,
14921492
ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
@@ -1553,7 +1553,7 @@ var _ = Describe("OpenStackOperator controller", func() {
15531553
}, timeout, interval).Should(Succeed())
15541554

15551555
// expect the ready status to propagate to control plane object
1556-
Eventually(func(g Gomega) {
1556+
Eventually(func(_ Gomega) {
15571557
th.ExpectCondition(
15581558
names.OpenStackControlplaneName,
15591559
ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
@@ -1593,7 +1593,7 @@ var _ = Describe("OpenStackOperator controller", func() {
15931593
}, timeout, interval).Should(Succeed())
15941594

15951595
// expect the ready status to propagate to control plane object
1596-
Eventually(func(g Gomega) {
1596+
Eventually(func(_ Gomega) {
15971597
th.ExpectCondition(
15981598
names.OpenStackControlplaneName,
15991599
ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
@@ -1660,7 +1660,7 @@ var _ = Describe("OpenStackOperator controller", func() {
16601660
ovn.SimulateOVNControllerReady(names.OVNControllerName)
16611661

16621662
// expect the ready status to propagate to control plane object
1663-
Eventually(func(g Gomega) {
1663+
Eventually(func(_ Gomega) {
16641664
th.ExpectCondition(
16651665
names.OpenStackControlplaneName,
16661666
ConditionGetterFunc(OpenStackControlPlaneConditionGetter),

0 commit comments

Comments
 (0)