fix: split service account from ExpectApplied (#190)

* split service account from ExpectApplied

* change polling time

* align function naming

* check namespace object instead of pod

Author: ryan-mist

test/expectations/expectations.go

@@ -102,14 +102,6 @@ func ExpectNotFound(ctx context.Context, c client.Client, objects ...client.Obje
 func ExpectApplied(ctx context.Context, c client.Client, objects ...client.Object) {
 	GinkgoHelper()
 	for _, object := range objects {
-		// If the object is a pod, ensure the default service account exists to avoid flaky tests
-		// https://github.com/kubernetes/kubernetes/issues/66689
-		if pod, ok := object.(*v1.Pod); ok {
-			Eventually(func(g Gomega) {
-				g.Expect(c.Get(ctx, apitypes.NamespacedName{Namespace: pod.Namespace, Name: "default"}, &v1.ServiceAccount{})).Error().NotTo(HaveOccurred())
-			}).WithTimeout(1 * time.Minute).WithPolling(10 * time.Second).Should(Succeed())
-		}
-
 		deletionTimestampSet := !object.GetDeletionTimestamp().IsZero()
 		current := object.DeepCopyObject().(client.Object)
 		statusCopy := object.DeepCopyObject().(client.Object) // Snapshot the status, since create/update may override
@@ -135,6 +127,14 @@ func ExpectApplied(ctx context.Context, c client.Client, objects ...client.Objec
 			}
 		}, "2s", "400ms").Should(Succeed())
 
+		// If the object is a namespace, ensure the default service account exists to avoid flaky tests
+		// https://github.com/kubernetes/kubernetes/issues/66689
+		if namespace, ok := object.(*v1.Namespace); ok {
+			Eventually(func(g Gomega) {
+				g.Expect(c.Get(ctx, apitypes.NamespacedName{Namespace: namespace.Name, Name: "default"}, &v1.ServiceAccount{})).Error().NotTo(HaveOccurred())
+			}).WithTimeout(1 * time.Minute).WithPolling(1 * time.Second).Should(Succeed())
+		}
+
 		// Re-get the object to grab the updated spec and status
 		Expect(c.Get(ctx, client.ObjectKeyFromObject(object), object)).To(Succeed())