Skip to content

Commit e503224

Browse files
authored
ci: add vnet scale cilium pipeline stage (#3457)
add vnet scale cilium stage
1 parent e32e2b8 commit e503224

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

Diff for: .pipelines/pipeline.yaml

+19-1
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,26 @@ stages:
227227
- template: singletenancy/cilium/cilium-e2e-job-template.yaml
228228
parameters:
229229
name: "cilium_e2e"
230-
displayName: Cilium
230+
displayName: Cilium Podsubnet
231231
clusterType: swift-byocni-nokubeproxy-up
232232
clusterName: "ciliume2e"
233233
vmSize: Standard_B2ms
234234
k8sVersion: ""
235235
dependsOn: "containerize"
236236

237+
# Cilium Podsubnet Vnet Scale E2E tests
238+
- template: singletenancy/cilium/cilium-e2e-job-template.yaml
239+
parameters:
240+
name: "cilium_vnetscale_e2e"
241+
displayName: Cilium Podsubnet Vnet Scale Ubuntu
242+
os: linux
243+
clusterType: vnetscale-swift-byocni-nokubeproxy-up
244+
clusterName: "ciliumvscalee2e"
245+
vmSize: Standard_B2ms
246+
k8sVersion: ""
247+
dependsOn: "containerize"
248+
249+
237250
# Cilium Nodesubnet E2E tests
238251
- template: singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml
239252
parameters:
@@ -400,6 +413,7 @@ stages:
400413
- azure_overlay_stateless_e2e
401414
- aks_swift_e2e
402415
- cilium_e2e
416+
- cilium_vnetscale_e2e
403417
- cilium_nodesubnet_e2e
404418
- cilium_overlay_e2e
405419
- cilium_h_overlay_e2e
@@ -422,6 +436,10 @@ stages:
422436
name: cilium_e2e
423437
clusterName: "ciliume2e"
424438
region: $(REGION_AKS_CLUSTER_TEST)
439+
cilium_vnetscale_e2e:
440+
name: cilium_vnetscale_e2e
441+
clusterName: "ciliumvscalee2e"
442+
region: $(REGION_AKS_CLUSTER_TEST)
425443
cilium_nodesubnet_e2e:
426444
name: cilium_nodesubnet_e2e
427445
clusterName: "cilndsubnete2e"

Diff for: hack/aks/Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
181181
--yes
182182
@$(MAKE) set-kubeconf
183183

184-
swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster
184+
swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT (Podsubnet) BYO CNI cluster
185185
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
186186
--auto-upgrade-channel $(AUTOUPGRADE) \
187187
--node-os-upgrade-channel $(NODEUPGRADE) \
@@ -200,7 +200,7 @@ ifeq ($(OS),windows)
200200
endif
201201
@$(MAKE) set-kubeconf
202202

203-
swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy
203+
swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT (Podsubnet) BYO CNI cluster without kube-proxy
204204
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
205205
--auto-upgrade-channel $(AUTOUPGRADE) \
206206
--node-os-upgrade-channel $(NODEUPGRADE) \
@@ -283,10 +283,11 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale
283283
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
284284
--no-ssh-key \
285285
--os-sku $(OS_SKU) \
286+
--pod-ip-allocation-mode StaticBlock \
286287
--yes
287288
@$(MAKE) set-kubeconf
288289

289-
vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy
290+
vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT (Podsubnet) BYO CNI cluster without kube-proxy
290291
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
291292
--auto-upgrade-channel $(AUTOUPGRADE) \
292293
--node-os-upgrade-channel $(NODEUPGRADE) \
@@ -299,6 +300,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up
299300
--no-ssh-key \
300301
--os-sku $(OS_SKU) \
301302
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
303+
--pod-ip-allocation-mode StaticBlock \
302304
--yes
303305
@$(MAKE) set-kubeconf
304306

@@ -315,6 +317,7 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale
315317
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
316318
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
317319
--no-ssh-key \
320+
--pod-ip-allocation-mode StaticBlock \
318321
--yes
319322
@$(MAKE) set-kubeconf
320323

@@ -329,6 +332,7 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT
329332
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
330333
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
331334
--no-ssh-key \
335+
--pod-ip-allocation-mode StaticBlock \
332336
--yes
333337
@$(MAKE) set-kubeconf
334338

0 commit comments

Comments
 (0)