Add more tests to CAPI tests

Author: Cecile Robert-Michon

templates/test/dev/cluster-template-v1alpha4.yaml

@@ -231,6 +231,10 @@ func linuxLogs(execToPathFn func(outputFileName string, command string, args ...
 			"cloud-init-output.log",
 			"cat", "/var/log/cloud-init-output.log",
 		),
+		execToPathFn(
+			"sentinel-file-dir.txt",
+			"ls", "/run/cluster-api/",
+		),
 	}
 }
 

test/e2e/azure_logcollector.go

@@ -27,7 +27,6 @@ import (
 	. "github.com/onsi/gomega"
 
 	capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
-	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/util"
 )
 
@@ -83,6 +82,20 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 		})
 	})
 
+	Context("Running the KCP upgrade spec in a HA cluster using scale in rollout", func() {
+		capi_e2e.KCPUpgradeSpec(context.TODO(), func() capi_e2e.KCPUpgradeSpecInput {
+			return capi_e2e.KCPUpgradeSpecInput{
+				E2EConfig:                e2eConfig,
+				ClusterctlConfigPath:     clusterctlConfigPath,
+				BootstrapClusterProxy:    bootstrapClusterProxy,
+				ArtifactFolder:           artifactFolder,
+				ControlPlaneMachineCount: 3,
+				SkipCleanup:              skipCleanup,
+				Flavor:                   "kcp-scale-in",
+			}
+		})
+	})
+
 	Context("Running the MachineDeployment upgrade spec", func() {
 		capi_e2e.MachineDeploymentUpgradesSpec(context.TODO(), func() capi_e2e.MachineDeploymentUpgradesSpecInput {
 			return capi_e2e.MachineDeploymentUpgradesSpecInput{
@@ -126,7 +139,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 			return capi_e2e.KCPAdoptionSpecInput{
 				E2EConfig:             e2eConfig,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapClusterProxy: bootstrapClusterProxy.(framework.ClusterProxy),
+				BootstrapClusterProxy: bootstrapClusterProxy,
 				ArtifactFolder:        artifactFolder,
 				SkipCleanup:           skipCleanup,
 			}
@@ -138,7 +151,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 			return capi_e2e.MachinePoolInput{
 				E2EConfig:             e2eConfig,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapClusterProxy: bootstrapClusterProxy.(framework.ClusterProxy),
+				BootstrapClusterProxy: bootstrapClusterProxy,
 				ArtifactFolder:        artifactFolder,
 				SkipCleanup:           skipCleanup,
 			}
@@ -150,22 +163,23 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 			return capi_e2e.MachineDeploymentScaleSpecInput{
 				E2EConfig:             e2eConfig,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapClusterProxy: bootstrapClusterProxy.(framework.ClusterProxy),
+				BootstrapClusterProxy: bootstrapClusterProxy,
 				ArtifactFolder:        artifactFolder,
 				SkipCleanup:           skipCleanup,
 			}
 		})
 	})
 
-	Context("Should successfully set and use node drain timeout", func() {
-		capi_e2e.NodeDrainTimeoutSpec(context.TODO(), func() capi_e2e.NodeDrainTimeoutSpecInput {
-			return capi_e2e.NodeDrainTimeoutSpecInput{
-				E2EConfig:             e2eConfig,
-				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapClusterProxy: bootstrapClusterProxy.(framework.ClusterProxy),
-				ArtifactFolder:        artifactFolder,
-				SkipCleanup:           skipCleanup,
-			}
-		})
-	})
+	// TODO: enable this with a longer timeout once https://github.com/kubernetes-sigs/cluster-api/pull/4830 is imported.
+	//Context("Should successfully set and use node drain timeout", func() {
+	//	capi_e2e.NodeDrainTimeoutSpec(context.TODO(), func() capi_e2e.NodeDrainTimeoutSpecInput {
+	//		return capi_e2e.NodeDrainTimeoutSpecInput{
+	//			E2EConfig:             e2eConfig,
+	//			ClusterctlConfigPath:  clusterctlConfigPath,
+	//			BootstrapClusterProxy: bootstrapClusterProxy,
+	//			ArtifactFolder:        artifactFolder,
+	//			SkipCleanup:           skipCleanup,
+	//		}
+	//	})
+	//})
 })

test/e2e/capi_test.go

@@ -68,6 +68,8 @@ providers:
       targetName: "cluster-template-kcp-remediation.yaml"
     - sourcePath: "../data/infrastructure-azure/v1alpha4/cluster-template-kcp-scale-in.yaml"
       targetName: "cluster-template-kcp-scale-in.yaml"
+    - sourcePath: "../data/infrastructure-azure/v1alpha4/cluster-template-node-drain.yaml"
+      targetName: "cluster-template-node-drain.yaml"
     - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-machine-pool.yaml"
       targetName: "cluster-template-machine-pool.yaml"
     - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml"
@@ -108,6 +110,7 @@ variables:
   CONFORMANCE_NODES: "${CONFORMANCE_NODES:-1}"
   IP_FAMILY: "IPv4" # this is used by the CAPI quickstart spec
   MULTI_TENANCY_IDENTITY_NAME: "multi-tenancy-identity"
+  NODE_DRAIN_TIMEOUT: "60s"
 
 intervals:
   default/wait-controllers: ["3m", "10s"]
@@ -118,6 +121,7 @@ intervals:
   default/wait-machine-upgrade: ["60m", "10s"]
   default/wait-machine-remediation: ["30m", "10s"]
   default/wait-deployment: ["15m", "10s"]
+  default/wait-deployment-available: ["15m", "10s"]
   default/wait-job: ["5m", "10s"]
   default/wait-service: ["5m", "10s"]
   default/wait-machine-pool-nodes: ["30m", "10s"]

test/e2e/config/azure-dev.yaml

@@ -120,7 +120,7 @@ spec:
       - contentFrom:
           secret:
             key: control-plane-azure.json
-            name: ${CLUSTER_NAME}-control-plane-0-azure-json
+            name: ${CLUSTER_NAME}-control-plane-azure-json
         owner: root:root
         path: /etc/kubernetes/azure.json
         permissions: "0644"

test/e2e/data/infrastructure-azure/v1alpha4/bases/cluster-with-kcp.yaml

@@ -11,8 +11,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${CLUSTER_NAME}-vnet
-  resourceGroup: ${CLUSTER_NAME}
+      name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 # Cluster object with

test/e2e/data/infrastructure-azure/v1alpha4/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml

@@ -4,5 +4,3 @@ commonLabels:
 bases:
   - cluster-with-cp0.yaml
   - ../../bases/crs.yaml
-
-

test/e2e/data/infrastructure-azure/v1alpha4/cluster-template-kcp-adoption/step1/kustomization.yaml

@@ -0,0 +1,14 @@
+kind: KubeadmControlPlane
+apiVersion: controlplane.cluster.x-k8s.io/v1alpha4
+metadata:
+  name: "${CLUSTER_NAME}-control-plane"
+spec:
+  kubeadmConfigSpec:
+    files:
+      - contentFrom:
+          secret:
+            key: control-plane-azure.json
+            name: ${CLUSTER_NAME}-control-plane-0-azure-json
+        owner: root:root
+        path: /etc/kubernetes/azure.json
+        permissions: "0644"

test/e2e/data/infrastructure-azure/v1alpha4/cluster-template-kcp-adoption/step2/cluster-with-kcp.yaml

@@ -4,3 +4,5 @@ commonLabels:
 bases:
   - ../../bases/cluster-with-kcp.yaml
 
+patchesStrategicMerge:
+  - ./cluster-with-kcp.yaml

test/e2e/data/infrastructure-azure/v1alpha4/cluster-template-kcp-adoption/step2/kustomization.yaml

@@ -1,4 +1,3 @@
-# KubeadmControlPlane referenced by the Cluster object with
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha4
 metadata: