diff --git a/hack/util.sh b/hack/util.sh index 94659df4af2..cff56f4839f 100755 --- 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 index 5eb38cbaf6d..cfea8653ed4 100644 --- a/templates/test/ci/cluster-template-prow-aks-aso.yaml +++ b/templates/test/ci/cluster-template-prow-aks-aso.yaml @@ -37,6 +37,9 @@ spec: name: ${CLUSTER_NAME} servicePrincipalProfile: clientId: msi + sku: + name: Base + tier: Standard tags: buildProvenance: ${BUILD_PROVENANCE} creationTimestamp: ${TIMESTAMP} diff --git a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml index 5117012f5a5..9af70bbb22c 100644 --- a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml +++ b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml @@ -84,6 +84,8 @@ spec: kind: AzureClusterIdentity name: ${CLUSTER_IDENTITY_NAME} location: ${AZURE_LOCATION} + sku: + tier: Standard subscriptionID: ${AZURE_SUBSCRIPTION_ID} version: ${KUBERNETES_VERSION} --- diff --git a/templates/test/ci/cluster-template-prow-aks.yaml b/templates/test/ci/cluster-template-prow-aks.yaml index c9b700db35b..dd13932e202 100644 --- a/templates/test/ci/cluster-template-prow-aks.yaml +++ b/templates/test/ci/cluster-template-prow-aks.yaml @@ -38,6 +38,8 @@ spec: oidcIssuerProfile: enabled: true resourceGroupName: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} + sku: + tier: Standard sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""} subscriptionID: ${AZURE_SUBSCRIPTION_ID} version: ${KUBERNETES_VERSION} diff --git a/templates/test/ci/prow-aks-aso/kustomization.yaml b/templates/test/ci/prow-aks-aso/kustomization.yaml index acf028ba22e..d346dbc49c2 100644 --- 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 index 6a5911e30a9..ded8ec8e6fa 100644 --- 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 new file mode 100644 index 00000000000..7518400e9cd --- /dev/null +++ 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 index d9371b9f65c..e8416937120 100644 --- 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 \ No newline at end of file + - 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 new file mode 100644 index 00000000000..d37e9242ab7 --- /dev/null +++ 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