use make tragets to create aks clusters.

Author: sivakami

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

@@ -1,47 +1,63 @@
 #!/usr/bin/env bash
-set -e
+set -euo pipefail
 trap 'echo "[ERROR] Failed during Resource group or AKS cluster creation." >&2' ERR
-
 SUBSCRIPTION_ID=$1
 LOCATION=$2
 RG=$3
 VM_SKU_DEFAULT=$4
 VM_SKU_HIGHNIC=$5
 
-echo "Subscription id: $SUBSCRIPTION_ID"
-echo "Resource group: $RG"
-echo "Location: $LOCATION"
-echo "VM SKU (default): $VM_SKU_DEFAULT"
-echo "VM SKU (high-NIC): $VM_SKU_HIGHNIC"
-az account set --subscription "$SUBSCRIPTION_ID"
-
-# Enable parallel cluster creation
-create_cluster() {
-  local CLUSTER=$1
-  echo "==> Creating AKS cluster: $CLUSTER"
-
-  az aks create -g "$RG" -n "$CLUSTER" -l "$LOCATION" \
-    --network-plugin azure --node-count 1 \
-    --node-vm-size "$VM_SKU_DEFAULT" \
-    --enable-managed-identity --generate-ssh-keys \
-    --load-balancer-sku standard --yes --only-show-errors
-
-  echo "==> Adding high-NIC nodepool to $CLUSTER"
-  az aks nodepool add -g "$RG" -n highnic \
-    --cluster-name "$CLUSTER" --node-count 2 \
-    --node-vm-size "$VM_SKU_HIGHNIC" --mode User --only-show-errors
-
-  echo "Finished AKS cluster: $CLUSTER"
+CLUSTER_COUNT=2                               
+CLUSTER_PREFIX="aks"                          
+DEFAULT_NODE_COUNT=1                               
+COMMON_TAGS="fastpathenabled=true RGOwner=LongRunningTestPipelines stampcreatorserviceinfo=true"
+
+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
 }
 
-# Run both clusters in parallel
-create_cluster "aks-cluster-a" &
-pid_a=$!
-
-create_cluster "aks-cluster-b" &
-pid_b=$!
-
-# Wait for both to finish
-wait $pid_a $pid_b
 
-echo "AKS clusters created successfully!"
+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 \
+  NODE_COUNT=$DEFAULT_NODE_COUNT \
+  VM_SIZE=$VM_SKU_DEFAULT \
+
+  echo " - waiting for AKS provisioning state..."
+  wait_for_provisioning "$RG" "$CLUSTER_NAME"
+
+  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 \
+
+done
+echo "All done. Created $CLUSTER_COUNT cluster set(s)."

hack/aks/Makefile

@@ -285,6 +285,24 @@ swiftv2-dummy-cluster-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI clus
 		--yes
 	@$(MAKE) set-kubeconf
 
+swiftv2-podsubnet-cluster-up: ipv4 swift-net-up ## Create dummy AKS cluster to create pod and node subnets for AKS pod subnet cluster.
+	$(AZCLI) aks create -n "$(CLUSTER)" -g $(GROUP) -l $(REGION) \
+		--network-plugin azure \
+		--kubernetes-version $(K8S_VER) \
+		--nodepool-name nodepool1 \
+		--node-vm-size $(VM_SIZE) \
+		--node-count $(NODE_COUNT) \
+		--load-balancer-outbound-ips $(PUBLIC_IPv4) \
+		--no-ssh-key \
+		--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
+		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
+		--service-cidr "10.0.0.0/16" \
+		--dns-service-ip "10.0.0.10" \
+		--tags fastpathenabled=true RGOwner=LongRunningTestPipelines stampcreatorserviceinfo=true \
+		--http-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/NetworkingMultiTenancyPreview \
+		--yes 
+	@$(MAKE) set-kubeconf
+
 # The below Vnet Scale clusters are currently only in private preview and available with Kubernetes 1.28
 # These AKS clusters can only be created in a limited subscription listed here:
 # https://dev.azure.com/msazure/CloudNativeCompute/_git/aks-rp?path=/resourceprovider/server/microsoft.com/containerservice/flags/network_flags.go&version=GBmaster&line=134&lineEnd=135&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents
@@ -424,6 +442,18 @@ windows-swift-nodepool-up: ## Add windows node pool
 		--subscription $(SUB) \
 		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet
 
+linux-swiftv2-nodepool-up: ## Add linux node pool to swiftv2 cluster
+	$(AZCLI) aks nodepool add -g $(GROUP) -n nplinux \
+		--node-count $(NODE_COUNT) \
+		--node-vm-size $(VM_SIZE) \
+		--cluster-name $(CLUSTER) \
+		--os-type Linux \
+		--max-pods 250 \
+		--subscription $(SUB) \
+		--tags fastpathenabled=true,aks-nic-enable-multi-tenancy=true \
+		--http-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/NetworkingMultiTenancyPreview \
+		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet
+
 down: ## Delete the cluster
 	$(AZCLI) aks delete -g $(GROUP) -n $(CLUSTER) --yes
 	@$(MAKE) unset-kubeconf