Fix flaky wait in CRS test

kubernetes-sigs · Mar 22, 2023 · ead4629 · ead4629
1 parent 8ecf669
commit ead4629
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/exp/addons/internal/controllers/clusterresourceset_controller_test.go b/exp/addons/internal/controllers/clusterresourceset_controller_test.go
@@ -916,14 +916,6 @@ metadata:
 		ns := setup(t, g)
 		defer teardown(t, g, ns)
 
-		kubernetesAPIServerService := &corev1.Service{
-			TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: "v1"},
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "kubernetes",
-				Namespace: metav1.NamespaceDefault,
-			},
-		}
-
 		fakeService := &corev1.Service{
 			TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: "v1"},
 			ObjectMeta: metav1.ObjectMeta{
@@ -941,8 +933,9 @@ metadata:
 			},
 		}
 
+		kubernetesAPIServerService := &corev1.Service{}
 		t.Log("Verifying Kubernetes API Server Service has been created")
-		g.Expect(env.Get(ctx, client.ObjectKeyFromObject(kubernetesAPIServerService), kubernetesAPIServerService)).To(Succeed())
+		g.Expect(env.Get(ctx, client.ObjectKey{Name: "kubernetes", Namespace: metav1.NamespaceDefault}, kubernetesAPIServerService)).To(Succeed())
 
 		fakeService.Spec.ClusterIP = kubernetesAPIServerService.Spec.ClusterIP
 
@@ -958,7 +951,7 @@ metadata:
 			}
 			return nil
 		}, timeout).Should(Succeed())
-		g.Expect(apierrors.IsNotFound(env.Get(ctx, client.ObjectKeyFromObject(kubernetesAPIServerService), kubernetesAPIServerService))).To(BeTrue())
+		g.Expect(apierrors.IsNotFound(env.Get(ctx, client.ObjectKeyFromObject(kubernetesAPIServerService), &corev1.Service{}))).To(BeTrue())
 
 		clusterResourceSetInstance := &addonsv1.ClusterResourceSet{
 			ObjectMeta: metav1.ObjectMeta{
@@ -991,6 +984,8 @@ metadata:
 
 		t.Log("Make sure Kubernetes API Server Service has been created")
 		g.Expect(env.Delete(ctx, fakeService)).Should(Succeed())
+		kubernetesAPIServerService.ResourceVersion = ""
+		g.Expect(env.Create(ctx, kubernetesAPIServerService)).Should(Succeed())
 		g.Eventually(func() bool {
 			err := env.Get(ctx, client.ObjectKeyFromObject(kubernetesAPIServerService), kubernetesAPIServerService)
 			return err == nil