Merge pull request #5772 from jackfrancis/AZURE_LOCATION-fix

CI: Always use AZURE_LOCATION

Author: k8s-ci-robot

scripts/ci-conformance.sh

@@ -30,6 +30,8 @@ KIND="${REPO_ROOT}/hack/tools/bin/kind"
 KUSTOMIZE="${REPO_ROOT}/hack/tools/bin/kustomize"
 make --directory="${REPO_ROOT}" "${KUBECTL##*/}" "${KIND##*/}" "${KUSTOMIZE##*/}"
 
+WORKER_MACHINE_COUNT="${WORKER_MACHINE_COUNT:-2}"
+
 # shellcheck source=hack/ensure-go.sh
 source "${REPO_ROOT}/hack/ensure-go.sh"
 # shellcheck source=hack/ensure-tags.sh
@@ -65,10 +67,18 @@ defaultTag=$(date -u '+%Y%m%d%H%M%S')
 export TAG="${defaultTag:-dev}"
 export GINKGO_NODES=1
 
-export AZURE_LOCATION="${AZURE_LOCATION:-$(capz::util::get_random_region)}"
+if [ "${WORKER_MACHINE_COUNT}" -gt "10" ]; then
+    export AZURE_LOCATION="${AZURE_LOCATION:-$(capz::util::get_random_region_load)}"
+    echo "Using AZURE_LOCATION: ${AZURE_LOCATION}"
+else
+    export AZURE_LOCATION="${AZURE_LOCATION:-$(capz::util::get_random_region)}"
+    echo "Using AZURE_LOCATION: ${AZURE_LOCATION}"
+fi
+# TODO these AZURE_LOCATION_* overrides may have the effect of
+# disassociating VM regions from disks, leading to attachment failures.
+# Less likely with GPU scenarios but FYI.
 export AZURE_LOCATION_GPU="${AZURE_LOCATION_GPU:-$(capz::util::get_random_region_gpu)}"
 export AZURE_LOCATION_EDGEZONE="${AZURE_LOCATION_EDGEZONE:-$(capz::util::get_random_region_edgezone)}"
-export AZURE_LOCATION_LOAD="${AZURE_LOCATION_LOAD:-$(capz::util::get_random_region_load)}"
 export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"Standard_B2s"}"
 export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_B2s"}"
 export WINDOWS="${WINDOWS:-false}"

scripts/ci-entrypoint.sh

@@ -30,6 +30,7 @@ KIND="${REPO_ROOT}/hack/tools/bin/kind"
 KUSTOMIZE="${REPO_ROOT}/hack/tools/bin/kustomize"
 make --directory="${REPO_ROOT}" "${KUBECTL##*/}" "${HELM##*/}" "${KIND##*/}" "${KUSTOMIZE##*/}"
 KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-capz}"
+WORKER_MACHINE_COUNT="${WORKER_MACHINE_COUNT:-2}"
 export KIND_CLUSTER_NAME
 # export the variables so they are available in bash -c wait_for_nodes below
 export KUBECTL
@@ -94,14 +95,20 @@ setup() {
         echo ''
     )}"
     export AZURE_RESOURCE_GROUP="${CLUSTER_NAME}"
-    export AZURE_LOCATION="${AZURE_LOCATION:-$(capz::util::get_random_region)}"
-    echo "Using AZURE_LOCATION: ${AZURE_LOCATION}"
+    if [ "${WORKER_MACHINE_COUNT}" -gt "10" ]; then
+        export AZURE_LOCATION="${AZURE_LOCATION:-$(capz::util::get_random_region_load)}"
+        echo "Using AZURE_LOCATION: ${AZURE_LOCATION}"
+    else
+        export AZURE_LOCATION="${AZURE_LOCATION:-$(capz::util::get_random_region)}"
+        echo "Using AZURE_LOCATION: ${AZURE_LOCATION}"
+    fi
+    # TODO these AZURE_LOCATION_* overrides may have the effect of
+    # disassociating VM regions from disks, leading to attachment failures.
+    # Less likely with GPU scenarios but FYI.
     export AZURE_LOCATION_GPU="${AZURE_LOCATION_GPU:-$(capz::util::get_random_region_gpu)}"
     echo "Using AZURE_LOCATION_GPU: ${AZURE_LOCATION_GPU}"
     export AZURE_LOCATION_EDGEZONE="${AZURE_LOCATION_EDGEZONE:-$(capz::util::get_random_region_edgezone)}"
     echo "Using AZURE_LOCATION_EDGEZONE: ${AZURE_LOCATION_EDGEZONE}"
-    export AZURE_LOCATION_LOAD="${AZURE_LOCATION_LOAD:-$(capz::util::get_random_region_load)}"
-    echo "Using AZURE_LOCATION_LOAD: ${AZURE_LOCATION_LOAD}"
     # Need a cluster with at least 2 nodes
     export CONTROL_PLANE_MACHINE_COUNT="${CONTROL_PLANE_MACHINE_COUNT:-1}"
     export CCM_COUNT="${CCM_COUNT:-1}"

templates/test/dev/cluster-template-custom-builds-load-dra.yaml

@@ -5,7 +5,6 @@ resources:
 - ../custom-builds
 - storageclass-resource-set.yaml
 patches:
-- path: patches/location.yaml
 - path: patches/cluster-label-storageclass.yaml
 - path: patches/cluster-label-azuredisk.yaml
 - path: patches/kcp-scheduler.yaml