Skip to content

Commit 696cab4

Browse files
authored
fix: add vnetscale staticblock changes to aks makefile for e2e
Signed-off-by: Evan Baker <[email protected]>
1 parent 190269a commit 696cab4

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

hack/aks/Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,6 @@ swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
274274
--yes
275275
@$(MAKE) set-kubeconf
276276

277-
# The below Vnet Scale clusters are currently only in private preview and available with Kubernetes 1.28
278-
# These AKS clusters can only be created in a limited subscription listed here:
279-
# 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
280277
vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster
281278
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
282279
--auto-upgrade-channel $(AUTOUPGRADE) \
@@ -288,6 +285,8 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale
288285
--network-plugin none \
289286
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
290287
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
288+
--pod-ip-allocation-mode StaticBlock \
289+
--max-pods 63 \
291290
--no-ssh-key \
292291
--os-sku $(OS_SKU) \
293292
--yes
@@ -304,9 +303,11 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up
304303
--network-plugin none \
305304
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
306305
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
306+
--pod-ip-allocation-mode StaticBlock \
307+
--max-pods 63 \
307308
--no-ssh-key \
308309
--os-sku $(OS_SKU) \
309-
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
310+
--kube-proxy-config ./kube-proxy.json \
310311
--yes
311312
@$(MAKE) set-kubeconf
312313

@@ -323,6 +324,8 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale
323324
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
324325
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
325326
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
327+
--pod-ip-allocation-mode StaticBlock \
328+
--max-pods 63 \
326329
--no-ssh-key \
327330
--yes
328331
@$(MAKE) set-kubeconf
@@ -338,6 +341,8 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT
338341
--network-plugin azure \
339342
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
340343
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
344+
--pod-ip-allocation-mode StaticBlock \
345+
--max-pods 63 \
341346
--no-ssh-key \
342347
--yes
343348
@$(MAKE) set-kubeconf

0 commit comments

Comments
 (0)