define stamp vnet function.

Author: sivakami

.pipelines/swiftv2-long-running/scripts/create_aks.sh

@@ -7,75 +7,16 @@ RG=$3
 VM_SKU_DEFAULT=$4
 VM_SKU_HIGHNIC=$5
 
-CLUSTER_COUNT=2                               
-CLUSTER_PREFIX="aks"                                                        
+CLUSTER_COUNT=2
+CLUSTER_PREFIX="aks"
 
-wait_for_provisioning() {                      # Helper for safe retry/wait for provisioning states (basic)
-  local rg="$1" clusterName="$2"                     
-  echo "Waiting for AKS '$clusterName' in RG '$rg' to reach Succeeded/Failed (polling)..."
-  while :; do
-    state=$(az aks show --resource-group "$rg" --name "$clusterName" --query provisioningState -o tsv 2>/dev/null || true)
-    if [ -z "$state" ]; then
-      sleep 3
-      continue
-    fi
-    case "$state" in
-      Succeeded|Succeeded*) echo "Provisioning state: $state"; break ;;
-      Failed|Canceled|Rejected) echo "Provisioning finished with state: $state"; break ;;
-      *) printf "."; sleep 6 ;;
-    esac
-  done
-}
 
+#########################################
+# Define functions BEFORE the loop
+#########################################
 
-for i in $(seq 1 "$CLUSTER_COUNT"); do
-  echo "=============================="
-  echo " Working on cluster set #$i"
-  echo "=============================="
-  
-  CLUSTER_NAME="${CLUSTER_PREFIX}-${i}"
-  echo "Creating AKS cluster '$CLUSTER_NAME' in RG '$RG'"
-
-  make -C ./hack/aks azcfg AZCLI=az REGION=$LOCATION
-
-  make -C ./hack/aks swiftv2-podsubnet-cluster-up \
-  AZCLI=az REGION=$LOCATION \
-  SUB=$SUBSCRIPTION_ID \
-  GROUP=$RG \
-  CLUSTER=$CLUSTER_NAME \
-  VM_SIZE=$VM_SKU_DEFAULT
-
-  echo " - waiting for AKS provisioning state..."
-  wait_for_provisioning "$RG" "$CLUSTER_NAME"
-
-  echo "Retrieving VNET ID from AKS cluster..."
-  vnet_id=$(az network vnet show -g "$RG" --name "$CLUSTER_NAME" --query id -o tsv)
-  echo "Found VNET: $vnet_id"
-  stamp_vnet "$vnet_id"
-
-  echo "Adding multi-tenant nodepool ' to '$CLUSTER_NAME'"
-  make -C ./hack/aks linux-swiftv2-nodepool-up \
-  AZCLI=az REGION=$LOCATION \
-  GROUP=$RG \
-  VM_SIZE=$VM_SKU_HIGHNIC \
-  CLUSTER=$CLUSTER_NAME \
-  SUB=$SUBSCRIPTION_ID 
-
-  KUBECONFIG_PATH="/tmp/${CLUSTER_NAME}.kubeconfig"
-  echo "Exporting admin kubeconfig for '$CLUSTER_NAME' to ${KUBECONFIG_PATH}..."
-
-  az aks get-credentials \
-    --resource-group "$RG" \
-    --name "$CLUSTER_NAME" \
-    --overwrite-existing \
-    --admin \
-    --file "$KUBECONFIG_PATH"
-  echo "Kubeconfig saved: ${KUBECONFIG_PATH}"
-
-#  Stamp infra vnet. 
-function stamp_vnet() {
-    local vnet_id
-    vnet_id="${1}"
+stamp_vnet() {
+    local vnet_id="$1"
 
     responseFile="response.txt"
     modified_vnet="${vnet_id//\//%2F}"
@@ -85,6 +26,7 @@ function stamp_vnet() {
     max_retries=6
     sleep_seconds=15
     retry_count=0
+
     while [[ $retry_count -lt $max_retries ]]; do
         script --quiet -c "$cmd_containerapp_exec" "$responseFile"
         if grep -qF "200 OK" "$responseFile"; then
@@ -97,12 +39,63 @@ function stamp_vnet() {
             sleep "$sleep_seconds"
         fi
     done
-    if [[ $retry_count -eq $max_retries ]]; then
-        echo "Failed to stamp the vnet even after $max_retries attempts"
-        exit 1
+
+    echo "Failed to stamp the vnet even after $max_retries attempts"
+    exit 1
+}
+
+wait_for_provisioning() {
+  local rg="$1" clusterName="$2"
+  echo "Waiting for AKS '$clusterName' in RG '$rg'..."
+  while :; do
+    state=$(az aks show --resource-group "$rg" --name "$clusterName" --query provisioningState -o tsv 2>/dev/null || true)
+    if [[ "$state" =~ Succeeded ]]; then
+      echo "Provisioning state: $state"
+      break
+    fi
+    if [[ "$state" =~ Failed|Canceled ]]; then
+      echo "Provisioning finished with state: $state"
+      break
     fi
+    sleep 6
+  done
 }
 
 
+#########################################
+# Main loop
+#########################################
+
+for i in $(seq 1 "$CLUSTER_COUNT"); do
+    echo "Creating cluster #$i..."
+
+    CLUSTER_NAME="${CLUSTER_PREFIX}-${i}"
+
+    make -C ./hack/aks azcfg AZCLI=az REGION=$LOCATION
+
+    make -C ./hack/aks swiftv2-podsubnet-cluster-up \
+      AZCLI=az REGION=$LOCATION \
+      SUB=$SUBSCRIPTION_ID \
+      GROUP=$RG \
+      CLUSTER=$CLUSTER_NAME \
+      VM_SIZE=$VM_SKU_DEFAULT
+
+    wait_for_provisioning "$RG" "$CLUSTER_NAME"
+
+    vnet_id=$(az network vnet show -g "$RG" --name "$CLUSTER_NAME" --query id -o tsv)
+    echo "Found VNET: $vnet_id"
+
+    stamp_vnet "$vnet_id"
+
+    make -C ./hack/aks linux-swiftv2-nodepool-up \
+      AZCLI=az REGION=$LOCATION \
+      GROUP=$RG \
+      VM_SIZE=$VM_SKU_HIGHNIC \
+      CLUSTER=$CLUSTER_NAME \
+      SUB=$SUBSCRIPTION_ID
+
+    az aks get-credentials -g "$RG" -n "$CLUSTER_NAME" --admin --overwrite-existing \
+      --file "/tmp/${CLUSTER_NAME}.kubeconfig"
 done
-echo "All done. Created $CLUSTER_COUNT cluster set(s)."
+
+echo "All clusters complete."