Merge pull request #5096 from k8s-infra-cherrypick-robot/cherry-pick-…

…5058-to-release-1.16 [release-1.16] split cluster class/topology in e2e AKS templates
kubernetes-sigs · Aug 27, 2024 · be33b5a · be33b5a
2 parents 27b30bb + 5cf3e41
commit be33b5a
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 27 deletions.
diff --git a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml
diff --git a/templates/test/ci/cluster-template-prow-aks-topology.yaml b/templates/test/ci/cluster-template-prow-aks-topology.yaml
diff --git a/templates/test/ci/prow-aks-clusterclass/kustomization.yaml b/templates/test/ci/prow-aks-clusterclass/kustomization.yaml
@@ -3,12 +3,10 @@ kind: Kustomization
 namespace: default
 resources:
 - ../../../flavors/aks-clusterclass
-- ../../../flavors/aks-topology
 patches:
 - path: patches/tags-aks-clusterclass.yaml
 - path: patches/aks-clusterclass-pool0.yaml
 - path: patches/aks-clusterclass-pool1.yaml
-- path: patches/cluster.yaml
 - path: patches/addons.yaml
 - path: patches/kubeadm-config-template.yaml
 - path: patches.yaml

diff --git a/templates/test/ci/prow-aks-topology/kustomization.yaml b/templates/test/ci/prow-aks-topology/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: default
+resources:
+- ../../../flavors/aks-topology
+patches:
+- path: patches/cluster.yaml
+
+sortOptions:
+  order: fifo
diff --git a/...row-aks-clusterclass/patches/cluster.yaml → ...ci/prow-aks-topology/patches/cluster.yaml b/...row-aks-clusterclass/patches/cluster.yaml → ...ci/prow-aks-topology/patches/cluster.yaml
diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go
@@ -893,7 +893,7 @@ var _ = Describe("Workload cluster creation", func() {
 			// Create a cluster using the cluster class created above
 			clusterctl.ApplyClusterTemplateAndWait(ctx, createApplyClusterTemplateInput(
 				specName,
-				withFlavor("aks-clusterclass"),
+				withFlavor("aks-topology"),
 				withAzureCNIv1Manifest(e2eConfig.GetVariable(AzureCNIv1Manifest)),
 				withNamespace(namespace.Name),
 				withClusterName(clusterName),

diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml
@@ -139,8 +139,8 @@ providers:
         targetName: "cluster-template-machine-pool-flex.yaml"
       - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-aks.yaml"
         targetName: "cluster-template-aks.yaml"
-      - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml"
-        targetName: "cluster-template-aks-clusterclass.yaml"
+      - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-aks-topology.yaml"
+        targetName: "cluster-template-aks-topology.yaml"
       - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-aks-aso.yaml"
         targetName: "cluster-template-aks-aso.yaml"
       - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-custom-vnet.yaml"