Skip to content

Commit a7dd380

Browse files
committed
test: template call
1 parent bf6b8a8 commit a7dd380

File tree

9 files changed

+33
-60
lines changed

9 files changed

+33
-60
lines changed

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -233,17 +233,7 @@ stages:
233233
fi
234234
name: "testAsyncDelete"
235235
displayName: "Verify Async Delete when CNS is down"
236-
- script: |
237-
echo "Deploy nginx pods for MTU testing"
238-
kubectl apply -f hack/manifests/nginx.yaml
239-
kubectl wait --for=condition=available --timeout=60s -n kube-system deployment/nginx
240-
kubectl scale deployment nginx --replicas=25 -n kube-system
241-
kubectl rollout status deployment nginx -n kube-system
242-
cd hack/scripts
243-
chmod +x cilium-mtu-validation.sh
244-
./cilium-mtu-validation.sh
245-
name: "CiliumMTUValidation"
246-
displayName: "Run Cilium MTU Validation"
236+
- template: ../../templates/cilium-mtu-check.yaml
247237
- template: ../k8s-e2e/k8s-e2e-job-template.yaml
248238
parameters:
249239
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,4 @@ steps:
162162
name: "testAsyncDelete"
163163
displayName: "Verify Async Delete when CNS is down"
164164
165-
- script: |
166-
echo "Deploy nginx pods for MTU testing"
167-
kubectl apply -f hack/manifests/nginx.yaml
168-
kubectl wait --for=condition=available --timeout=60s -n kube-system deployment/nginx
169-
cd hack/scripts
170-
chmod +x cilium-mtu-validation.sh
171-
./cilium-mtu-validation.sh
172-
name: "CiliumMTUValidation"
173-
displayName: "Run Cilium MTU Validation"
165+
- template: ../../templates/cilium-mtu-check.yaml

.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.steps.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,4 @@ steps:
171171
name: "testAsyncDelete"
172172
displayName: "Verify Async Delete when CNS is down"
173173
174-
- script: |
175-
echo "Deploy nginx pods for MTU testing"
176-
kubectl apply -f hack/manifests/nginx.yaml
177-
kubectl wait --for=condition=available --timeout=60s -n kube-system deployment/nginx
178-
cd hack/scripts
179-
chmod +x cilium-mtu-validation.sh
180-
./cilium-mtu-validation.sh
181-
workingDirectory: $(ACN_DIR)
182-
name: "CiliumMTUValidation"
183-
displayName: "Run Cilium MTU Validation"
174+
- template: ../../templates/cilium-mtu-check.yaml

.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e.steps.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -202,16 +202,7 @@ steps:
202202
name: "testAsyncDelete"
203203
displayName: "Verify Async Delete when CNS is down"
204204
205-
- script: |
206-
echo "Deploy nginx pods for MTU testing"
207-
kubectl apply -f hack/manifests/nginx.yaml
208-
kubectl wait --for=condition=available --timeout=60s -n kube-system deployment/nginx
209-
cd hack/scripts
210-
chmod +x cilium-mtu-validation.sh
211-
./cilium-mtu-validation.sh
212-
workingDirectory: $(ACN_DIR)
213-
name: "CiliumMTUValidation"
214-
displayName: "Run Cilium MTU Validation"
205+
- template: ../../templates/cilium-mtu-check.yaml
215206

216207
- script: |
217208
ARTIFACT_DIR=$(Build.ArtifactStagingDirectory)/test-output/

.pipelines/singletenancy/cilium/cilium-e2e.steps.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,5 @@ steps:
154154
name: "testAsyncDelete"
155155
displayName: "Verify Async Delete when CNS is down"
156156
157-
- script: |
158-
echo "Deploy nginx pods for MTU testing"
159-
kubectl apply -f hack/manifests/nginx.yaml
160-
kubectl wait --for=condition=available --timeout=60s -n kube-system deployment/nginx
161-
cd hack/scripts
162-
chmod +x cilium-mtu-validation.sh
163-
./cilium-mtu-validation.sh
164-
workingDirectory: $(ACN_DIR)
165-
name: "CiliumMTUValidation"
166-
displayName: "Run Cilium MTU Validation"
157+
- template: ../../templates/cilium-mtu-check.yaml
158+
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
steps:
2+
- script: |
3+
echo "Deploy nginx pods for MTU testing"
4+
kubectl apply -f hack/manifests/nginx.yaml
5+
kubectl wait --for=condition=available --timeout=60s -n kube-system deployment/nginx
6+
cd hack/scripts
7+
chmod +x cilium-mtu-validation.sh
8+
./cilium-mtu-validation.sh
9+
name: "CiliumMTUValidation"
10+
displayName: "Run Cilium MTU Validation"

.pipelines/templates/cilium-tests.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,4 @@ steps:
8686
name: "testAsyncDelete"
8787
displayName: "Verify Async Delete when CNS is down"
8888
89-
- script: |
90-
echo "Deploy nginx pods for MTU testing"
91-
kubectl apply -f hack/manifests/nginx.yaml
92-
kubectl wait --for=condition=available --timeout=60s -n kube-system deployment/nginx
93-
cd hack/scripts
94-
chmod +x cilium-mtu-validation.sh
95-
./cilium-mtu-validation.sh
96-
name: "CiliumMTUValidation"
97-
displayName: "Run Cilium MTU Validation"
89+
- template: ./cilium-mtu-check.yaml

hack/manifests/nginx.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ spec:
1717
spec:
1818
containers:
1919
- name: nginx
20-
image: nginx:latest
20+
image: mcr.microsoft.com/azurelinux/base/nginx:1
2121
ports:
2222
- containerPort: 80

hack/scripts/cilium-mtu-validation.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
#!/bin/bash
22

3+
echo "Deploy nginx pods for MTU testing"
4+
kubectl apply -f ../manifests/nginx.yaml
5+
kubectl wait --for=condition=available --timeout=60s -n kube-system deployment/nginx
6+
7+
# Check node count
8+
node_count=$(kubectl get nodes --no-headers | wc -l)
9+
10+
# in CNI release test scenario scale deployments to 3 * node count to get replicas on each node
11+
if [ "$node_count" -gt 1 ]; then
12+
echo "Scaling nginx deployment to $((3 * node_count)) replicas"
13+
kubectl scale deployment nginx --replicas=$((2 * node_count)) -n kube-system
14+
fi
15+
# Wait for nginx pods to be ready
16+
kubectl wait --for=condition=available --timeout=60s -n kube-system deployment/nginx
17+
318
NAMESPACE="kube-system"
419

520

0 commit comments

Comments
 (0)