Skip to content

Commit 03e5495

Browse files
committed
remove if structure since win nodepool should never start off existing on cluster create
1 parent 81b1a08 commit 03e5495

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

hack/aks/Makefile

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,8 @@ linux-overlay-byocni-up: rg-up overlay-net-up ## Brings up a Linux Overlay BYO C
132132
@$(MAKE) set-kubeconf
133133

134134
windows-overlay-byocni-up: linux-overlay-byocni-up rg-up overlay-net-up ## Brings up a Windows Overlay BYO CNI cluster
135-
WINDOWS_NODEPOOL=$$(az aks nodepool list --resource-group $(GROUP) --cluster-name $(CLUSTER) --query "[?osType=='Windows']" --output tsv); \
136-
if [ -z "$$WINDOWS_NODEPOOL" ]; then \
137-
echo "No Windows node pool found in the AKS cluster."; \
138-
AZCLI="az" GROUP="$(GROUP)" CLUSTER="$(CLUSTER)" sh ../scripts/wait-cluster-update.sh; \
139-
$(MAKE) windows-nodepool-up; \
140-
else \
141-
echo "AKS cluster already has a Windows node pool."; \
142-
fi
135+
AZCLI="az" GROUP="$(GROUP)" CLUSTER="$(CLUSTER)" sh ../scripts/wait-cluster-update.sh
136+
$(MAKE) windows-nodepool-up
143137
@$(MAKE) set-kubeconf
144138

145139
overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy
@@ -414,14 +408,8 @@ linux-dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstac
414408
@$(MAKE) set-kubeconf
415409

416410
windows-dualstack-overlay-byocni-up: linux-dualstack-overlay-byocni-up
417-
WINDOWS_NODEPOOL=$$(az aks nodepool list --resource-group $(GROUP) --cluster-name $(CLUSTER) --query "[?osType=='Windows']" --output tsv); \
418-
if [ -z "$$WINDOWS_NODEPOOL" ]; then \
419-
echo "No Windows node pool found in the AKS cluster."; \
420-
AZCLI="az" GROUP="$(GROUP)" CLUSTER="$(CLUSTER)" sh ../scripts/wait-cluster-update.sh; \
421-
$(MAKE) windows-nodepool-up; \
422-
else \
423-
echo "AKS cluster already has a Windows node pool."; \
424-
fi
411+
AZCLI="az" GROUP="$(GROUP)" CLUSTER="$(CLUSTER)" sh ../scripts/wait-cluster-update.sh
412+
$(MAKE) windows-nodepool-up
425413
@$(MAKE) set-kubeconf
426414

427415
cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only

0 commit comments

Comments
 (0)