Skip to content

Commit 2bf3a38

Browse files
jpayne3506jpayne3506
authored
ci: future proof for LTS clusters (#3620)
* ci: future proof for LTS clusters * chore: include all clusters
1 parent f5b05e2 commit 2bf3a38

File tree

1 file changed

+27
-38
lines changed

1 file changed

+27
-38
lines changed

‎hack/aks/Makefile‎

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,21 @@ OS_SKU_WIN ?= Windows2022
1919
REGION ?= westus2
2020
VM_SIZE ?= Standard_B2s
2121
VM_SIZE_WIN ?= Standard_B2s
22+
LTS ?= true
2223

2324
# overrideable variables
2425
SUB ?= $(AZURE_SUBSCRIPTION)
2526
CLUSTER ?= $(USER)-$(REGION)
2627
GROUP ?= $(CLUSTER)
2728
VNET ?= $(CLUSTER)
2829

30+
# Long Term Support (LTS)
31+
ifeq ($(LTS),true)
32+
LTS = --k8s-support-plan AKSLongTermSupport --tier premium
33+
else
34+
LTS =
35+
endif
36+
2937
##@ Help
3038

3139
help: ## Display this help
@@ -64,6 +72,7 @@ vars: ## Show the input vars configured for the cluster commands
6472
@echo VM_SIZE=$(VM_SIZE)
6573
@echo NODE_COUNT=$(NODE_COUNT)
6674
@echo VMSS_NAME=$(VMSS_NAME)
75+
@echo LTS=$(if $(LTS),$(LTS),empty)
6776

6877

6978
##@ SWIFT Infra
@@ -103,14 +112,13 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster
103112
--node-count $(NODE_COUNT) \
104113
--node-vm-size $(VM_SIZE) \
105114
--load-balancer-sku standard \
106-
--k8s-support-plan AKSLongTermSupport \
107-
--tier premium \
108115
--network-plugin none \
109116
--network-plugin-mode overlay \
110117
--pod-cidr 192.168.0.0/16 \
111118
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
112119
--no-ssh-key \
113120
--os-sku $(OS_SKU) \
121+
$(LTS) \
114122
--yes
115123
ifeq ($(OS),windows)
116124
@$(MAKE) windows-nodepool-up
@@ -124,14 +132,13 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO
124132
--kubernetes-version $(K8S_VER) \
125133
--node-count $(NODE_COUNT) \
126134
--node-vm-size $(VM_SIZE) \
127-
--k8s-support-plan AKSLongTermSupport \
128-
--tier premium \
129135
--network-plugin none \
130136
--network-plugin-mode overlay \
131137
--pod-cidr 192.168.0.0/16 \
132138
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
133139
--no-ssh-key \
134140
--kube-proxy-config ./kube-proxy.json \
141+
$(LTS) \
135142
--yes
136143
@$(MAKE) set-kubeconf
137144

@@ -142,14 +149,13 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster
142149
--kubernetes-version $(K8S_VER) \
143150
--node-count $(NODE_COUNT) \
144151
--node-vm-size $(VM_SIZE) \
145-
--k8s-support-plan AKSLongTermSupport \
146-
--tier premium \
147152
--network-plugin azure \
148153
--network-dataplane cilium \
149154
--network-plugin-mode overlay \
150155
--pod-cidr 192.168.0.0/16 \
151156
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
152157
--no-ssh-key \
158+
$(LTS) \
153159
--yes
154160
@$(MAKE) set-kubeconf
155161

@@ -160,13 +166,12 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
160166
--kubernetes-version $(K8S_VER) \
161167
--node-count $(NODE_COUNT) \
162168
--node-vm-size $(VM_SIZE) \
163-
--k8s-support-plan AKSLongTermSupport \
164-
--tier premium \
165169
--network-plugin azure \
166170
--network-plugin-mode overlay \
167171
--pod-cidr 192.168.0.0/16 \
168172
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
169173
--no-ssh-key \
174+
$(LTS) \
170175
--yes
171176
@$(MAKE) set-kubeconf
172177

@@ -178,13 +183,12 @@ swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster
178183
--node-count $(NODE_COUNT) \
179184
--node-vm-size $(VM_SIZE) \
180185
--load-balancer-sku standard \
181-
--k8s-support-plan AKSLongTermSupport \
182-
--tier premium \
183186
--network-plugin none \
184187
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
185188
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
186189
--no-ssh-key \
187190
--os-sku $(OS_SKU) \
191+
$(LTS) \
188192
--yes
189193
ifeq ($(OS),windows)
190194
@$(MAKE) windows-swift-nodepool-up
@@ -198,14 +202,13 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus
198202
--kubernetes-version $(K8S_VER) \
199203
--node-count $(NODE_COUNT) \
200204
--node-vm-size $(VM_SIZE) \
201-
--k8s-support-plan AKSLongTermSupport \
202-
--tier premium \
203205
--network-plugin none \
204206
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
205207
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
206208
--no-ssh-key \
207209
--os-sku $(OS_SKU) \
208210
--kube-proxy-config ./kube-proxy.json \
211+
$(LTS) \
209212
--yes
210213
@$(MAKE) set-kubeconf
211214

@@ -216,14 +219,13 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster
216219
--kubernetes-version $(K8S_VER) \
217220
--node-count $(NODE_COUNT) \
218221
--node-vm-size $(VM_SIZE) \
219-
--k8s-support-plan AKSLongTermSupport \
220-
--tier premium \
221222
--network-plugin azure \
222223
--network-dataplane cilium \
223224
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
224225
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
225226
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
226227
--no-ssh-key \
228+
$(LTS) \
227229
--yes
228230
@$(MAKE) set-kubeconf
229231

@@ -234,12 +236,11 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
234236
--kubernetes-version $(K8S_VER) \
235237
--node-count $(NODE_COUNT) \
236238
--node-vm-size $(VM_SIZE) \
237-
--k8s-support-plan AKSLongTermSupport \
238-
--tier premium \
239239
--network-plugin azure \
240240
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
241241
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
242242
--no-ssh-key \
243+
$(LTS) \
243244
--yes
244245
@$(MAKE) set-kubeconf
245246

@@ -250,11 +251,10 @@ swiftv2-multitenancy-cluster-up: rg-up
250251
--kubernetes-version 1.28 \
251252
--nodepool-name "mtapool" \
252253
--node-vm-size $(VM_SIZE) \
253-
--k8s-support-plan AKSLongTermSupport \
254-
--tier premium \
255254
--node-count 2 \
256255
--nodepool-tags fastpathenabled=true \
257256
--no-ssh-key \
257+
$(LTS) \
258258
--yes
259259
@$(MAKE) set-kubeconf
260260

@@ -277,13 +277,12 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale
277277
--kubernetes-version $(K8S_VER) \
278278
--node-count $(NODE_COUNT) \
279279
--node-vm-size $(VM_SIZE) \
280-
--k8s-support-plan AKSLongTermSupport \
281-
--tier premium \
282280
--network-plugin none \
283281
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
284282
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
285283
--no-ssh-key \
286284
--os-sku $(OS_SKU) \
285+
$(LTS) \
287286
--yes
288287
@$(MAKE) set-kubeconf
289288

@@ -294,14 +293,13 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up
294293
--kubernetes-version $(K8S_VER) \
295294
--node-count $(NODE_COUNT) \
296295
--node-vm-size $(VM_SIZE) \
297-
--k8s-support-plan AKSLongTermSupport \
298-
--tier premium \
299296
--network-plugin none \
300297
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
301298
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
302299
--no-ssh-key \
303300
--os-sku $(OS_SKU) \
304301
--kube-proxy-config ./kube-proxy.json \
302+
$(LTS) \
305303
--yes
306304
@$(MAKE) set-kubeconf
307305

@@ -312,14 +310,13 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale
312310
--kubernetes-version $(K8S_VER) \
313311
--node-count $(NODE_COUNT) \
314312
--node-vm-size $(VM_SIZE) \
315-
--k8s-support-plan AKSLongTermSupport \
316-
--tier premium \
317313
--network-plugin azure \
318314
--network-dataplane cilium \
319315
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
320316
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
321317
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
322318
--no-ssh-key \
319+
$(LTS) \
323320
--yes
324321
@$(MAKE) set-kubeconf
325322

@@ -330,8 +327,6 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT
330327
--kubernetes-version $(K8S_VER) \
331328
--node-count $(NODE_COUNT) \
332329
--node-vm-size $(VM_SIZE) \
333-
--k8s-support-plan AKSLongTermSupport \
334-
--tier premium \
335330
--network-plugin azure \
336331
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
337332
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
@@ -346,13 +341,12 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster
346341
--kubernetes-version $(K8S_VER) \
347342
--node-count $(NODE_COUNT) \
348343
--node-vm-size $(VM_SIZE) \
349-
--k8s-support-plan AKSLongTermSupport \
350-
--tier premium \
351344
--network-plugin azure \
352345
--windows-admin-password $(WINDOWS_PASSWORD) \
353346
--windows-admin-username $(WINDOWS_USERNAME) \
354347
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
355348
--no-ssh-key \
349+
$(LTS) \
356350
--yes
357351
@$(MAKE) windows-nodepool-up
358352
@$(MAKE) set-kubeconf
@@ -364,13 +358,12 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster
364358
--kubernetes-version $(K8S_VER) \
365359
--node-count $(NODE_COUNT) \
366360
--node-vm-size $(VM_SIZE) \
367-
--k8s-support-plan AKSLongTermSupport \
368-
--tier premium \
369361
--max-pods 250 \
370362
--network-plugin azure \
371363
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
372364
--os-sku $(OS_SKU) \
373365
--no-ssh-key \
366+
$(LTS) \
374367
--yes
375368
@$(MAKE) set-kubeconf
376369

@@ -381,14 +374,13 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu
381374
--kubernetes-version $(K8S_VER) \
382375
--node-count $(NODE_COUNT) \
383376
--node-vm-size $(VM_SIZE) \
384-
--k8s-support-plan AKSLongTermSupport \
385-
--tier premium \
386377
--network-plugin azure \
387378
--network-plugin-mode overlay \
388379
--subscription $(SUB) \
389380
--ip-families ipv4,ipv6 \
390381
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
391382
--no-ssh-key \
383+
$(LTS) \
392384
--yes
393385
@$(MAKE) set-kubeconf
394386

@@ -399,14 +391,13 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over
399391
--kubernetes-version $(K8S_VER) \
400392
--node-count $(NODE_COUNT) \
401393
--node-vm-size $(VM_SIZE) \
402-
--k8s-support-plan AKSLongTermSupport \
403-
--tier premium \
404394
--network-plugin none \
405395
--network-plugin-mode overlay \
406396
--subscription $(SUB) \
407397
--ip-families ipv4,ipv6 \
408398
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
409399
--no-ssh-key \
400+
$(LTS) \
410401
--yes
411402
@$(MAKE) set-kubeconf
412403

@@ -417,15 +408,14 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla
417408
--kubernetes-version $(K8S_VER) \
418409
--node-count $(NODE_COUNT) \
419410
--node-vm-size $(VM_SIZE) \
420-
--k8s-support-plan AKSLongTermSupport \
421-
--tier premium \
422411
--network-plugin azure \
423412
--network-plugin-mode overlay \
424413
--network-dataplane cilium \
425414
--subscription $(SUB) \
426415
--ip-families ipv4,ipv6 \
427416
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
428417
--no-ssh-key \
418+
$(LTS) \
429419
--yes
430420
@$(MAKE) set-kubeconf
431421

@@ -436,15 +426,14 @@ dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack o
436426
--kubernetes-version $(K8S_VER) \
437427
--node-count $(NODE_COUNT) \
438428
--node-vm-size $(VM_SIZE) \
439-
--k8s-support-plan AKSLongTermSupport \
440-
--tier premium \
441429
--network-plugin none \
442430
--network-plugin-mode overlay \
443431
--subscription $(SUB) \
444432
--ip-families ipv4,ipv6 \
445433
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
446434
--no-ssh-key \
447435
--kube-proxy-config ./kube-proxy.json \
436+
$(LTS) \
448437
--yes
449438
@$(MAKE) set-kubeconf
450439

0 commit comments

Comments
 (0)