Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: add vnet scale cilium pipeline stage #3457

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

ci: add vnet scale cilium pipeline stage #3457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion .pipelines/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,26 @@ stages:
- template: singletenancy/cilium/cilium-e2e-job-template.yaml
parameters:
name: "cilium_e2e"
displayName: Cilium
displayName: Cilium Podsubnet
clusterType: swift-byocni-nokubeproxy-up
clusterName: "ciliume2e"
vmSize: Standard_B2ms
k8sVersion: ""
dependsOn: "containerize"

# Cilium Podsubnet Vnet Scale E2E tests
- template: singletenancy/cilium/cilium-e2e-job-template.yaml
parameters:
name: "cilium_vnetscale_e2e"
displayName: Cilium Podsubnet Vnet Scale Ubuntu
os: linux
clusterType: vnetscale-swift-byocni-nokubeproxy-up
clusterName: "ciliumvscalee2e"
vmSize: Standard_B2ms
k8sVersion: ""
dependsOn: "containerize"


# Cilium Nodesubnet E2E tests
- template: singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml
parameters:
Expand Down Expand Up @@ -400,6 +413,7 @@ stages:
- azure_overlay_stateless_e2e
- aks_swift_e2e
- cilium_e2e
- cilium_vnetscale_e2e
- cilium_nodesubnet_e2e
- cilium_overlay_e2e
- cilium_h_overlay_e2e
Expand All @@ -422,6 +436,10 @@ stages:
name: cilium_e2e
clusterName: "ciliume2e"
region: $(REGION_AKS_CLUSTER_TEST)
cilium_vnetscale_e2e:
name: cilium_vnetscale_e2e
clusterName: "ciliumvscalee2e"
region: $(REGION_AKS_CLUSTER_TEST)
cilium_nodesubnet_e2e:
name: cilium_nodesubnet_e2e
clusterName: "cilndsubnete2e"
Expand Down
10 changes: 7 additions & 3 deletions hack/aks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
--yes
@$(MAKE) set-kubeconf

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

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

vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy
vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT (Podsubnet) BYO CNI cluster without kube-proxy
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--auto-upgrade-channel $(AUTOUPGRADE) \
--node-os-upgrade-channel $(NODEUPGRADE) \
Expand All @@ -307,6 +308,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up
--no-ssh-key \
--os-sku $(OS_SKU) \
--kube-proxy-config $(KUBE_PROXY_JSON_PATH) \
--pod-ip-allocation-mode StaticBlock \
--yes
@$(MAKE) set-kubeconf

Expand All @@ -324,6 +326,7 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
--no-ssh-key \
--pod-ip-allocation-mode StaticBlock \
--yes
@$(MAKE) set-kubeconf

Expand All @@ -339,6 +342,7 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
--no-ssh-key \
--pod-ip-allocation-mode StaticBlock \
--yes
@$(MAKE) set-kubeconf

Expand Down
Loading