Merge pull request #4963 from nojnhuh/aks-test-sku

[release-1.15] Use Standard tier SKU for AKS e2e tests
kubernetes-sigs · Jul 4, 2024 · 5283ae6 · 5283ae6
2 parents 1d0c3ae + c59a0a6
commit 5283ae6
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 2 deletions.
diff --git a/hack/util.sh b/hack/util.sh
@@ -63,7 +63,7 @@ capz::util::should_build_ccm() {
 
 # all test regions must support AvailabilityZones
 capz::util::get_random_region() {
-    local REGIONS=("canadacentral" "eastus" "eastus2" "northeurope" "uksouth" "westus2" "westus3")
+    local REGIONS=("canadacentral" "eastus" "eastus2" "northeurope" "uksouth" "westeurope" "westus2" "westus3")
     echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"
 }
 # all regions below must have GPU availability for the chosen GPU VM SKU

diff --git a/templates/test/ci/cluster-template-prow-aks-aso.yaml b/templates/test/ci/cluster-template-prow-aks-aso.yaml
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.yaml b/templates/test/ci/cluster-template-prow-aks.yaml
diff --git a/templates/test/ci/prow-aks-aso/kustomization.yaml b/templates/test/ci/prow-aks-aso/kustomization.yaml
@@ -28,6 +28,11 @@ patches:
           jobName: ${JOB_NAME}
           creationTimestamp: ${TIMESTAMP}
           buildProvenance: ${BUILD_PROVENANCE}
+      - op: replace
+        path: /spec/resources/0/spec/sku
+        value:
+          name: Base
+          tier: Standard
     target:
       kind: AzureASOManagedControlPlane
   - patch: |-

diff --git a/templates/test/ci/prow-aks-clusterclass/kustomization.yaml b/templates/test/ci/prow-aks-clusterclass/kustomization.yaml
@@ -12,3 +12,4 @@ patchesStrategicMerge:
   - patches/addons.yaml
   - patches/kubeadm-config-template.yaml
   - patches.yaml
+  - patches/sku.yaml
diff --git a/templates/test/ci/prow-aks-clusterclass/patches/sku.yaml b/templates/test/ci/prow-aks-clusterclass/patches/sku.yaml
@@ -0,0 +1,10 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AzureManagedControlPlaneTemplate
+metadata:
+  name: ${CLUSTER_NAME}-control-plane
+  namespace: default
+spec:
+  template:
+    spec:
+      sku:
+        tier: Standard
diff --git a/templates/test/ci/prow-aks/kustomization.yaml b/templates/test/ci/prow-aks/kustomization.yaml
@@ -8,4 +8,5 @@ patchesStrategicMerge:
   - ../patches/tags-aks.yaml
   - patches/aks-pool0.yaml
   - patches/aks-pool1.yaml
-  - patches/addons.yaml
+  - patches/addons.yaml
+  - patches/sku.yaml
diff --git a/templates/test/ci/prow-aks/patches/sku.yaml b/templates/test/ci/prow-aks/patches/sku.yaml
@@ -0,0 +1,8 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AzureManagedControlPlane
+metadata:
+  name: ${CLUSTER_NAME}
+  namespace: default
+spec:
+  sku:
+    tier: Standard