Skip to content

Commit e2a64d0

Browse files
jpayne3506jpayne3506
committed
fix: make variable assignment
1 parent 5858b50 commit e2a64d0

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

‎hack/aks/Makefile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ CLUSTER ?= $(USER)-$(REGION)
3232
GROUP ?= $(CLUSTER)
3333
VNET ?= $(CLUSTER)
3434

35+
# Long Term Support (LTS)
36+
ifeq ($(LTS),true)
37+
LTS_ARGS=--k8s-support-plan AKSLongTermSupport --tier premium
38+
else
39+
LTS_ARGS=
40+
endif
41+
3542
##@ Help
3643

3744
help: ## Display this help
@@ -88,6 +95,7 @@ vars: ## Show the input vars configured for the cluster commands
8895
@echo NODE_COUNT=$(NODE_COUNT)
8996
@echo VMSS_NAME=$(VMSS_NAME)
9097
@echo K8S_VER=$(K8S_VER)
98+
@echo LTS_ARGS=$(if $(LTS),$(LTS_ARGS),$(LTS))
9199

92100

93101
##@ SWIFT Infra
@@ -133,6 +141,7 @@ nodesubnet-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Node
133141
--os-sku $(OS_SKU) \
134142
--no-ssh-key \
135143
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
144+
$(LTS_ARGS) \
136145
--yes
137146
@$(MAKE) set-kubeconf
138147

@@ -150,6 +159,7 @@ overlay-byocni-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay BYO CNI clu
150159
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
151160
--no-ssh-key \
152161
--os-sku $(OS_SKU) \
162+
$(LTS_ARGS) \
153163
--yes
154164
@$(MAKE) set-kubeconf
155165
ifeq ($(OS),windows)
@@ -170,6 +180,7 @@ overlay-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay
170180
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
171181
--no-ssh-key \
172182
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
183+
$(LTS_ARGS) \
173184
--yes
174185
@$(MAKE) set-kubeconf
175186

@@ -187,6 +198,7 @@ overlay-cilium-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay Cilium clus
187198
--pod-cidr 192.168.0.0/16 \
188199
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
189200
--no-ssh-key \
201+
$(LTS_ARGS) \
190202
--yes
191203
@$(MAKE) set-kubeconf
192204

@@ -203,6 +215,7 @@ overlay-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay AzCNI cluster
203215
--pod-cidr 192.168.0.0/16 \
204216
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
205217
--no-ssh-key \
218+
$(LTS_ARGS) \
206219
--yes
207220
@$(MAKE) set-kubeconf
208221
ifeq ($(OS),windows)
@@ -222,6 +235,7 @@ swift-byocni-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI cluster
222235
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
223236
--no-ssh-key \
224237
--os-sku $(OS_SKU) \
238+
$(LTS_ARGS) \
225239
--yes
226240
ifeq ($(OS),windows)
227241
@$(MAKE) windows-swift-nodepool-up
@@ -242,6 +256,7 @@ swift-byocni-nokubeproxy-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI
242256
--no-ssh-key \
243257
--os-sku $(OS_SKU) \
244258
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
259+
$(LTS_ARGS) \
245260
--yes
246261
@$(MAKE) set-kubeconf
247262

@@ -259,6 +274,7 @@ swift-cilium-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT Cilium cluster
259274
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
260275
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
261276
--no-ssh-key \
277+
$(LTS_ARGS) \
262278
--yes
263279
@$(MAKE) set-kubeconf
264280

@@ -274,6 +290,7 @@ swift-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI cluster
274290
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
275291
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
276292
--no-ssh-key \
293+
$(LTS_ARGS) \
277294
--yes
278295
@$(MAKE) set-kubeconf
279296

@@ -288,6 +305,7 @@ swiftv2-multitenancy-cluster-up: rg-up ipv4
288305
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
289306
--nodepool-tags fastpathenabled=true \
290307
--no-ssh-key \
308+
$(LTS_ARGS) \
291309
--yes
292310
@$(MAKE) set-kubeconf
293311

@@ -318,6 +336,7 @@ vnetscale-swift-byocni-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet
318336
--no-ssh-key \
319337
--os-sku $(OS_SKU) \
320338
--pod-ip-allocation-mode StaticBlock \
339+
$(LTS_ARGS) \
321340
--yes
322341
@$(MAKE) set-kubeconf
323342

@@ -336,6 +355,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up ipv4 vnetscale-swift-net-up ## Brin
336355
--os-sku $(OS_SKU) \
337356
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
338357
--pod-ip-allocation-mode StaticBlock \
358+
$(LTS_ARGS) \
339359
--yes
340360
@$(MAKE) set-kubeconf
341361

@@ -354,6 +374,7 @@ vnetscale-swift-cilium-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet
354374
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
355375
--no-ssh-key \
356376
--pod-ip-allocation-mode StaticBlock \
377+
$(LTS_ARGS) \
357378
--yes
358379
@$(MAKE) set-kubeconf
359380

@@ -370,6 +391,7 @@ vnetscale-swift-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale S
370391
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
371392
--no-ssh-key \
372393
--pod-ip-allocation-mode StaticBlock \
394+
$(LTS_ARGS) \
373395
--yes
374396
@$(MAKE) set-kubeconf
375397

@@ -386,6 +408,7 @@ cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a CNIv1 cluster
386408
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
387409
--os-sku $(OS_SKU) \
388410
--no-ssh-key \
411+
$(LTS_ARGS) \
389412
--yes
390413
@$(MAKE) set-kubeconf
391414
ifeq ($(OS),windows)
@@ -406,6 +429,7 @@ dualstack-overlay-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack O
406429
--ip-families ipv4,ipv6 \
407430
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
408431
--no-ssh-key \
432+
$(LTS_ARGS) \
409433
--yes
410434
@$(MAKE) set-kubeconf
411435

@@ -423,6 +447,7 @@ dualstack-overlay-byocni-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dual
423447
--ip-families ipv4,ipv6 \
424448
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
425449
--no-ssh-key \
450+
$(LTS_ARGS) \
426451
--yes
427452
@$(MAKE) set-kubeconf
428453
ifeq ($(OS),windows)
@@ -444,6 +469,7 @@ cilium-dualstack-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a Cilium Dualst
444469
--ip-families ipv4,ipv6 \
445470
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
446471
--no-ssh-key \
472+
$(LTS_ARGS) \
447473
--yes
448474
@$(MAKE) set-kubeconf
449475

@@ -462,6 +488,7 @@ dualstack-byocni-nokubeproxy-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a D
462488
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
463489
--no-ssh-key \
464490
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
491+
$(LTS_ARGS) \
465492
--yes
466493
@$(MAKE) set-kubeconf
467494

0 commit comments

Comments
 (0)