Merge pull request #8311 from sbueringer/pr-fix-clusterctl-upgrade

🐛 test/e2e: use topology cluster-template for clusterctl upgrade mgmt cluster

Author: k8s-ci-robot

test/e2e/clusterctl_upgrade_test.go

@@ -39,6 +39,8 @@ var _ = Describe("When testing clusterctl upgrades (v0.3=>current)", func() {
 			UpgradeClusterctlVariables: map[string]string{
 				"CLUSTER_TOPOLOGY": "false",
 			},
+			MgmtFlavor:     "topology",
+			WorkloadFlavor: "",
 		}
 	})
 })
@@ -54,6 +56,8 @@ var _ = Describe("When testing clusterctl upgrades (v0.4=>current)", func() {
 			InitWithBinary:            "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.8/clusterctl-{OS}-{ARCH}",
 			InitWithProvidersContract: "v1alpha4",
 			InitWithKubernetesVersion: "v1.23.13",
+			MgmtFlavor:                "topology",
+			WorkloadFlavor:            "",
 		}
 	})
 })
@@ -78,6 +82,8 @@ var _ = Describe("When testing clusterctl upgrades (v1.0=>current)", func() {
 			// try to deploy the latest version of our test-extension from docker.yaml.
 			InitWithRuntimeExtensionProviders: []string{},
 			InitWithKubernetesVersion:         "v1.23.13",
+			MgmtFlavor:                        "topology",
+			WorkloadFlavor:                    "",
 		}
 	})
 })
@@ -102,6 +108,10 @@ var _ = Describe("When testing clusterctl upgrades (v1.2=>current)", func() {
 			// try to deploy the latest version of our test-extension from docker.yaml.
 			InitWithRuntimeExtensionProviders: []string{},
 			InitWithKubernetesVersion:         "v1.26.0",
+			// TODO(sbueringer) The topology flavor enables PSA.
+			// CAPD will only work with PSA after we have a release with https://github.com/kubernetes-sigs/cluster-api/pull/8313.
+			//MgmtFlavor:                        "topology",
+			WorkloadFlavor: "",
 		}
 	})
 })
@@ -126,7 +136,10 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.2=>cur
 			// try to deploy the latest version of our test-extension from docker.yaml.
 			InitWithRuntimeExtensionProviders: []string{},
 			InitWithKubernetesVersion:         "v1.26.0",
-			WorkloadFlavor:                    "topology",
+			// TODO(sbueringer) The topology flavor enables PSA.
+			// CAPD will only work with PSA after we have a release with https://github.com/kubernetes-sigs/cluster-api/pull/8313.
+			//MgmtFlavor:                        "topology",
+			WorkloadFlavor: "topology",
 		}
 	})
 })
@@ -142,6 +155,8 @@ var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
 			InitWithBinary:            "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
 			InitWithProvidersContract: "v1beta1",
 			InitWithKubernetesVersion: "v1.26.0",
+			MgmtFlavor:                "topology",
+			WorkloadFlavor:            "",
 		}
 	})
 })
@@ -157,6 +172,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.3=>cur
 			InitWithBinary:            "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
 			InitWithProvidersContract: "v1beta1",
 			InitWithKubernetesVersion: "v1.26.0",
+			MgmtFlavor:                "topology",
 			WorkloadFlavor:            "topology",
 		}
 	})