Adding loop retry for strictAffinity

knabben · Apr 7, 2024 · 7478467 · 7478467
1 parent 7f8245a
commit 7478467
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/pkg/pwsh/setup/setup.go b/pkg/pwsh/setup/setup.go
@@ -243,9 +243,8 @@ func (r *Runner) InstallCNI(calicoVersion, cpKubernetes, controlPlaneIP string)
 		{"kubectl", "create", "-f", "./specs/installation.yaml"},
 		{"kubectl", "create", "-f", cpTempFile},
 		{"kubectl", "create", "-f", kpTempFile},
-		{"sleep 10"},
-		{"kubectl", "patch", "ipamconfig", "default", "--type", "merge", "--patch=" + string(templates.GetSpecAffinity())},
 	}
+
 	for i := 0; i <= len(steps)-1; i++ {
 		cmd := strings.Join(steps[i], " ")
 		resc.Printf("Running: %v\n", cmd)
@@ -254,5 +253,20 @@ func (r *Runner) InstallCNI(calicoVersion, cpKubernetes, controlPlaneIP string)
 		}
 	}
 
+	// strictAffinity exists after the Installation object ready, this can take a while
+	// try in loop each 10 seconds.
+loop:
+	for {
+		select {
+		case <-time.After(10 * time.Second):
+			cmd := []string{"kubectl", "patch", "ipamconfig", "default", "--type", "merge", "--patch='" + string(templates.GetSpecAffinity()) + "'"}
+			if err := r.runL(strings.Join(cmd, " ")); err != nil {
+				bad.Printf("calico error: %v\n", err)
+			} else {
+				break loop
+			}
+		}
+	}
+
 	return nil
 }
diff --git a/samples/config.yaml b/samples/config.yaml
@@ -6,7 +6,7 @@ spec:
   calicoVersion: v3.27.3
   controlPlane:
     kubernetesVersion: v1.28.3
-    minikube: false
+    minikube: true
   workload:
     containerdVersion: 1.7.14
     kubernetesVersion: v1.29.0