Skip to content

Commit 9c6e639

Browse files
jpayne3506jpayne3506
committed
ci: move az aks create into common field
1 parent cd3c6ac commit 9c6e639

File tree

1 file changed

+20
-39
lines changed

1 file changed

+20
-39
lines changed

‎hack/aks/Makefile‎

Lines changed: 20 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ else
4343
endif
4444

4545
# Common az aks create fields
46-
COMMON_AKS_FIELDS = \
46+
COMMON_AKS_FIELDS = $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
4747
--auto-upgrade-channel $(AUTOUPGRADE) \
4848
--node-os-upgrade-channel $(NODEUPGRADE) \
4949
--kubernetes-version $(K8S_VER) \
@@ -143,8 +143,7 @@ up: swift-up ## Alias to swift-up
143143

144144

145145
nodesubnet-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an NodeSubnet BYO CNI cluster without kube-proxy
146-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
147-
$(COMMON_AKS_FIELDS) \
146+
$(COMMON_AKS_FIELDS) \
148147
--max-pods 250 \
149148
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
150149
--network-plugin none \
@@ -154,8 +153,7 @@ nodesubnet-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Node
154153
@$(MAKE) set-kubeconf
155154

156155
overlay-byocni-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay BYO CNI cluster
157-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
158-
$(COMMON_AKS_FIELDS) \
156+
$(COMMON_AKS_FIELDS) \
159157
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
160158
--network-plugin none \
161159
--network-plugin-mode overlay \
@@ -168,8 +166,7 @@ ifeq ($(OS),windows)
168166
endif
169167

170168
overlay-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy
171-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
172-
$(COMMON_AKS_FIELDS) \
169+
$(COMMON_AKS_FIELDS) \
173170
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
174171
--network-plugin none \
175172
--network-plugin-mode overlay \
@@ -180,8 +177,7 @@ overlay-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay
180177
@$(MAKE) set-kubeconf
181178

182179
overlay-cilium-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay Cilium cluster
183-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
184-
$(COMMON_AKS_FIELDS) \
180+
$(COMMON_AKS_FIELDS) \
185181
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
186182
--network-plugin azure \
187183
--network-dataplane cilium \
@@ -192,8 +188,7 @@ overlay-cilium-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay Cilium clus
192188
@$(MAKE) set-kubeconf
193189

194190
overlay-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay AzCNI cluster
195-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
196-
$(COMMON_AKS_FIELDS) \
191+
$(COMMON_AKS_FIELDS) \
197192
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
198193
--network-plugin azure \
199194
--network-plugin-mode overlay \
@@ -206,8 +201,7 @@ ifeq ($(OS),windows)
206201
endif
207202

208203
swift-byocni-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI cluster
209-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
210-
$(COMMON_AKS_FIELDS) \
204+
$(COMMON_AKS_FIELDS) \
211205
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
212206
--network-plugin none \
213207
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
@@ -219,8 +213,7 @@ endif
219213
@$(MAKE) set-kubeconf
220214

221215
swift-byocni-nokubeproxy-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip
222-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
223-
$(COMMON_AKS_FIELDS) \
216+
$(COMMON_AKS_FIELDS) \
224217
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
225218
--network-plugin none \
226219
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
@@ -230,8 +223,7 @@ swift-byocni-nokubeproxy-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI
230223
@$(MAKE) set-kubeconf
231224

232225
swift-cilium-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT Cilium cluster
233-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
234-
$(COMMON_AKS_FIELDS) \
226+
$(COMMON_AKS_FIELDS) \
235227
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
236228
--network-plugin azure \
237229
--network-dataplane cilium \
@@ -242,8 +234,7 @@ swift-cilium-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT Cilium cluster
242234
@$(MAKE) set-kubeconf
243235

244236
swift-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI cluster
245-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
246-
$(COMMON_AKS_FIELDS) \
237+
$(COMMON_AKS_FIELDS) \
247238
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
248239
--network-plugin azure \
249240
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
@@ -277,8 +268,7 @@ swiftv2-dummy-cluster-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI clus
277268
# These AKS clusters can only be created in a limited subscription listed here:
278269
# https://dev.azure.com/msazure/CloudNativeCompute/_git/aks-rp?path=/resourceprovider/server/microsoft.com/containerservice/flags/network_flags.go&version=GBmaster&line=134&lineEnd=135&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents
279270
vnetscale-swift-byocni-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster
280-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
281-
$(COMMON_AKS_FIELDS) \
271+
$(COMMON_AKS_FIELDS) \
282272
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
283273
--network-plugin none \
284274
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
@@ -288,8 +278,7 @@ vnetscale-swift-byocni-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet
288278
@$(MAKE) set-kubeconf
289279

290280
vnetscale-swift-byocni-nokubeproxy-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy
291-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
292-
$(COMMON_AKS_FIELDS) \
281+
$(COMMON_AKS_FIELDS) \
293282
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
294283
--network-plugin none \
295284
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
@@ -300,8 +289,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up ipv4 vnetscale-swift-net-up ## Brin
300289
@$(MAKE) set-kubeconf
301290

302291
vnetscale-swift-cilium-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster
303-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
304-
$(COMMON_AKS_FIELDS) \
292+
$(COMMON_AKS_FIELDS) \
305293
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
306294
--network-plugin azure \
307295
--network-dataplane cilium \
@@ -313,8 +301,7 @@ vnetscale-swift-cilium-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet
313301
@$(MAKE) set-kubeconf
314302

315303
vnetscale-swift-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster
316-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
317-
$(COMMON_AKS_FIELDS) \
304+
$(COMMON_AKS_FIELDS) \
318305
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
319306
--network-plugin azure \
320307
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
@@ -324,8 +311,7 @@ vnetscale-swift-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale S
324311
@$(MAKE) set-kubeconf
325312

326313
nodesubnet-cilium-up: rg-up ipv4 overlay-net-up ## Bring up a Nodesubnet Cilium cluster
327-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
328-
$(COMMON_AKS_FIELDS) \
314+
$(COMMON_AKS_FIELDS) \
329315
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
330316
--network-plugin azure \
331317
--network-dataplane cilium \
@@ -334,8 +320,7 @@ nodesubnet-cilium-up: rg-up ipv4 overlay-net-up ## Bring up a Nodesubnet Cilium
334320
@$(MAKE) set-kubeconf
335321

336322
cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a CNIv1 cluster
337-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
338-
$(COMMON_AKS_FIELDS) \
323+
$(COMMON_AKS_FIELDS) \
339324
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
340325
--max-pods 250 \
341326
--network-plugin azure \
@@ -347,8 +332,7 @@ ifeq ($(OS),windows)
347332
endif
348333

349334
dualstack-overlay-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only
350-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
351-
$(COMMON_AKS_FIELDS) \
335+
$(COMMON_AKS_FIELDS) \
352336
--load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \
353337
--network-plugin azure \
354338
--network-plugin-mode overlay \
@@ -359,8 +343,7 @@ dualstack-overlay-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack O
359343
@$(MAKE) set-kubeconf
360344

361345
dualstack-overlay-byocni-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster
362-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
363-
$(COMMON_AKS_FIELDS) \
346+
$(COMMON_AKS_FIELDS) \
364347
--load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \
365348
--network-plugin none \
366349
--network-plugin-mode overlay \
@@ -374,8 +357,7 @@ ifeq ($(OS),windows)
374357
endif
375358

376359
cilium-dualstack-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only
377-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
378-
$(COMMON_AKS_FIELDS) \
360+
$(COMMON_AKS_FIELDS) \
379361
--load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \
380362
--network-plugin azure \
381363
--network-plugin-mode overlay \
@@ -387,8 +369,7 @@ cilium-dualstack-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a Cilium Dualst
387369
@$(MAKE) set-kubeconf
388370

389371
dualstack-byocni-nokubeproxy-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a Dualstack overlay BYOCNI cluster with Linux node only and no kube-proxy
390-
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
391-
$(COMMON_AKS_FIELDS) \
372+
$(COMMON_AKS_FIELDS) \
392373
--load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \
393374
--network-plugin none \
394375
--network-plugin-mode overlay \

0 commit comments

Comments
 (0)