Skip to content

Commit 9f2b4f1

Browse files
committed
wait for cluster to exit updating state before adding windows nodepool
1 parent bc4fed1 commit 9f2b4f1

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.pipelines/singletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e-job-template.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ stages:
1111
- stage: ${{ parameters.clusterName }}
1212
displayName: Create Cluster - ${{ parameters.displayName }}
1313
dependsOn:
14-
- ${{ parameters.dependsOn }}
1514
- setup
1615
pool:
1716
name: $(BUILD_POOL_NAME_DEFAULT)

.pipelines/templates/add-windows-nodepool-job.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
demands:
1414
- agent.os -equals Linux
1515
- Role -equals $(CUSTOM_E2E_ROLE)
16+
timeoutInMinutes: 30
1617
steps:
1718
- task: AzureCLI@2
1819
inputs:
@@ -31,7 +32,22 @@ jobs:
3132
3233
if [ -z "$windows_nodepool" ]; then
3334
echo "No Windows node pool found in the AKS cluster."
34-
35+
36+
# wait for cluster to update
37+
while true; do
38+
cluster_state=$(az aks show \
39+
--name "${{ parameters.clusterName }}" \
40+
--resource-group "${{ parameters.clusterName }}" \
41+
--query provisioningState)
42+
43+
if echo "$cluster_state" | grep -q "Updating"; then
44+
echo "Cluster is updating. Sleeping for 30 seconds..."
45+
sleep 30
46+
else
47+
break
48+
fi
49+
done
50+
3551
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
3652
make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} VM_SIZE_WIN=${{ parameters.vmSize }}
3753
echo "Windows node was successfully added to v4 Overlay Cluster"

0 commit comments

Comments
 (0)