Skip to content

Commit b0f9c8c

Browse files
jpayne3506jpayne3506
authored
[ci] fix: make variable assignment (#3655)
* fix: make variable assignment * chore: copilot suggestion
1 parent 28331b4 commit b0f9c8c

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

‎hack/aks/Makefile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ VNET ?= $(CLUSTER)
3535

3636
# Long Term Support (LTS)
3737
ifeq ($(LTS),true)
38-
LTS = --k8s-support-plan AKSLongTermSupport --tier premium
38+
LTS_ARGS=--k8s-support-plan AKSLongTermSupport --tier premium
3939
else
40-
LTS =
40+
LTS_ARGS=
4141
endif
4242

4343
##@ Help
@@ -96,7 +96,7 @@ vars: ## Show the input vars configured for the cluster commands
9696
@echo NODE_COUNT=$(NODE_COUNT)
9797
@echo VMSS_NAME=$(VMSS_NAME)
9898
@echo K8S_VER=$(K8S_VER)
99-
@echo LTS=$(if $(LTS),$(LTS),empty)
99+
@echo LTS_ARGS=$(if $(LTS_ARGS),$(LTS_ARGS),$(LTS))
100100

101101

102102
##@ SWIFT Infra
@@ -142,7 +142,7 @@ nodesubnet-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Node
142142
--os-sku $(OS_SKU) \
143143
--no-ssh-key \
144144
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
145-
$(LTS) \
145+
$(LTS_ARGS) \
146146
--yes
147147
@$(MAKE) set-kubeconf
148148

@@ -160,7 +160,7 @@ overlay-byocni-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay BYO CNI clu
160160
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
161161
--no-ssh-key \
162162
--os-sku $(OS_SKU) \
163-
$(LTS) \
163+
$(LTS_ARGS) \
164164
--yes
165165
@$(MAKE) set-kubeconf
166166
ifeq ($(OS),windows)
@@ -181,7 +181,7 @@ overlay-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay
181181
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
182182
--no-ssh-key \
183183
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
184-
$(LTS) \
184+
$(LTS_ARGS) \
185185
--yes
186186
@$(MAKE) set-kubeconf
187187

@@ -199,7 +199,7 @@ overlay-cilium-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay Cilium clus
199199
--pod-cidr 192.168.0.0/16 \
200200
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
201201
--no-ssh-key \
202-
$(LTS) \
202+
$(LTS_ARGS) \
203203
--yes
204204
@$(MAKE) set-kubeconf
205205

@@ -216,7 +216,7 @@ overlay-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay AzCNI cluster
216216
--pod-cidr 192.168.0.0/16 \
217217
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
218218
--no-ssh-key \
219-
$(LTS) \
219+
$(LTS_ARGS) \
220220
--yes
221221
@$(MAKE) set-kubeconf
222222

@@ -233,7 +233,7 @@ swift-byocni-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI cluster
233233
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
234234
--no-ssh-key \
235235
--os-sku $(OS_SKU) \
236-
$(LTS) \
236+
$(LTS_ARGS) \
237237
--yes
238238
ifeq ($(OS),windows)
239239
@$(MAKE) windows-swift-nodepool-up
@@ -254,7 +254,7 @@ swift-byocni-nokubeproxy-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI
254254
--no-ssh-key \
255255
--os-sku $(OS_SKU) \
256256
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
257-
$(LTS) \
257+
$(LTS_ARGS) \
258258
--yes
259259
@$(MAKE) set-kubeconf
260260

@@ -272,7 +272,7 @@ swift-cilium-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT Cilium cluster
272272
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
273273
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
274274
--no-ssh-key \
275-
$(LTS) \
275+
$(LTS_ARGS) \
276276
--yes
277277
@$(MAKE) set-kubeconf
278278

@@ -288,7 +288,7 @@ swift-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI cluster
288288
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
289289
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
290290
--no-ssh-key \
291-
$(LTS) \
291+
$(LTS_ARGS) \
292292
--yes
293293
@$(MAKE) set-kubeconf
294294

@@ -303,7 +303,7 @@ swiftv2-multitenancy-cluster-up: rg-up ipv4
303303
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
304304
--nodepool-tags fastpathenabled=true \
305305
--no-ssh-key \
306-
$(LTS) \
306+
$(LTS_ARGS) \
307307
--yes
308308
@$(MAKE) set-kubeconf
309309

@@ -334,7 +334,7 @@ vnetscale-swift-byocni-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet
334334
--no-ssh-key \
335335
--os-sku $(OS_SKU) \
336336
--pod-ip-allocation-mode StaticBlock \
337-
$(LTS) \
337+
$(LTS_ARGS) \
338338
--yes
339339
@$(MAKE) set-kubeconf
340340

@@ -353,7 +353,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up ipv4 vnetscale-swift-net-up ## Brin
353353
--os-sku $(OS_SKU) \
354354
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
355355
--pod-ip-allocation-mode StaticBlock \
356-
$(LTS) \
356+
$(LTS_ARGS) \
357357
--yes
358358
@$(MAKE) set-kubeconf
359359

@@ -372,7 +372,7 @@ vnetscale-swift-cilium-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet
372372
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
373373
--no-ssh-key \
374374
--pod-ip-allocation-mode StaticBlock \
375-
$(LTS) \
375+
$(LTS_ARGS) \
376376
--yes
377377
@$(MAKE) set-kubeconf
378378

@@ -389,7 +389,7 @@ vnetscale-swift-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale S
389389
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
390390
--no-ssh-key \
391391
--pod-ip-allocation-mode StaticBlock \
392-
$(LTS) \
392+
$(LTS_ARGS) \
393393
--yes
394394
@$(MAKE) set-kubeconf
395395

@@ -406,7 +406,7 @@ cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a CNIv1 cluster
406406
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
407407
--os-sku $(OS_SKU) \
408408
--no-ssh-key \
409-
$(LTS) \
409+
$(LTS_ARGS) \
410410
--yes
411411
@$(MAKE) set-kubeconf
412412
ifeq ($(OS),windows)
@@ -427,7 +427,7 @@ dualstack-overlay-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack O
427427
--ip-families ipv4,ipv6 \
428428
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
429429
--no-ssh-key \
430-
$(LTS) \
430+
$(LTS_ARGS) \
431431
--yes
432432
@$(MAKE) set-kubeconf
433433

@@ -445,7 +445,7 @@ dualstack-overlay-byocni-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dual
445445
--ip-families ipv4,ipv6 \
446446
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
447447
--no-ssh-key \
448-
$(LTS) \
448+
$(LTS_ARGS) \
449449
--yes
450450
@$(MAKE) set-kubeconf
451451
ifeq ($(OS),windows)
@@ -467,7 +467,7 @@ cilium-dualstack-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a Cilium Dualst
467467
--ip-families ipv4,ipv6 \
468468
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
469469
--no-ssh-key \
470-
$(LTS) \
470+
$(LTS_ARGS) \
471471
--yes
472472
@$(MAKE) set-kubeconf
473473

@@ -486,7 +486,7 @@ dualstack-byocni-nokubeproxy-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a D
486486
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
487487
--no-ssh-key \
488488
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
489-
$(LTS) \
489+
$(LTS_ARGS) \
490490
--yes
491491
@$(MAKE) set-kubeconf
492492

0 commit comments

Comments
 (0)