test(e2e): wait for pull secret rollout

Signed-off-by: Sertac Ozercan <sozercan@gmail.com>

Author: sozercan

test/e2e/tests/helm_pull_secret/eraser_test.go

@@ -18,10 +18,6 @@ import (
 	"sigs.k8s.io/e2e-framework/pkg/features"
 )
 
-const (
-	minimumExpectedPods = 4
-)
-
 func TestHelmPullSecret(t *testing.T) {
 	pullSecretsPropagated := features.New("Image Pull Secrets").
 		Assess("All pods should have the correct pull secret", func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
@@ -31,44 +27,45 @@ func TestHelmPullSecret(t *testing.T) {
 			}
 
 			err = wait.For(
-				util.MinPodsPresentForLabel(ctx, c, 3, util.ImageJobTypeLabelKey+"="+util.CollectorLabel),
-				wait.WithTimeout(time.Minute*2),
-				wait.WithInterval(time.Millisecond*500),
-			)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			var ls corev1.PodList
-			err = c.Resources().List(ctx, &ls, func(o *metav1.ListOptions) {
-				o.LabelSelector = labels.SelectorFromSet(map[string]string{util.ImageJobTypeLabelKey: util.CollectorLabel}).String()
-			})
-			if err != nil {
-				t.Errorf("could not list pods: %v", err)
-			}
+				func() (bool, error) {
+					var collectors corev1.PodList
+					if err := c.Resources().List(ctx, &collectors, func(o *metav1.ListOptions) {
+						o.LabelSelector = labels.SelectorFromSet(map[string]string{util.ImageJobTypeLabelKey: util.CollectorLabel}).String()
+					}); err != nil {
+						return false, err
+					}
 
-			var ls2 corev1.PodList
-			err = c.Resources().List(ctx, &ls2, func(o *metav1.ListOptions) {
-				o.LabelSelector = labels.SelectorFromSet(map[string]string{"control-plane": "controller-manager"}).String()
-			})
+					var managers corev1.PodList
+					if err := c.Resources().List(ctx, &managers, func(o *metav1.ListOptions) {
+						o.LabelSelector = labels.SelectorFromSet(map[string]string{"control-plane": "controller-manager"}).String()
+					}); err != nil {
+						return false, err
+					}
 
-			items := append(ls.Items, ls2.Items...)
-			if len(items) < minimumExpectedPods {
-				t.Errorf("incorrect number of pods for eraser deployment. should be at least %d but was %d", minimumExpectedPods, len(items))
-			}
+					if len(collectors.Items) < 3 || len(managers.Items) < 1 {
+						return false, nil
+					}
 
-			for _, pod := range items {
-				found := false
-				for _, secret := range pod.Spec.ImagePullSecrets {
-					if secret.Name == util.ImagePullSecret {
-						found = true
-						break
+					for _, pod := range append(collectors.Items, managers.Items...) {
+						found := false
+						for _, secret := range pod.Spec.ImagePullSecrets {
+							if secret.Name == util.ImagePullSecret {
+								found = true
+								break
+							}
+						}
+						if !found {
+							return false, nil
+						}
 					}
-				}
 
-				if !found {
-					t.Errorf("pod %s does not have secret set", pod.ObjectMeta.Name)
-				}
+					return true, nil
+				},
+				wait.WithTimeout(time.Minute*2),
+				wait.WithInterval(time.Millisecond*500),
+			)
+			if err != nil {
+				t.Fatal(err)
 			}
 
 			return ctx

test/e2e/util/utils.go

@@ -419,18 +419,6 @@ func NumPodsPresentForLabel(ctx context.Context, client klient.Client, num int,
 	}
 }
 
-func MinPodsPresentForLabel(ctx context.Context, client klient.Client, num int, label string) func() (bool, error) {
-	return func() (bool, error) {
-		var pods corev1.PodList
-		err := client.Resources().List(ctx, &pods, resources.WithLabelSelector(label))
-		if err != nil {
-			return false, err
-		}
-
-		return len(pods.Items) >= num, nil
-	}
-}
-
 func ContainerNotPresentOnNode(nodeName, containerName string) func() (bool, error) {
 	return func() (bool, error) {
 		output, err := ListNodeContainers(nodeName)