Merge pull request #5103 from willie-yao/test-aks-upgrade-1

Add MachinePools to CAPI apiversion upgrade test

Author: k8s-ci-robot

Makefile

@@ -496,6 +496,7 @@ generate-e2e-templates: $(KUSTOMIZE) ## Generate Azure infrastructure templates
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-md-remediation --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-md-remediation.yaml
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-remediation --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-remediation.yaml
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-machine-pool --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-machine-pool.yaml
+	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-machine-and-machine-pool --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-machine-and-machine-pool.yaml
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-node-drain --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-node-drain.yaml
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-upgrades --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-upgrades.yaml
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-scale-in --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-scale-in.yaml

test/e2e/capi_test.go

@@ -206,6 +206,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 					return capi_e2e.ClusterctlUpgradeSpecInput{
 						E2EConfig:                 e2eConfig,
 						ClusterctlConfigPath:      clusterctlConfigPath,
+						WorkloadFlavor:            "machine-and-machine-pool",
 						BootstrapClusterProxy:     bootstrapClusterProxy,
 						ArtifactFolder:            artifactFolder,
 						SkipCleanup:               skipCleanup,
@@ -230,6 +231,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 					return capi_e2e.ClusterctlUpgradeSpecInput{
 						E2EConfig:                 e2eConfig,
 						ClusterctlConfigPath:      clusterctlConfigPath,
+						WorkloadFlavor:            "machine-and-machine-pool",
 						BootstrapClusterProxy:     bootstrapClusterProxy,
 						ArtifactFolder:            artifactFolder,
 						SkipCleanup:               skipCleanup,

test/e2e/config/azure-dev.yaml

@@ -91,6 +91,8 @@ providers:
       - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
       - sourcePath: "../data/infrastructure-azure/v1.16.1/cluster-template-prow.yaml"
         targetName: "cluster-template.yaml"
+      - sourcePath: "../data/infrastructure-azure/v1.16.1/cluster-template-prow-machine-and-machine-pool.yaml"
+        targetName: "cluster-template-machine-and-machine-pool.yaml"
       replacements:
       - old: "imagePullPolicy: Always"
         new: "imagePullPolicy: IfNotPresent"
@@ -102,6 +104,8 @@ providers:
       - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
       - sourcePath: "../data/infrastructure-azure/v1.17.0/cluster-template-prow.yaml"
         targetName: "cluster-template.yaml"
+      - sourcePath: "../data/infrastructure-azure/v1.17.0/cluster-template-prow-machine-and-machine-pool.yaml"
+        targetName: "cluster-template-machine-and-machine-pool.yaml"
       replacements:
       - old: "imagePullPolicy: Always"
         new: "imagePullPolicy: IfNotPresent"
@@ -119,6 +123,7 @@ providers:
       - sourcePath: "../data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml"
       - sourcePath: "../data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml"
       - sourcePath: "../data/infrastructure-azure/v1beta1/cluster-template-upgrades.yaml"
+      - sourcePath: "../data/infrastructure-azure/v1beta1/cluster-template-machine-and-machine-pool.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-ipv6.yaml"