Skip to content

Commit

Permalink
Merge pull request #5058 from nojnhuh/e2e-aks-clusterclass
Browse files Browse the repository at this point in the history
split cluster class/topology in e2e AKS templates
  • Loading branch information
k8s-ci-robot authored Aug 27, 2024
2 parents 07088c2 + 7519aa1 commit cc3e8e9
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 27 deletions.
22 changes: 0 additions & 22 deletions templates/test/ci/cluster-template-prow-aks-clusterclass.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions templates/test/ci/cluster-template-prow-aks-topology.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions templates/test/ci/prow-aks-clusterclass/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions templates/test/ci/prow-aks-topology/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion test/e2e/azure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/config/azure-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit cc3e8e9

Please sign in to comment.