E2E: retries in CopyConfigMap func

Author: jackfrancis

test/e2e/cni.go

@@ -55,7 +55,7 @@ func InstallCalicoHelmChart(ctx context.Context, input clusterctl.ApplyClusterTe
 	workloadClusterClient := clusterProxy.GetClient()
 
 	// Copy the kubeadm configmap to the calico-system namespace. This is a workaround needed for the calico-node-windows daemonset to be able to run in the calico-system namespace.
-	CopyConfigMap(ctx, workloadClusterClient, kubeadmConfigMapName, kubesystem, CalicoSystemNamespace)
+	CopyConfigMap(ctx, input, workloadClusterClient, kubeadmConfigMapName, kubesystem, CalicoSystemNamespace)
 
 	By("Waiting for Ready tigera-operator deployment pods")
 	for _, d := range []string{"tigera-operator"} {

test/e2e/helpers.go

@@ -986,14 +986,16 @@ func InstallHelmChart(ctx context.Context, input clusterctl.ApplyClusterTemplate
 	}
 }
 
-func CopyConfigMap(ctx context.Context, cl client.Client, cmName, fromNamespace, toNamespace string) {
+func CopyConfigMap(ctx context.Context, input clusterctl.ApplyClusterTemplateAndWaitInput, cl client.Client, cmName, fromNamespace, toNamespace string) {
 	cm := &corev1.ConfigMap{}
-	Expect(cl.Get(ctx, client.ObjectKey{Name: cmName, Namespace: fromNamespace}, cm)).To(Succeed())
-	cm.SetNamespace(toNamespace)
-	cm.SetResourceVersion("")
-	framework.EnsureNamespace(ctx, cl, toNamespace)
-	err := cl.Create(ctx, cm.DeepCopy())
-	if !apierrors.IsAlreadyExists(err) {
-		Expect(err).To(Succeed())
-	}
+	Eventually(func(g Gomega) {
+		g.Expect(cl.Get(ctx, client.ObjectKey{Name: cmName, Namespace: fromNamespace}, cm)).To(Succeed())
+		cm.SetNamespace(toNamespace)
+		cm.SetResourceVersion("")
+		framework.EnsureNamespace(ctx, cl, toNamespace)
+		err := cl.Create(ctx, cm.DeepCopy())
+		if !apierrors.IsAlreadyExists(err) {
+			g.Expect(err).To(Succeed())
+		}
+	}, input.WaitForControlPlaneIntervals...).Should(Succeed())
 }