Skip to content

Commit 4d90d23

Browse files
camrynlcamrynl
authored
ci: cilium dualstack for load test pipeline (#2603)
* adding cilium dualstack to load test pipeline * updating cni default
1 parent a4f3a40 commit 4d90d23

File tree

7 files changed

+45
-10
lines changed

7 files changed

+45
-10
lines changed

‎.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ parameters:
99
arch: ""
1010
osSKU: Ubuntu
1111
hubbleEnabled: false
12+
dualstackVersion: ""
13+
cni: "cilium"
1214

1315
# Condition confirms that:
1416
# Previous job has reported Succeeded. Previous job is currently setup which controls variable assignment and we are dependent on its success.
@@ -70,11 +72,23 @@ stages:
7072
kubectl cluster-info
7173
kubectl get po -owide -A
7274
75+
if [ ! -z ${{ parameters.dualstackVersion }} ]; then
76+
echo "Use dualstack version of Cilium"
77+
export CILIUM_VERSION_TAG=${{ parameters.dualstackVersion }}
78+
fi
79+
7380
echo "install Cilium ${CILIUM_VERSION_TAG}"
7481
export DIR=${CILIUM_VERSION_TAG%.*}
7582
echo "installing files from ${DIR}"
83+
7684
echo "deploy Cilium ConfigMap"
77-
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
85+
if [ ! -z ${{ parameters.dualstackVersion }} ]; then
86+
echo "Use dualstack configmap for Cilium"
87+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-dualstack.yaml
88+
else
89+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
90+
fi
91+
7892
# Passes Cilium image to daemonset and deployment
7993
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
8094
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
@@ -113,8 +127,8 @@ stages:
113127
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
114128
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
115129
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
116-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
117-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
130+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
131+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
118132
kubectl get po -owide -A
119133
120134
echo "Deploy Azure-CNS"
@@ -137,6 +151,7 @@ stages:
137151
- template: ../load-test-templates/validate-state-template.yaml
138152
parameters:
139153
clusterName: ${{ parameters.clusterName }}-$(commitID)
154+
cni: ${{ parameters.cni }}
140155
- job: restart_nodes
141156
condition: and( and( not(canceled()), not(failed()) ), or( contains(variables.CONTROL_SCENARIO, 'restartNode') , contains(variables.CONTROL_SCENARIO, 'all') ) )
142157
displayName: "Restart Test"
@@ -151,6 +166,7 @@ stages:
151166
parameters:
152167
clusterName: ${{ parameters.clusterName }}-$(commitID)
153168
restartCase: "true"
169+
cni: ${{ parameters.cni }}
154170
- job: restart_cns
155171
condition: and( and( not(canceled()), not(failed()) ), or( contains(variables.CONTROL_SCENARIO, 'restartCNS') , contains(variables.CONTROL_SCENARIO, 'all') ) )
156172
displayName: "Restart and Validate CNS"
@@ -162,7 +178,7 @@ stages:
162178
os: ${{ parameters.os }}
163179
scaleup: ${SCALEUP_CILIUM}
164180
nodeCount: ${{ parameters.nodeCount }}
165-
cni: cilium
181+
cni: ${{ parameters.cni }}
166182
- job: cni_tests
167183
displayName: "Cilium Test"
168184
dependsOn: restart_cns

‎.pipelines/cni/pipeline.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ stages:
307307
clusterName: "cilium-over"
308308
nodeCount: ${NODE_COUNT_CILIUM}
309309
vmSize: ${VM_SIZE_CILIUM}
310+
cni: "cilium"
310311

311312
- template: cilium/cilium-overlay-load-test-template.yaml
312313
parameters:
@@ -316,6 +317,7 @@ stages:
316317
hubbleEnabled: true
317318
nodeCount: ${NODE_COUNT_CILIUM}
318319
vmSize: ${VM_SIZE_CILIUM}
320+
cni: "cilium"
319321

320322
- template: cilium/cilium-overlay-load-test-template.yaml
321323
parameters:
@@ -326,6 +328,7 @@ stages:
326328
vmSize: ${VM_SIZE_CILIUM}
327329
arch: amd64
328330
osSKU: AzureLinux
331+
cni: "cilium"
329332

330333
- template: cilium/cilium-overlay-load-test-template.yaml
331334
parameters:
@@ -335,6 +338,7 @@ stages:
335338
nodeCount: ${NODE_COUNT_CILIUM}
336339
vmSize: Standard_D8ps_v5
337340
arch: arm64
341+
cni: "cilium"
338342

339343
- template: cilium/cilium-overlay-load-test-template.yaml
340344
parameters:
@@ -344,6 +348,17 @@ stages:
344348
nodeCount: 2
345349
vmSize: Standard_HC44-16rs
346350
arch: amd64
351+
cni: "cilium"
352+
353+
- template: cilium/cilium-overlay-load-test-template.yaml
354+
parameters:
355+
name: cilium_overlay_ds
356+
clusterType: dualstack-byocni-nokubeproxy-up
357+
clusterName: "cilium-ds-ov"
358+
nodeCount: ${NODE_COUNT_CILIUM}
359+
vmSize: ${VM_SIZE_CILIUM}
360+
dualstackVersion: ${CILIUM_DUALSTACK_VERSION}
361+
cni: "cilium_dualstack"
347362

348363
- stage: delete_resources
349364
displayName: "Delete Resources"
@@ -356,6 +371,7 @@ stages:
356371
- cilium_overlay_mariner
357372
- cilium_overlay_arm
358373
- cilium_overlay_rdma
374+
- cilium_overlay_ds
359375
- win22_cniv1_HNS
360376
- linux_cniv1
361377
- linux_podsubnet
@@ -391,6 +407,9 @@ stages:
391407
cilium_overlay_rdma:
392408
name: cilium_overlay_rdma
393409
clusterName: "cil-over-rdma"
410+
cilium_overlay_ds:
411+
name: cilium_overlay_ds
412+
clusterName: "cil-ds-ov"
394413
win22-cniv1:
395414
name: win22-cniv1
396415
clusterName: "win22-cniv1"

‎.pipelines/networkobservability/pipeline.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ stages:
8282
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
8383
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
8484
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
85-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
86-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
85+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
86+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
8787
# Use different file directories for nightly and current cilium version
8888
name: "installCilium"
8989
displayName: "Install Cilium on AKS Overlay"

‎.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ steps:
4343
4444
export CILIUM_VERSION_TAG=${CILIUM_DUALSTACK_VERSION}
4545
echo "install Cilium ${CILIUM_DUALSTACK_VERSION} onto Overlay Cluster"
46-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
47-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
46+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
47+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
4848
kubectl get po -owide -A
4949
name: "installCilium"
5050
displayName: "Install Cilium on AKS Dualstack Overlay"

‎.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ steps:
4242
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
4343
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
4444
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
45-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
46-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
45+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
46+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
4747
# Use different file directories for nightly and current cilium version
4848
name: "installCilium"
4949
displayName: "Install Cilium on AKS Overlay"

‎test/integration/manifests/cilium/v1.14/cilium-agent/templates/daemonset.tpl‎ renamed to ‎test/integration/manifests/cilium/v1.14/cilium-agent/templates/daemonset.yaml‎

File renamed without changes.

‎test/integration/manifests/cilium/v1.14/cilium-operator/templates/deployment.tpl‎ renamed to ‎test/integration/manifests/cilium/v1.14/cilium-operator/templates/deployment.yaml‎

File renamed without changes.

0 commit comments

Comments
 (0)