E2E: Extract waiting for CNI DaemonSet to be ready

This is repetitive and verbose, extracting this makes the tests easier to
read and maintain.

Signed-off-by: Mike Kolesnik <[email protected]>

Author: mkolesnik

tests/e2e/multicluster/multicluster_multiprimary_test.go

@@ -106,23 +106,8 @@ values:
 					})
 
 					It("deploys istio-cni-node", func(ctx SpecContext) {
-						Eventually(func() bool {
-							daemonset := &appsv1.DaemonSet{}
-							if err := clPrimary.Get(ctx, kube.Key("istio-cni-node", istioCniNamespace), daemonset); err != nil {
-								return false
-							}
-							return daemonset.Status.NumberAvailable == daemonset.Status.CurrentNumberScheduled
-						}).Should(BeTrue(), "CNI DaemonSet Pods are not Available on Cluster #1")
-						Success("CNI DaemonSet is deployed in the namespace and Running on Cluster #1")
-
-						Eventually(func() bool {
-							daemonset := &appsv1.DaemonSet{}
-							if err := clRemote.Get(ctx, kube.Key("istio-cni-node", istioCniNamespace), daemonset); err != nil {
-								return false
-							}
-							return daemonset.Status.NumberAvailable == daemonset.Status.CurrentNumberScheduled
-						}).Should(BeTrue(), "IstioCNI DaemonSet Pods are not Available on Cluster #2")
-						Success("IstioCNI DaemonSet is deployed in the namespace and Running on Cluster #2")
+						common.AwaitCniDaemonSet(ctx, k1, clPrimary)
+						common.AwaitCniDaemonSet(ctx, k2, clRemote)
 					})
 				})
 

tests/e2e/multicluster/multicluster_primaryremote_test.go

@@ -111,14 +111,7 @@ values:
 					})
 
 					It("deploys istio-cni-node", func(ctx SpecContext) {
-						Eventually(func() bool {
-							daemonset := &appsv1.DaemonSet{}
-							if err := clPrimary.Get(ctx, kube.Key("istio-cni-node", istioCniNamespace), daemonset); err != nil {
-								return false
-							}
-							return daemonset.Status.NumberAvailable == daemonset.Status.CurrentNumberScheduled
-						}).Should(BeTrue(), "IstioCNI DaemonSet Pods are not Available on Primary Cluster")
-						Success("IstioCNI DaemonSet is deployed in the namespace and Running on Primary Cluster")
+						common.AwaitCniDaemonSet(ctx, k1, clPrimary)
 					})
 				})
 

tests/e2e/util/common/checks.go

@@ -83,3 +83,16 @@ func CheckPodsReady(ctx context.Context, cl client.Client, namespace string) err
 func CheckSamplePodsReady(ctx context.Context, cl client.Client) error {
 	return CheckPodsReady(ctx, cl, sampleNamespace)
 }
+
+// AwaitCniDaemonSet to be deployed and reach the scheduled number of pods.
+func AwaitCniDaemonSet(ctx context.Context, k kubectl.Kubectl, cl client.Client) {
+	key := kube.Key("istio-cni-node", istioCniNamespace)
+	Eventually(func() bool {
+		daemonset := &appsv1.DaemonSet{}
+		if err := cl.Get(ctx, key, daemonset); err != nil {
+			return false
+		}
+		return daemonset.Status.NumberAvailable == daemonset.Status.CurrentNumberScheduled
+	}).Should(BeTrue(), fmt.Sprintf("DaemonSet '%s' is not Available in the '%s' namespace on %s cluster", key.Name, key.Namespace, k.ClusterName))
+	Success(fmt.Sprintf("DaemonSet '%s' is deployed and running in the '%s' namespace on %s cluster", key.Name, key.Namespace, k.ClusterName))
+}