Create regular capl and ipv6 dual stack cluster in parallel to optimize the workflow time

Author: komer3

.github/workflows/ci.yml

@@ -113,18 +113,8 @@ jobs:
       - name: Install devbox
         uses: jetify-com/devbox-install-action@v0.14.0
 
-      - name: Docker Build and Push CCM Image
-        run: devbox run build-and-push
-
-      - name: Setup CAPL Management Kind Cluster
-        run: devbox run mgmt-cluster
-
-        # Temp running this before all the other e2e tests
-      - name: Setup Dual Stack Cluster and IPv6 backend e2e test
-        run: devbox run e2e-test-ipv6-backends
-          
-      - name: Setup CAPL Cluster
-        run: devbox run capl-cluster
+      - name: Setup CAPL Management Kind Cluster and CAPL Child Cluster For Testing
+        run: devbox run mgmt-and-capl-cluster
 
       - name: Run E2E Tests
         run: devbox run e2e-test
@@ -135,9 +125,6 @@ jobs:
       - name: Run subnet filtering test
         run: devbox run e2e-test-subnet
 
-      - name: Run node addition e2e test
-        run: devbox run e2e-test-node-addition
-
       - name: Cleanup Resources
         if: always()
         run: devbox run cleanup-cluster

Makefile

@@ -165,10 +165,13 @@ run-debug: build
 #####################################################################
 
 .PHONY: mgmt-and-capl-cluster
-mgmt-and-capl-cluster: build-and-push mgmt-cluster capl-cluster
+mgmt-and-capl-cluster: mgmt-cluster
+	$(MAKE) -j2 capl-ipv6-cluster capl-cluster
 
 .PHONY: capl-cluster
-capl-cluster: generate-capl-cluster-manifests create-capl-cluster
+capl-cluster: generate-capl-cluster-manifests
+	MANIFEST_NAME=$(MANIFEST_NAME) CLUSTER_NAME=$(CLUSTER_NAME) KUBECONFIG_PATH=$(KUBECONFIG_PATH) \
+		$(MAKE) create-capl-cluster
 
 .PHONY: capl-ipv6-cluster
 capl-ipv6-cluster: generate-capl-ipv6-cluster-manifests
@@ -232,6 +235,8 @@ cleanup-cluster:
 
 .PHONY: e2e-test
 e2e-test:
+    # Run ipv6 tests first and then the rest
+	$(MAKE) e2e-test-ipv6-backends
 	CLUSTER_NAME=$(CLUSTER_NAME) \
 	MGMT_KUBECONFIG=$(MGMT_KUBECONFIG_PATH) \
 	KUBECONFIG=$(KUBECONFIG_PATH) \
@@ -241,7 +246,7 @@ e2e-test:
 	chainsaw test e2e/test --parallel 2 --selector all $(E2E_FLAGS)
 
 .PHONY: e2e-test-ipv6-backends
-e2e-test-ipv6-backends: capl-ipv6-cluster
+e2e-test-ipv6-backends:
 	CLUSTER_NAME=$(IPV6_CLUSTER_NAME) \
 	MGMT_KUBECONFIG=$(MGMT_KUBECONFIG_PATH) \
 	KUBECONFIG=$(IPV6_KUBECONFIG_PATH) \
@@ -250,16 +255,6 @@ e2e-test-ipv6-backends: capl-ipv6-cluster
 	LINODE_URL=$(LINODE_URL) \
 	chainsaw test e2e/test --selector ipv6-backends $(E2E_FLAGS)
 
-.PHONY: e2e-test-node-addition
-e2e-test-node-addition:
-	CLUSTER_NAME=$(CLUSTER_NAME) \
-	MGMT_KUBECONFIG=$(MGMT_KUBECONFIG_PATH) \
-	KUBECONFIG=$(KUBECONFIG_PATH) \
-	REGION=$(LINODE_REGION) \
-	LINODE_TOKEN=$(LINODE_TOKEN) \
-	LINODE_URL=$(LINODE_URL) \
-	chainsaw test e2e/test --selector node-addition $(E2E_FLAGS)
-
 .PHONY: e2e-test-bgp
 e2e-test-bgp:
 	KUBECONFIG=$(KUBECONFIG_PATH) CLUSTER_SUFFIX=$(CLUSTER_NAME) ./e2e/setup/cilium-setup.sh

devbox.json

@@ -26,7 +26,6 @@
       "capl-ipv6-cluster": "make capl-ipv6-cluster",
       "e2e-test": "make e2e-test",
       "e2e-test-ipv6-backends": "make e2e-test-ipv6-backends",
-      "e2e-test-node-addition": "make e2e-test-node-addition",
       "e2e-test-bgp": "make e2e-test-bgp",
       "e2e-test-subnet": "make e2e-test-subnet",
       "cleanup-cluster": "make cleanup-cluster"

e2e/test/lb-with-node-addition/chainsaw-test.yaml

@@ -4,7 +4,7 @@ kind: Test
 metadata:
   name: lb-with-node-addition
   labels:
-    node-addition:
+    all:
 spec:
   namespace: "lb-with-node-addition"
   catch:
@@ -74,43 +74,15 @@ spec:
     - name: Add new node and check nodebalancer gets updated
       try:
         - script:
-            timeout: 20m
+            timeout: 10m
             content: |
               set -euo pipefail
 
-              md_info=$(KUBECONFIG=$MGMT_KUBECONFIG kubectl get machinedeployments.cluster.x-k8s.io -A -l cluster.x-k8s.io/cluster-name=${CLUSTER_NAME} -o jsonpath='{range .items[*]}{.metadata.namespace}{"\t"}{.metadata.name}{"\n"}{end}')
-              md_count=$(echo "$md_info" | sed '/^$/d' | wc -l | tr -d ' ')
-
-              if [[ "$md_count" -ne 1 ]]; then
-                  echo "Expected exactly one worker MachineDeployment, found: $md_count"
-                  echo "$md_info"
-                  exit 1
-              fi
-
-              md_namespace=$(echo "$md_info" | awk 'NF {print $1; exit}')
-              md_name=$(echo "$md_info" | awk 'NF {print $2; exit}')
-              echo "Using MachineDeployment ${md_namespace}/${md_name}"
-
-              current_replicas=$(KUBECONFIG=$MGMT_KUBECONFIG kubectl -n "$md_namespace" get machinedeployment "$md_name" -o=jsonpath='{.spec.replicas}')
+              current_replicas=$(KUBECONFIG=$MGMT_KUBECONFIG kubectl get machinedeployment ${CLUSTER_NAME}-md-0 -o=jsonpath='{.spec.replicas}')
               required_replicas=$((current_replicas + 1))
-              KUBECONFIG=$MGMT_KUBECONFIG kubectl -n "$md_namespace" patch machinedeployment "$md_name" --type='merge' -p "{\"spec\":{\"replicas\":$required_replicas}}"
-
-              for i in {1..20}; do
-                  ready_replicas=$(KUBECONFIG=$MGMT_KUBECONFIG kubectl -n "$md_namespace" get machinedeployment "$md_name" -o=jsonpath='{.status.readyReplicas}')
-                  echo "MachineDeployment ready replicas: ${ready_replicas:-0}/$required_replicas"
-
-                  if [[ ${ready_replicas:-0} -ge $required_replicas ]]; then
-                      echo "machine deployment scaled"
-                      break
-                  fi
-
-                  sleep 30
-              done
+              KUBECONFIG=$MGMT_KUBECONFIG kubectl patch machinedeployment ${CLUSTER_NAME}-md-0 --type='merge' -p "{\"spec\":{\"replicas\":$required_replicas}}"
 
-              if [[ ${ready_replicas:-0} -lt $required_replicas ]]; then
-                  echo "MachineDeployment did not reach required ready replicas"
-                  exit 1
-              fi
+              sleep 180
 
               nbid=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh)
               echo "Nodebalancer ID: $nbid"
@@ -139,7 +111,7 @@ spec:
                   fi
               done
 
-              #KUBECONFIG=$MGMT_KUBECONFIG kubectl -n "$md_namespace" patch machinedeployment "$md_name" --type='merge' -p "{\"spec\":{\"replicas\":$current_replicas}}"
+              #KUBECONFIG=$MGMT_KUBECONFIG kubectl patch machinedeployment ${CLUSTER_NAME}-md-0 --type='merge' -p "{\"spec\":{\"replicas\":$current_replicas}}"
             check:
               ($error == null): true
               (contains($stdout, 'all nodes up')): true