Skip to content

Commit 2938c1f

Browse files
authored
ci: nodepool scale down for cilium pipeline (#3096)
* nodepool scale down instead of vmss scale * replace make target for scale-vmss with scale-nodes * set scale down to 5 * add nodepool name to scale target
1 parent 97bcdb5 commit 2938c1f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.pipelines/cni/cilium/cilium-scale-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ stages:
117117
new_count=${NODE_COUNT_UP} # Do not exceed NODE_COUNT_UP
118118
fi
119119
echo "Scaling up nodes to $new_count"
120-
az aks nodepool scale --name nodepool1 --cluster-name ${CLUSTER} --resource-group ${RESOURCE_GROUP} --node-count $new_count
120+
make -C ./hack/aks scale-nodes AZCLI=az GROUP=${RESOURCE_GROUP} CLUSTER=${CLUSTER} NODEPOOL=nodepool1 NODE_COUNT=$new_count
121121
if [ $new_count -eq ${NODE_COUNT_UP} ]; then
122122
echo "Node count reached ${NODE_COUNT_UP}"
123123
break
@@ -442,6 +442,7 @@ stages:
442442
- job: scale_down
443443
pool:
444444
name: "$(BUILD_POOL_NAME_DEFAULT)"
445+
timeoutInMinutes: 120
445446
steps:
446447
- task: AzureCLI@2
447448
inputs:
@@ -453,8 +454,7 @@ stages:
453454
set -ex
454455
az aks get-credentials --resource-group ${RESOURCE_GROUP} --name ${CLUSTER}
455456
echo "Scaling to 5 nodes"
456-
vmss_name=$(az vmss list -g MC_${RESOURCE_GROUP}_${CLUSTER}_$(LOCATION) --query "[].name" -o tsv)
457-
make -C ./hack/aks scale-vmss AZCLI=az GROUP=${RESOURCE_GROUP} CLUSTER=${CLUSTER} REGION=$(LOCATION) VMSS_NAME=$vmss_name NODE_COUNT=5
457+
make -C ./hack/aks scale-nodes AZCLI=az GROUP=${RESOURCE_GROUP} CLUSTER=${CLUSTER} NODEPOOL=nodepool1 NODE_COUNT=5
458458
kubectl get node
459459
name: "ScaleDown"
460460
displayName: "Scale down to 5 Nodes"

hack/aks/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,5 +467,5 @@ down: ## Delete the cluster
467467
restart-vmss: ## Restarts the nodes in the cluster
468468
$(AZCLI) vmss restart -g MC_${GROUP}_${CLUSTER}_${REGION} --name $(VMSS_NAME)
469469

470-
scale-vmss: ## Scales the nodes in the cluster
471-
$(AZCLI) vmss scale -g MC_${GROUP}_${CLUSTER}_${REGION} --name $(VMSS_NAME) --new-capacity $(NODE_COUNT)
470+
scale-nodes: ## Scales the nodes in the cluster
471+
$(AZCLI) aks nodepool scale --resource-group $(GROUP) --cluster-name $(CLUSTER) --name $(NODEPOOL) --node-count $(NODE_COUNT)

0 commit comments

Comments
 (0)