Skip to content

Commit 055ff30

Browse files
jpayne3506jpayne3506
authored
[forwardport] ci: future proof for LTS clusters (#3620) (#3626)
ci: future proof for LTS clusters (#3620) * ci: future proof for LTS clusters * chore: include all clusters
1 parent 5310d81 commit 055ff30

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

‎hack/aks/Makefile‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@ PUBLIC_IP_ID ?= /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/
2525
PUBLIC_IPv4 ?= $(PUBLIC_IP_ID)/$(IP_PREFIX)-$(CLUSTER)-v4
2626
PUBLIC_IPv6 ?= $(PUBLIC_IP_ID)/$(IP_PREFIX)-$(CLUSTER)-v6
2727
KUBE_PROXY_JSON_PATH ?= ./kube-proxy.json
28+
LTS ?= false
2829

2930
# overrideable variables
3031
SUB ?= $(AZURE_SUBSCRIPTION)
3132
CLUSTER ?= $(USER)-$(REGION)
3233
GROUP ?= $(CLUSTER)
3334
VNET ?= $(CLUSTER)
3435

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

3745
help: ## Display this help
@@ -88,6 +96,7 @@ vars: ## Show the input vars configured for the cluster commands
8896
@echo NODE_COUNT=$(NODE_COUNT)
8997
@echo VMSS_NAME=$(VMSS_NAME)
9098
@echo K8S_VER=$(K8S_VER)
99+
@echo LTS=$(if $(LTS),$(LTS),empty)
91100

92101

93102
##@ SWIFT Infra
@@ -133,6 +142,7 @@ nodesubnet-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Node
133142
--os-sku $(OS_SKU) \
134143
--no-ssh-key \
135144
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
145+
$(LTS) \
136146
--yes
137147
@$(MAKE) set-kubeconf
138148

@@ -150,6 +160,7 @@ overlay-byocni-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay BYO CNI clu
150160
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
151161
--no-ssh-key \
152162
--os-sku $(OS_SKU) \
163+
$(LTS) \
153164
--yes
154165
@$(MAKE) set-kubeconf
155166
ifeq ($(OS),windows)
@@ -170,6 +181,7 @@ overlay-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay
170181
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
171182
--no-ssh-key \
172183
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
184+
$(LTS) \
173185
--yes
174186
@$(MAKE) set-kubeconf
175187

@@ -187,6 +199,7 @@ overlay-cilium-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay Cilium clus
187199
--pod-cidr 192.168.0.0/16 \
188200
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
189201
--no-ssh-key \
202+
$(LTS) \
190203
--yes
191204
@$(MAKE) set-kubeconf
192205

@@ -203,6 +216,7 @@ overlay-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay AzCNI cluster
203216
--pod-cidr 192.168.0.0/16 \
204217
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
205218
--no-ssh-key \
219+
$(LTS) \
206220
--yes
207221
@$(MAKE) set-kubeconf
208222

@@ -219,6 +233,7 @@ swift-byocni-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI cluster
219233
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
220234
--no-ssh-key \
221235
--os-sku $(OS_SKU) \
236+
$(LTS) \
222237
--yes
223238
ifeq ($(OS),windows)
224239
@$(MAKE) windows-swift-nodepool-up
@@ -239,6 +254,7 @@ swift-byocni-nokubeproxy-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI
239254
--no-ssh-key \
240255
--os-sku $(OS_SKU) \
241256
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
257+
$(LTS) \
242258
--yes
243259
@$(MAKE) set-kubeconf
244260

@@ -256,6 +272,7 @@ swift-cilium-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT Cilium cluster
256272
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
257273
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
258274
--no-ssh-key \
275+
$(LTS) \
259276
--yes
260277
@$(MAKE) set-kubeconf
261278

@@ -271,6 +288,7 @@ swift-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI cluster
271288
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
272289
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
273290
--no-ssh-key \
291+
$(LTS) \
274292
--yes
275293
@$(MAKE) set-kubeconf
276294

@@ -285,6 +303,7 @@ swiftv2-multitenancy-cluster-up: rg-up ipv4
285303
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
286304
--nodepool-tags fastpathenabled=true \
287305
--no-ssh-key \
306+
$(LTS) \
288307
--yes
289308
@$(MAKE) set-kubeconf
290309

@@ -315,6 +334,7 @@ vnetscale-swift-byocni-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet
315334
--no-ssh-key \
316335
--os-sku $(OS_SKU) \
317336
--pod-ip-allocation-mode StaticBlock \
337+
$(LTS) \
318338
--yes
319339
@$(MAKE) set-kubeconf
320340

@@ -333,6 +353,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up ipv4 vnetscale-swift-net-up ## Brin
333353
--os-sku $(OS_SKU) \
334354
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
335355
--pod-ip-allocation-mode StaticBlock \
356+
$(LTS) \
336357
--yes
337358
@$(MAKE) set-kubeconf
338359

@@ -351,6 +372,7 @@ vnetscale-swift-cilium-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet
351372
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
352373
--no-ssh-key \
353374
--pod-ip-allocation-mode StaticBlock \
375+
$(LTS) \
354376
--yes
355377
@$(MAKE) set-kubeconf
356378

@@ -367,6 +389,7 @@ vnetscale-swift-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale S
367389
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
368390
--no-ssh-key \
369391
--pod-ip-allocation-mode StaticBlock \
392+
$(LTS) \
370393
--yes
371394
@$(MAKE) set-kubeconf
372395

@@ -383,6 +406,7 @@ cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a CNIv1 cluster
383406
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
384407
--os-sku $(OS_SKU) \
385408
--no-ssh-key \
409+
$(LTS) \
386410
--yes
387411
@$(MAKE) set-kubeconf
388412
ifeq ($(OS),windows)
@@ -403,6 +427,7 @@ dualstack-overlay-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack O
403427
--ip-families ipv4,ipv6 \
404428
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
405429
--no-ssh-key \
430+
$(LTS) \
406431
--yes
407432
@$(MAKE) set-kubeconf
408433

@@ -420,6 +445,7 @@ dualstack-overlay-byocni-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dual
420445
--ip-families ipv4,ipv6 \
421446
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
422447
--no-ssh-key \
448+
$(LTS) \
423449
--yes
424450
@$(MAKE) set-kubeconf
425451
ifeq ($(OS),windows)
@@ -441,6 +467,7 @@ cilium-dualstack-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a Cilium Dualst
441467
--ip-families ipv4,ipv6 \
442468
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
443469
--no-ssh-key \
470+
$(LTS) \
444471
--yes
445472
@$(MAKE) set-kubeconf
446473

@@ -459,6 +486,7 @@ dualstack-byocni-nokubeproxy-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a D
459486
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
460487
--no-ssh-key \
461488
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
489+
$(LTS) \
462490
--yes
463491
@$(MAKE) set-kubeconf
464492

0 commit comments

Comments
 (0)