Skip to content

ci: use team build pool #2055

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

Closed
wants to merge 18 commits into from
Closed

ci: use team build pool #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5b84ea6
use team pool
matmerr Jul 12, 2023
1224f6c
Merge branch 'master' into cniloadtest
matmerr Jul 12, 2023
273208a
standard lb
matmerr Jul 13, 2023
558c2e0
change sku
matmerr Jul 13, 2023
f7017d9
use slash 8
matmerr Jul 13, 2023
6bfd466
Merge branch 'master' into cniloadtest
matmerr Jul 14, 2023
c3f6350
Merge branch 'master' into cniloadtest
matmerr Jul 14, 2023
b5a685e
Merge branch 'cniloadtest' of github.com:matmerr/azure-container-netw…
matmerr Jul 14, 2023
6dd6d33
use different service cidr
matmerr Jul 14, 2023
f859f6f
service cidr
matmerr Jul 17, 2023
9561c4b
Merge branch 'master' into cniloadtest
matmerr Jul 25, 2023
f6b3a08
Merge branch 'master' into cniloadtest
matmerr Aug 16, 2023
d895c08
service cidr
matmerr Aug 16, 2023
f12dd36
standard lb for other nodepools
matmerr Aug 16, 2023
6cf43b1
region override
matmerr Aug 22, 2023
2d19b2c
region
matmerr Aug 22, 2023
67a1504
Merge branch 'master' into cniloadtest
matmerr Sep 7, 2023
055f4b5
Merge branch 'cniloadtest' of github.com:matmerr/azure-container-netw…
matmerr Sep 7, 2023
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
17 changes: 16 additions & 1 deletion .pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ parameters:
vmSize: "Standard_DS4_v2"

stages:

- stage: createAKScluster
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
dependsOn: ${{ parameters.dependsOn }}
displayName: "AKS Cluster with Cilium"
jobs:
Expand All @@ -23,6 +24,8 @@ stages:
nodeCount: ${{ parameters.nodeCount }}
vmSize: ${{ parameters.vmSize }}
- stage: install_cilium
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
dependsOn: createAKScluster
displayName: "Install Cilium on AKS Overlay"
jobs:
Expand Down Expand Up @@ -65,6 +68,8 @@ stages:
cd ../../../..
kubectl get po -owide -A
- stage: pod_deployment
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
dependsOn: install_cilium
displayName: "Pod Deployment"
jobs:
Expand All @@ -80,6 +85,8 @@ stages:
iterations: ${CILIUM_ITERATIONS}
nodeCount: ${{ parameters.nodeCount }}
- stage: validate_state
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
dependsOn: pod_deployment
displayName: "Validate State"
jobs:
Expand All @@ -91,6 +98,8 @@ stages:
parameters:
clusterName: ${{ parameters.clusterName }}
- stage: restart_nodes
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
dependsOn: validate_state
displayName: "Restart Node"
jobs:
Expand All @@ -104,6 +113,8 @@ stages:
nodeCount: ${{ parameters.nodeCount }}
scaleup: ${CILIUM_SCALEUP}
- stage: validate_restart_state
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
dependsOn: restart_nodes
displayName: "Validate Restart State"
jobs:
Expand All @@ -116,6 +127,8 @@ stages:
clusterName: ${{ parameters.clusterName }}
restartCase: "true"
- stage: connectivity_tests
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
dependsOn: validate_restart_state
displayName: "Connectivity Tests"
jobs:
Expand Down Expand Up @@ -151,6 +164,8 @@ stages:
name: "CiliumConnectivityTests"
displayName: "Run Cilium Connectivity Tests"
- stage: delete
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
displayName: "Delete Resources"
dependsOn:
- connectivity_tests
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/cni/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ trigger: none

stages:
- stage: setup
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
displayName: Setup
jobs:
- job: env
displayName: Setup
pool:
name: "$(BUILD_POOL_NAME_DEFAULT)"
steps:
- script: |
echo "Setting up environment"
Expand Down
57 changes: 33 additions & 24 deletions hack/aks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ AZCLI ?= docker run --rm -v $(AZCFG):/root/.azure -v $(KUBECFG):/root/.kube -v
REGION ?= westus2
OS_SKU ?= Ubuntu
WINDOWS_OS_SKU ?= Windows2022
VM_SIZE ?= Standard_B2s
VM_SIZE = Standard_DS4_v3
NODE_COUNT ?= 2
K8S_VER ?= 1.25 # Used only for ubuntu 18 as K8S 1.24.9, as K8S > 1.25 have Ubuntu 22
WINDOWS_VM_SKU ?= Standard_B2s
K8S_VER ?= 1.26 # Used only for ubuntu 18 as K8S 1.24.9, as K8S > 1.25 have Ubuntu 22
WINDOWS_VM_SKU = Standard_DS4_v3

# overrideable variables
SUB ?= $(AZURE_SUBSCRIPTION)
Expand Down Expand Up @@ -71,13 +71,13 @@ rg-down: ## Delete resource group
$(AZCLI) group delete -g $(GROUP) --yes

swift-net-up: ## Create vnet, nodenet and podnet subnets
$(AZCLI) network vnet create -g $(GROUP) -l $(REGION) --name $(VNET) --address-prefixes 10.0.0.0/8 -o none
$(AZCLI) network vnet create -g $(GROUP) -l $(REGION) --name $(VNET) --address-prefixes 192.168.0.0/16 -o none
$(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name nodenet --address-prefixes 10.240.0.0/16 -o none
$(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name podnet --address-prefixes 10.241.0.0/16 -o none

overlay-net-up: ## Create vnet, nodenet subnets
$(AZCLI) network vnet create -g $(GROUP) -l $(REGION) --name $(VNET) --address-prefixes 10.0.0.0/8 -o none
$(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name nodenet --address-prefix 10.10.0.0/16 -o none
$(AZCLI) network vnet create -g $(GROUP) -l $(REGION) --name $(VNET) --address-prefixes 10.0.0.0/9 -o none
$(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name nodenet --address-prefix 10.0.0.0/12 -o none


##@ AKS Clusters
Expand All @@ -90,10 +90,12 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--load-balancer-sku standard \
--network-plugin none \
--network-plugin-mode overlay \
--pod-cidr 192.168.0.0/16 \
Copy link
Collaborator

@thatmattlong thatmattlong Jul 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a bunch of the overlay and cilium tests implicitly depend on this value being 192.168.0.0/16, why do we need to change it?

Copy link
Member Author

@matmerr matmerr Jul 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

emphasis on the do-not-merge tag, I'm using this target for a convenient one-click byocni cilium overlay cluster for manual testing

I believe I can still use refs/pull/2055/merge as a target if pr is converted to draft

--pod-cidr 10.128.0.0/9 \
--dns-service-ip 192.168.0.10 \
--service-cidr 192.168.0.0/16 \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--no-ssh-key \
--yes
Expand All @@ -103,11 +105,12 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin azure \
--network-dataplane cilium \
--load-balancer-sku standard \
--network-plugin none \
--network-plugin-mode overlay \
--pod-cidr 192.168.0.0/16 \
--pod-cidr 10.128.0.0/9 \
--dns-service-ip 192.168.0.10 \
--service-cidr 192.168.0.0/16 \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--no-ssh-key \
--yes
Expand All @@ -117,10 +120,12 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--load-balancer-sku standard \
--network-plugin azure \
--network-plugin-mode overlay \
--pod-cidr 192.168.0.0/16 \
--pod-cidr 10.128.0.0/9 \
--dns-service-ip 192.168.0.10 \
--service-cidr 192.168.0.0/16 \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--no-ssh-key \
--yes
Expand All @@ -130,8 +135,12 @@ swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin none \
--load-balancer-sku standard \
--network-plugin azure \
--network-plugin-mode overlay \
--pod-cidr 10.128.0.0/9 \
--dns-service-ip 192.168.0.10 \
--service-cidr 192.168.0.0/16 \
--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 \
Expand All @@ -144,10 +153,8 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--network-plugin azure \
--network-dataplane cilium \
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
--load-balancer-sku standard \
--network-plugin none \
--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 \
Expand All @@ -158,7 +165,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--load-balancer-sku standard \
--network-plugin azure \
--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 \
Expand All @@ -170,10 +177,12 @@ cilium-overlay-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--load-balancer-sku standard \
--network-plugin none \
--network-plugin-mode overlay \
--pod-cidr 192.168.0.0/16 \
--pod-cidr 10.128.0.0/9 \
--dns-service-ip 192.168.0.10 \
--service-cidr 192.168.0.0/16 \
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--no-ssh-key \
--kube-proxy-config ./kube-proxy.json \
Expand All @@ -184,7 +193,7 @@ cilium-podsubnet-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster with
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
--node-count $(NODE_COUNT) \
--node-vm-size $(VM_SIZE) \
--load-balancer-sku basic \
--load-balancer-sku standard \
--network-plugin none \
--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 \
Expand Down