Fix kubeconfig flakes

Signed-off-by: Nelo-T. Wallus <red.brush9525@fastmail.com>
Signed-off-by: Nelo-T. Wallus <n.wallus@sap.com>

Author: ntnn

providers/kubeconfig/provider_test.go

@@ -209,12 +209,12 @@ var _ = Describe("Provider Namespace", Ordered, func() {
 	})
 
 	It("runs the reconciler for existing objects", func(ctx context.Context) {
-		Eventually(func(g Gomega) string {
+		Eventually(func(g Gomega) {
 			lion := &corev1.ConfigMap{}
 			err := zooCli.Get(ctx, client.ObjectKey{Namespace: "zoo", Name: "lion"}, lion)
 			g.Expect(err).NotTo(HaveOccurred())
-			return lion.Data["stomach"]
-		}, "10s").Should(Equal("food"))
+			g.Expect(lion.Data["stomach"]).To(Equal("food"))
+		}, "10s")
 	})
 
 	It("runs the reconciler for new objects", func(ctx context.Context) {
@@ -223,12 +223,12 @@ var _ = Describe("Provider Namespace", Ordered, func() {
 			Expect(err).NotTo(HaveOccurred())
 		})
 
-		Eventually(func(g Gomega) string {
+		Eventually(func(g Gomega) {
 			tiger := &corev1.ConfigMap{}
 			err := zooCli.Get(ctx, client.ObjectKey{Namespace: "zoo", Name: "tiger"}, tiger)
 			g.Expect(err).NotTo(HaveOccurred())
-			return tiger.Data["stomach"]
-		}, "10s").Should(Equal("food"))
+			g.Expect(tiger.Data["stomach"]).To(Equal("food"))
+		}, "10s")
 	})
 
 	It("runs the reconciler for updated objects", func(ctx context.Context) {
@@ -243,24 +243,25 @@ var _ = Describe("Provider Namespace", Ordered, func() {
 			})
 			Expect(err).NotTo(HaveOccurred())
 		})
-		rv, err := strconv.ParseInt(updated.ResourceVersion, 10, 64)
+		origRv, err := strconv.ParseInt(updated.ResourceVersion, 10, 64)
 		Expect(err).NotTo(HaveOccurred())
 
-		Eventually(func(g Gomega) int64 {
+		Eventually(func(g Gomega) {
 			elephant := &corev1.ConfigMap{}
 			err := zooCli.Get(ctx, client.ObjectKey{Namespace: "zoo", Name: "elephant"}, elephant)
 			g.Expect(err).NotTo(HaveOccurred())
 			rv, err := strconv.ParseInt(elephant.ResourceVersion, 10, 64)
 			g.Expect(err).NotTo(HaveOccurred())
-			return rv
-		}, "10s").Should(BeNumerically(">=", rv))
+			g.Expect(rv).To(BeNumerically(">=", origRv))
+		}, "10s")
 
 		Eventually(func(g Gomega) string {
 			elephant := &corev1.ConfigMap{}
 			err := zooCli.Get(ctx, client.ObjectKey{Namespace: "zoo", Name: "elephant"}, elephant)
 			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(elephant.Data["stomach"]).To(Equal("food"))
 			return elephant.Data["stomach"]
-		}, "10s").Should(Equal("food"))
+		}, "10s")
 	})
 
 	It("queries one cluster via a multi-cluster index", func() {
@@ -292,12 +293,12 @@ var _ = Describe("Provider Namespace", Ordered, func() {
 		err = jungleCli.Create(ctx, &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Namespace: "jungle", Name: "dog", Labels: map[string]string{"type": "animal"}}})
 		Expect(err).NotTo(HaveOccurred())
 
-		Eventually(func(g Gomega) string {
+		Eventually(func(g Gomega) {
 			dog := &corev1.ConfigMap{}
 			err := jungleCli.Get(ctx, client.ObjectKey{Namespace: "jungle", Name: "dog"}, dog)
 			g.Expect(err).NotTo(HaveOccurred())
-			return dog.Data["stomach"]
-		}, "10s").Should(Equal("food"))
+			g.Expect(dog.Data["stomach"]).To(Equal("food"))
+		}, "10s")
 	})
 
 	It("reconciles objects when kubeconfig secret is updated without changing the cluster", func() {
@@ -314,12 +315,12 @@ var _ = Describe("Provider Namespace", Ordered, func() {
 		err = jungleCli.Create(ctx, &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Namespace: "jungle", Name: "leopard", Labels: map[string]string{"type": "animal"}}})
 		Expect(err).NotTo(HaveOccurred())
 
-		Eventually(func(g Gomega) string {
+		Eventually(func(g Gomega) {
 			leopard := &corev1.ConfigMap{}
 			err := jungleCli.Get(ctx, client.ObjectKey{Namespace: "jungle", Name: "leopard"}, leopard)
 			g.Expect(err).NotTo(HaveOccurred())
-			return leopard.Data["stomach"]
-		}, "10s").Should(Equal("food"))
+			g.Expect(leopard.Data["stomach"]).To(Equal("food"))
+		}, "10s")
 	})
 
 	It("removes a cluster from the provider when the kubeconfig secret is deleted", func() {