Skip to content

Commit a19106b

Browse files
jpayne3506jpayne3506
authored
[backport] ci: future proof for LTS clusters (#3620) (#3627)
ci: future proof for LTS clusters (#3620)
1 parent 0e9b722 commit a19106b

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

‎hack/aks/Makefile

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,21 @@ OS_SKU_WIN ?= Windows2022
1717
REGION ?= westus2
1818
VM_SIZE ?= Standard_B2s
1919
VM_SIZE_WIN ?= Standard_B2s
20+
LTS ?= true
2021

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

28+
# Long Term Support (LTS)
29+
ifeq ($(LTS),true)
30+
LTS = --k8s-support-plan AKSLongTermSupport --tier premium
31+
else
32+
LTS =
33+
endif
34+
2735
##@ Help
2836

2937
help: ## Display this help
@@ -62,6 +70,7 @@ vars: ## Show the input vars configured for the cluster commands
6270
@echo VM_SIZE=$(VM_SIZE)
6371
@echo NODE_COUNT=$(NODE_COUNT)
6472
@echo VMSS_NAME=$(VMSS_NAME)
73+
@echo LTS=$(if $(LTS),$(LTS),empty)
6574

6675

6776
##@ SWIFT Infra
@@ -95,13 +104,12 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster
95104
--kubernetes-version $(K8S_VER) \
96105
--node-count $(NODE_COUNT) \
97106
--node-vm-size $(VM_SIZE) \
98-
--k8s-support-plan AKSLongTermSupport \
99-
--tier premium \
100107
--network-plugin none \
101108
--network-plugin-mode overlay \
102109
--pod-cidr 192.168.0.0/16 \
103110
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
104111
--no-ssh-key \
112+
$(LTS) \
105113
--yes
106114
@$(MAKE) set-kubeconf
107115

@@ -112,14 +120,13 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster
112120
--kubernetes-version $(K8S_VER) \
113121
--node-count $(NODE_COUNT) \
114122
--node-vm-size $(VM_SIZE) \
115-
--k8s-support-plan AKSLongTermSupport \
116-
--tier premium \
117123
--network-plugin azure \
118124
--network-dataplane cilium \
119125
--network-plugin-mode overlay \
120126
--pod-cidr 192.168.0.0/16 \
121127
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
122128
--no-ssh-key \
129+
$(LTS) \
123130
--yes
124131
@$(MAKE) set-kubeconf
125132

@@ -130,13 +137,12 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
130137
--kubernetes-version $(K8S_VER) \
131138
--node-count $(NODE_COUNT) \
132139
--node-vm-size $(VM_SIZE) \
133-
--k8s-support-plan AKSLongTermSupport \
134-
--tier premium \
135140
--network-plugin azure \
136141
--network-plugin-mode overlay \
137142
--pod-cidr 192.168.0.0/16 \
138143
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
139144
--no-ssh-key \
145+
$(LTS) \
140146
--yes
141147
@$(MAKE) set-kubeconf
142148

@@ -147,13 +153,12 @@ swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster
147153
--kubernetes-version $(K8S_VER) \
148154
--node-count $(NODE_COUNT) \
149155
--node-vm-size $(VM_SIZE) \
150-
--k8s-support-plan AKSLongTermSupport \
151-
--tier premium \
152156
--network-plugin none \
153157
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
154158
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
155159
--no-ssh-key \
156160
--os-sku $(OS_SKU) \
161+
$(LTS) \
157162
--yes
158163
@$(MAKE) set-kubeconf
159164

@@ -165,14 +170,13 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster
165170
--kubernetes-version $(K8S_VER) \
166171
--node-count $(NODE_COUNT) \
167172
--node-vm-size $(VM_SIZE) \
168-
--k8s-support-plan AKSLongTermSupport \
169-
--tier premium \
170173
--network-plugin azure \
171174
--network-dataplane cilium \
172175
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
173176
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
174177
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
175178
--no-ssh-key \
179+
$(LTS) \
176180
--yes
177181
@$(MAKE) set-kubeconf
178182

@@ -183,12 +187,11 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
183187
--kubernetes-version $(K8S_VER) \
184188
--node-count $(NODE_COUNT) \
185189
--node-vm-size $(VM_SIZE) \
186-
--k8s-support-plan AKSLongTermSupport \
187-
--tier premium \
188190
--network-plugin azure \
189191
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
190192
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
191193
--no-ssh-key \
194+
$(LTS) \
192195
--yes
193196
@$(MAKE) set-kubeconf
194197

@@ -199,14 +202,13 @@ cilium-overlay-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster
199202
--kubernetes-version $(K8S_VER) \
200203
--node-count $(NODE_COUNT) \
201204
--node-vm-size $(VM_SIZE) \
202-
--k8s-support-plan AKSLongTermSupport \
203-
--tier premium \
204205
--network-plugin none \
205206
--network-plugin-mode overlay \
206207
--pod-cidr 192.168.0.0/16 \
207208
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
208209
--no-ssh-key \
209210
--kube-proxy-config ./kube-proxy.json \
211+
$(LTS) \
210212
--yes
211213
@$(MAKE) set-kubeconf
212214

@@ -217,14 +219,13 @@ cilium-podsubnet-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster with
217219
--kubernetes-version $(K8S_VER) \
218220
--node-count $(NODE_COUNT) \
219221
--node-vm-size $(VM_SIZE) \
220-
--k8s-support-plan AKSLongTermSupport \
221-
--tier premium \
222222
--network-plugin none \
223223
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
224224
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
225225
--no-ssh-key \
226226
--os-sku $(OS_SKU) \
227227
--kube-proxy-config ./kube-proxy.json \
228+
$(LTS) \
228229
--yes
229230
@$(MAKE) set-kubeconf
230231

@@ -235,13 +236,12 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster
235236
--kubernetes-version $(K8S_VER) \
236237
--node-count $(NODE_COUNT) \
237238
--node-vm-size $(VM_SIZE) \
238-
--k8s-support-plan AKSLongTermSupport \
239-
--tier premium \
240239
--network-plugin azure \
241240
--windows-admin-password $(WINDOWS_PASSWORD) \
242241
--windows-admin-username $(WINDOWS_USERNAME) \
243242
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
244243
--no-ssh-key \
244+
$(LTS) \
245245
--yes
246246

247247
$(AZCLI) aks nodepool add --resource-group $(GROUP) --cluster-name $(CLUSTER) \
@@ -261,13 +261,12 @@ linux-cniv1-up: rg-up overlay-net-up
261261
--kubernetes-version $(K8S_VER) \
262262
--node-count $(NODE_COUNT) \
263263
--node-vm-size $(VM_SIZE) \
264-
--k8s-support-plan AKSLongTermSupport \
265-
--tier premium \
266264
--max-pods 250 \
267265
--network-plugin azure \
268266
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
269267
--os-sku $(OS_SKU) \
270268
--no-ssh-key \
269+
$(LTS) \
271270
--yes
272271
@$(MAKE) set-kubeconf
273272

0 commit comments

Comments
 (0)