Skip to content

Commit 5c88849

Browse files
k-routhushubham-pathak-03rbtrjpayne3506Copilot
authored
[Service Tags] ci: Backport service/virtual tag updates to release/v1.5 (#3750)
* ci: [Service Tags] add public ips with service tags for LBs during cluster creation (#3277) * Create an outbound public ip for LB/Cilium cluster * create and attach public ip for cilium e2e cluster * Test cluster independent ip creation * Test outbound public ip creation * Test outbound public ip creation * Test outbound public ip creation with azcli creds * Test outbound public ip creation with azcli creds * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add lb ip creation alias call for clusters in makefile * Add managed identity to public ip/load balancer * Add managed identity to public ip/load balancer * Test wo managed identity * Test wo managed identity * Add Public ip to one cluster * Add public to all cluster creations * Add public ip * Fix spacing * Fix spacing * Add LB to win cni v1 cluster * Add LB to win cni v1 cluster * Add ip-tag variable to makefile * Add ip-tag variable to makefile * Add ip-tag variable to makefile * Add ip-tag variable to makefile * Add ip-tag variable to makefile * Add ip-tag variable to makefile * Add ip-tag variable to makefile * Add ip-tag variable to makefile * Add ip-tag variable to makefile * updated service tag to 'DelegatedNetworkControllerTest' * create public IP as target * add ipv6 public ips to dualstack * updated v6 ip * remove space * added public ip for nodesubnet-byocni-nokubeproxy-up resource * addressed comments on PR * parameterize ip v4 & v6 Co-authored-by: Evan Baker <[email protected]> Signed-off-by: Keerthana Routhu <[email protected]> * address comments * address PR comments * Update hack/aks/Makefile Co-authored-by: John Payne <[email protected]> Signed-off-by: Keerthana Routhu <[email protected]> * test * test * test --------- Signed-off-by: Keerthana Routhu <[email protected]> Co-authored-by: shubham-pathak-03 <[email protected]> Co-authored-by: Evan Baker <[email protected]> Co-authored-by: John Payne <[email protected]> * [Service Tags] ci: Update ACN to use Virtual Tags (#3745) update to virtual tag * formatting * formatting * Update hack/aks/Makefile Co-authored-by: Copilot <[email protected]> Signed-off-by: Keerthana Routhu <[email protected]> --------- Signed-off-by: Keerthana Routhu <[email protected]> Co-authored-by: shubham-pathak-03 <[email protected]> Co-authored-by: Evan Baker <[email protected]> Co-authored-by: John Payne <[email protected]> Co-authored-by: Copilot <[email protected]>
1 parent d29051d commit 5c88849

File tree

1 file changed

+76
-35
lines changed

1 file changed

+76
-35
lines changed

‎hack/aks/Makefile

Lines changed: 76 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@ AZIMG = mcr.microsoft.com/azure-cli
88
AZCLI ?= docker run --rm -v $(AZCFG):/root/.azure -v $(KUBECFG):/root/.kube -v $(SSH):/root/.ssh -v $(PWD):/root/tmpsrc $(AZIMG) az
99

1010
# overrideable defaults
11-
AUTOUPGRADE ?= patch
12-
K8S_VER ?= 1.29
13-
NODE_COUNT ?= 2
14-
NODE_COUNT_WIN ?= $(NODE_COUNT)
15-
NODEUPGRADE ?= NodeImage
16-
OS ?= linux # Used to signify if you want to bring up a windows nodePool on byocni clusters
17-
OS_SKU ?= Ubuntu
18-
OS_SKU_WIN ?= Windows2022
19-
REGION ?= westus2
20-
VM_SIZE ?= Standard_B2s
21-
VM_SIZE_WIN ?= Standard_B2s
22-
LTS ?= true
11+
AUTOUPGRADE ?= patch
12+
K8S_VER ?= 1.29
13+
NODE_COUNT ?= 2
14+
NODE_COUNT_WIN ?= $(NODE_COUNT)
15+
NODEUPGRADE ?= NodeImage
16+
OS ?= linux # Used to signify if you want to bring up a windows nodePool on byocni clusters
17+
OS_SKU ?= Ubuntu
18+
OS_SKU_WIN ?= Windows2022
19+
REGION ?= westus2
20+
VM_SIZE ?= Standard_B2s
21+
VM_SIZE_WIN ?= Standard_B2s
22+
LTS ?= true
23+
IP_TAG ?= FirstPartyUsage=/NonProd
24+
IP_PREFIX ?= serviceTaggedIp
25+
PUBLIC_IP_ID ?= /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses
26+
PUBLIC_IPv4 ?= $(PUBLIC_IP_ID)/$(IP_PREFIX)-$(CLUSTER)-v4
27+
PUBLIC_IPv6 ?= $(PUBLIC_IP_ID)/$(IP_PREFIX)-$(CLUSTER)-v6
28+
KUBE_PROXY_JSON_PATH ?= ./kube-proxy.json
2329

2430
# overrideable variables
2531
SUB ?= $(AZURE_SUBSCRIPTION)
@@ -50,6 +56,23 @@ azcfg: ## Set the $AZCLI to use aks-preview
5056
@$(AZCLI) extension add --name aks-preview --yes
5157
@$(AZCLI) extension update --name aks-preview
5258

59+
ip:
60+
$(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER)-$(IPVERSION) \
61+
--resource-group $(GROUP) \
62+
--allocation-method Static \
63+
--ip-tags $(IP_TAG) \
64+
--location $(REGION) \
65+
--sku Standard \
66+
--tier Regional \
67+
--version IP$(IPVERSION)
68+
69+
ipv4:
70+
@$(MAKE) ip IPVERSION=v4
71+
72+
ipv6:
73+
@$(MAKE) ip IPVERSION=v6
74+
75+
5376
set-kubeconf: ## Adds the kubeconf for $CLUSTER
5477
$(AZCLI) aks get-credentials -n $(CLUSTER) -g $(GROUP)
5578

@@ -75,6 +98,7 @@ vars: ## Show the input vars configured for the cluster commands
7598
@echo LTS=$(if $(LTS),$(LTS),empty)
7699

77100

101+
78102
##@ SWIFT Infra
79103

80104
rg-up: ## Create resource group
@@ -97,21 +121,20 @@ overlay-net-up: ## Create vnet, nodenet subnets
97121
$(AZCLI) network vnet create -g $(GROUP) -l $(REGION) --name $(VNET) --address-prefixes 10.0.0.0/8 -o none
98122
$(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name nodenet --address-prefix 10.10.0.0/16 -o none
99123

100-
101124
##@ AKS Clusters
102125

103126
byocni-up: swift-byocni-up ## Alias to swift-byocni-up
104127
cilium-up: swift-cilium-up ## Alias to swift-cilium-up
105128
up: swift-up ## Alias to swift-up
106129

107-
overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster
130+
overlay-byocni-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay BYO CNI cluster
108131
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
109132
--auto-upgrade-channel $(AUTOUPGRADE) \
110133
--node-os-upgrade-channel $(NODEUPGRADE) \
111134
--kubernetes-version $(K8S_VER) \
112135
--node-count $(NODE_COUNT) \
113136
--node-vm-size $(VM_SIZE) \
114-
--load-balancer-sku standard \
137+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
115138
--network-plugin none \
116139
--network-plugin-mode overlay \
117140
--pod-cidr 192.168.0.0/16 \
@@ -125,13 +148,14 @@ ifeq ($(OS),windows)
125148
endif
126149
@$(MAKE) set-kubeconf
127150

128-
overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy
151+
overlay-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy
129152
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
130153
--auto-upgrade-channel $(AUTOUPGRADE) \
131154
--node-os-upgrade-channel $(NODEUPGRADE) \
132155
--kubernetes-version $(K8S_VER) \
133156
--node-count $(NODE_COUNT) \
134157
--node-vm-size $(VM_SIZE) \
158+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
135159
--network-plugin none \
136160
--network-plugin-mode overlay \
137161
--pod-cidr 192.168.0.0/16 \
@@ -142,13 +166,14 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO
142166
--yes
143167
@$(MAKE) set-kubeconf
144168

145-
overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster
169+
overlay-cilium-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay Cilium cluster
146170
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
147171
--auto-upgrade-channel $(AUTOUPGRADE) \
148172
--node-os-upgrade-channel $(NODEUPGRADE) \
149173
--kubernetes-version $(K8S_VER) \
150174
--node-count $(NODE_COUNT) \
151175
--node-vm-size $(VM_SIZE) \
176+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
152177
--network-plugin azure \
153178
--network-dataplane cilium \
154179
--network-plugin-mode overlay \
@@ -159,13 +184,14 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster
159184
--yes
160185
@$(MAKE) set-kubeconf
161186

162-
overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
187+
overlay-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay AzCNI cluster
163188
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
164189
--auto-upgrade-channel $(AUTOUPGRADE) \
165190
--node-os-upgrade-channel $(NODEUPGRADE) \
166191
--kubernetes-version $(K8S_VER) \
167192
--node-count $(NODE_COUNT) \
168193
--node-vm-size $(VM_SIZE) \
194+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
169195
--network-plugin azure \
170196
--network-plugin-mode overlay \
171197
--pod-cidr 192.168.0.0/16 \
@@ -175,14 +201,14 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
175201
--yes
176202
@$(MAKE) set-kubeconf
177203

178-
swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster
204+
swift-byocni-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI cluster
179205
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
180206
--auto-upgrade-channel $(AUTOUPGRADE) \
181207
--node-os-upgrade-channel $(NODEUPGRADE) \
182208
--kubernetes-version $(K8S_VER) \
183209
--node-count $(NODE_COUNT) \
184210
--node-vm-size $(VM_SIZE) \
185-
--load-balancer-sku standard \
211+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
186212
--network-plugin none \
187213
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
188214
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
@@ -195,13 +221,14 @@ ifeq ($(OS),windows)
195221
endif
196222
@$(MAKE) set-kubeconf
197223

198-
swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy
224+
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
199225
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
200226
--auto-upgrade-channel $(AUTOUPGRADE) \
201227
--node-os-upgrade-channel $(NODEUPGRADE) \
202228
--kubernetes-version $(K8S_VER) \
203229
--node-count $(NODE_COUNT) \
204230
--node-vm-size $(VM_SIZE) \
231+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
205232
--network-plugin none \
206233
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
207234
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
@@ -212,13 +239,14 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus
212239
--yes
213240
@$(MAKE) set-kubeconf
214241

215-
swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster
242+
swift-cilium-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT Cilium cluster
216243
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
217244
--auto-upgrade-channel $(AUTOUPGRADE) \
218245
--node-os-upgrade-channel $(NODEUPGRADE) \
219246
--kubernetes-version $(K8S_VER) \
220247
--node-count $(NODE_COUNT) \
221248
--node-vm-size $(VM_SIZE) \
249+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
222250
--network-plugin azure \
223251
--network-dataplane cilium \
224252
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
@@ -229,13 +257,14 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster
229257
--yes
230258
@$(MAKE) set-kubeconf
231259

232-
swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
260+
swift-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI cluster
233261
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
234262
--auto-upgrade-channel $(AUTOUPGRADE) \
235263
--node-os-upgrade-channel $(NODEUPGRADE) \
236264
--kubernetes-version $(K8S_VER) \
237265
--node-count $(NODE_COUNT) \
238266
--node-vm-size $(VM_SIZE) \
267+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
239268
--network-plugin azure \
240269
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
241270
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
@@ -244,39 +273,42 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
244273
--yes
245274
@$(MAKE) set-kubeconf
246275

247-
swiftv2-multitenancy-cluster-up: rg-up
276+
swiftv2-multitenancy-cluster-up: rg-up ipv4
248277
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
249278
--network-plugin azure \
250279
--network-plugin-mode overlay \
251280
--kubernetes-version 1.28 \
252281
--nodepool-name "mtapool" \
253282
--node-vm-size $(VM_SIZE) \
254283
--node-count 2 \
284+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
255285
--nodepool-tags fastpathenabled=true \
256286
--no-ssh-key \
257287
$(LTS) \
258288
--yes
259289
@$(MAKE) set-kubeconf
260290

261-
swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
291+
swiftv2-dummy-cluster-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI cluster
262292
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
263293
--network-plugin azure \
264294
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
265295
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
296+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
266297
--no-ssh-key \
267298
--yes
268299
@$(MAKE) set-kubeconf
269300

270301
# The below Vnet Scale clusters are currently only in private preview and available with Kubernetes 1.28
271302
# These AKS clusters can only be created in a limited subscription listed here:
272303
# 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
273-
vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster
304+
vnetscale-swift-byocni-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster
274305
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
275306
--auto-upgrade-channel $(AUTOUPGRADE) \
276307
--node-os-upgrade-channel $(NODEUPGRADE) \
277308
--kubernetes-version $(K8S_VER) \
278309
--node-count $(NODE_COUNT) \
279310
--node-vm-size $(VM_SIZE) \
311+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
280312
--network-plugin none \
281313
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
282314
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
@@ -286,13 +318,14 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale
286318
--yes
287319
@$(MAKE) set-kubeconf
288320

289-
vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy
321+
vnetscale-swift-byocni-nokubeproxy-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy
290322
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
291323
--auto-upgrade-channel $(AUTOUPGRADE) \
292324
--node-os-upgrade-channel $(NODEUPGRADE) \
293325
--kubernetes-version $(K8S_VER) \
294326
--node-count $(NODE_COUNT) \
295327
--node-vm-size $(VM_SIZE) \
328+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
296329
--network-plugin none \
297330
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
298331
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
@@ -303,13 +336,14 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up
303336
--yes
304337
@$(MAKE) set-kubeconf
305338

306-
vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster
339+
vnetscale-swift-cilium-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster
307340
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
308341
--auto-upgrade-channel $(AUTOUPGRADE) \
309342
--node-os-upgrade-channel $(NODEUPGRADE) \
310343
--kubernetes-version $(K8S_VER) \
311344
--node-count $(NODE_COUNT) \
312345
--node-vm-size $(VM_SIZE) \
346+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
313347
--network-plugin azure \
314348
--network-dataplane cilium \
315349
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
@@ -320,27 +354,29 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale
320354
--yes
321355
@$(MAKE) set-kubeconf
322356

323-
vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster
357+
vnetscale-swift-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster
324358
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
325359
--auto-upgrade-channel $(AUTOUPGRADE) \
326360
--node-os-upgrade-channel $(NODEUPGRADE) \
327361
--kubernetes-version $(K8S_VER) \
328362
--node-count $(NODE_COUNT) \
329363
--node-vm-size $(VM_SIZE) \
364+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
330365
--network-plugin azure \
331366
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
332367
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
333368
--no-ssh-key \
334369
--yes
335370
@$(MAKE) set-kubeconf
336371

337-
windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster
372+
windows-cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a Windows CNIv1 cluster
338373
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
339374
--auto-upgrade-channel $(AUTOUPGRADE) \
340375
--node-os-upgrade-channel $(NODEUPGRADE) \
341376
--kubernetes-version $(K8S_VER) \
342377
--node-count $(NODE_COUNT) \
343378
--node-vm-size $(VM_SIZE) \
379+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
344380
--network-plugin azure \
345381
--windows-admin-password $(WINDOWS_PASSWORD) \
346382
--windows-admin-username $(WINDOWS_USERNAME) \
@@ -351,13 +387,14 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster
351387
@$(MAKE) windows-nodepool-up
352388
@$(MAKE) set-kubeconf
353389

354-
linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster
390+
linux-cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a Linux CNIv1 cluster
355391
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
356392
--auto-upgrade-channel $(AUTOUPGRADE) \
357393
--node-os-upgrade-channel $(NODEUPGRADE) \
358394
--kubernetes-version $(K8S_VER) \
359395
--node-count $(NODE_COUNT) \
360396
--node-vm-size $(VM_SIZE) \
397+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
361398
--max-pods 250 \
362399
--network-plugin azure \
363400
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
@@ -367,13 +404,14 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster
367404
--yes
368405
@$(MAKE) set-kubeconf
369406

370-
dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only
407+
dualstack-overlay-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only
371408
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
372409
--auto-upgrade-channel $(AUTOUPGRADE) \
373410
--node-os-upgrade-channel $(NODEUPGRADE) \
374411
--kubernetes-version $(K8S_VER) \
375412
--node-count $(NODE_COUNT) \
376413
--node-vm-size $(VM_SIZE) \
414+
--load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \
377415
--network-plugin azure \
378416
--network-plugin-mode overlay \
379417
--subscription $(SUB) \
@@ -384,13 +422,14 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu
384422
--yes
385423
@$(MAKE) set-kubeconf
386424

387-
dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster
425+
dualstack-overlay-byocni-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster
388426
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
389427
--auto-upgrade-channel $(AUTOUPGRADE) \
390428
--node-os-upgrade-channel $(NODEUPGRADE) \
391429
--kubernetes-version $(K8S_VER) \
392430
--node-count $(NODE_COUNT) \
393431
--node-vm-size $(VM_SIZE) \
432+
--load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \
394433
--network-plugin none \
395434
--network-plugin-mode overlay \
396435
--subscription $(SUB) \
@@ -401,13 +440,14 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over
401440
--yes
402441
@$(MAKE) set-kubeconf
403442

404-
cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only
443+
cilium-dualstack-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only
405444
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
406445
--auto-upgrade-channel $(AUTOUPGRADE) \
407446
--node-os-upgrade-channel $(NODEUPGRADE) \
408447
--kubernetes-version $(K8S_VER) \
409448
--node-count $(NODE_COUNT) \
410449
--node-vm-size $(VM_SIZE) \
450+
--load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \
411451
--network-plugin azure \
412452
--network-plugin-mode overlay \
413453
--network-dataplane cilium \
@@ -419,13 +459,14 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla
419459
--yes
420460
@$(MAKE) set-kubeconf
421461

422-
dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack overlay BYOCNI cluster with Linux node only and no kube-proxy
462+
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
423463
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
424464
--auto-upgrade-channel $(AUTOUPGRADE) \
425465
--node-os-upgrade-channel $(NODEUPGRADE) \
426466
--kubernetes-version $(K8S_VER) \
427467
--node-count $(NODE_COUNT) \
428468
--node-vm-size $(VM_SIZE) \
469+
--load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \
429470
--network-plugin none \
430471
--network-plugin-mode overlay \
431472
--subscription $(SUB) \

0 commit comments

Comments
 (0)