From 4fdb995acc51d50abcacd0819d0b1b7cf095fbe9 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Tue, 4 Jun 2024 19:23:54 +0000 Subject: [PATCH 1/3] skip async delete in nightly pipeline since we use hard version of azure-ipam --- .../cilium-overlay/cilium-overlay-e2e-step-template.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml index 54d049ec60..4421c767ee 100644 --- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml @@ -183,11 +183,15 @@ steps: displayName: "Run Wireserver and Metadata Connectivity Tests" - script: | + if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then + echo "Running nightly, skip async delete test" + else cd hack/scripts chmod +x async-delete-test.sh ./async-delete-test.sh if ! [ -z $(kubectl -n kube-system get ds azure-cns | grep non-existing) ]; then kubectl -n kube-system patch daemonset azure-cns --type json -p='[{"op": "remove", "path": "/spec/template/spec/nodeSelector/non-existing"}]' fi + fi name: "testAsyncDelete" displayName: "Verify Async Delete when CNS is down" From c8888a1876f617eb9f4984d54a31fca6b644bff2 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Tue, 4 Jun 2024 19:26:53 +0000 Subject: [PATCH 2/3] update spacing --- .../cilium-overlay-e2e-step-template.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml index 4421c767ee..cde44ea250 100644 --- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml @@ -183,15 +183,15 @@ steps: displayName: "Run Wireserver and Metadata Connectivity Tests" - script: | - if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then - echo "Running nightly, skip async delete test" - else - cd hack/scripts - chmod +x async-delete-test.sh - ./async-delete-test.sh - if ! [ -z $(kubectl -n kube-system get ds azure-cns | grep non-existing) ]; then - kubectl -n kube-system patch daemonset azure-cns --type json -p='[{"op": "remove", "path": "/spec/template/spec/nodeSelector/non-existing"}]' + if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then + echo "Running nightly, skip async delete test" + else + cd hack/scripts + chmod +x async-delete-test.sh + ./async-delete-test.sh + if ! [ -z $(kubectl -n kube-system get ds azure-cns | grep non-existing) ]; then + kubectl -n kube-system patch daemonset azure-cns --type json -p='[{"op": "remove", "path": "/spec/template/spec/nodeSelector/non-existing"}]' + fi fi - fi name: "testAsyncDelete" displayName: "Verify Async Delete when CNS is down" From 2ceaf697918ed993b763d11c07bacb09052187ce Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Wed, 5 Jun 2024 17:47:58 +0000 Subject: [PATCH 3/3] address comment --- .../cilium-overlay/cilium-overlay-e2e-step-template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml index cde44ea250..57b8d50e19 100644 --- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml @@ -189,7 +189,7 @@ steps: cd hack/scripts chmod +x async-delete-test.sh ./async-delete-test.sh - if ! [ -z $(kubectl -n kube-system get ds azure-cns | grep non-existing) ]; then + if ! [ -z $(kubectl -n kube-system get ds azure-cns | grep non-existing) ]; then kubectl -n kube-system patch daemonset azure-cns --type json -p='[{"op": "remove", "path": "/spec/template/spec/nodeSelector/non-existing"}]' fi fi