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

k8s-ci-robot · web-flow · commit 5283ae65002b · 2024-07-04T05:48:32.000-07:00
[release-1.15] Use Standard tier SKU for AKS e2e tests
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

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ capz::util::should_build_ccm() {`
`63`	`63`
`64`	`64`	`# all test regions must support AvailabilityZones`
`65`	`65`	`capz::util::get_random_region() {`
`66`		`- local REGIONS=("canadacentral" "eastus" "eastus2" "northeurope" "uksouth" "westus2" "westus3")`
	`66`	`+ local REGIONS=("canadacentral" "eastus" "eastus2" "northeurope" "uksouth" "westeurope" "westus2" "westus3")`
`67`	`67`	`echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"`
`68`	`68`	`}`
`69`	`69`	`# all regions below must have GPU availability for the chosen GPU VM SKU`