From fa878c3ff6a642bbbd7da79ce7296972fa942b5a Mon Sep 17 00:00:00 2001 From: ryandenney Date: Mon, 5 Feb 2024 14:26:58 -0500 Subject: [PATCH] further update --- .../cni/k8s-e2e/k8s-e2e-job-template.yaml | 13 ++++++++++++- ...lium-dualstackoverlay-e2e-job-template.yaml | 2 -- ...ium-dualstackoverlay-e2e-step-template.yaml | 18 +----------------- test/validate/linux_validate.go | 2 +- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml index 4d5d196f6d..a5734331bf 100644 --- a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml +++ b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml @@ -119,7 +119,18 @@ jobs: os: ${{ parameters.os }} processes: 8 attempts: 3 - - ${{ if eq(parameters.dualstack, true) }}: + - ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}: + - template: ../k8s-e2e/k8s-e2e-step-template.yaml + parameters: + testName: DualStack Test + name: DualStack + clusterName: ${{ parameters.clusterName }} + ginkgoFocus: '\[Feature:IPv6DualStack\]' + ginkgoSkip: 'SCTP|session affinity' + os: ${{ parameters.os }} + processes: 8 + attempts: 3 + - ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}: - template: ../k8s-e2e/k8s-e2e-step-template.yaml parameters: testName: DualStack Test diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml index 19efb2e9de..bf8cb35b2a 100644 --- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml +++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml @@ -54,7 +54,6 @@ stages: - template: cilium-dualstackoverlay-e2e-step-template.yaml parameters: name: ${{ parameters.name }} - testDropgz: ${{ parameters.testDropgz }} clusterName: ${{ parameters.clusterName }}-$(commitID) - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml @@ -67,7 +66,6 @@ stages: dualstack: true dns: true portforward: true - hostport: false service: true - job: failedE2ELogs diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml index 54c752d43a..e91282f6d4 100644 --- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml @@ -1,7 +1,6 @@ parameters: name: "" clusterName: "" - testHubble: false steps: @@ -44,7 +43,7 @@ steps: kubectl apply -f test/integration/manifests/cilium/cilium-operator kubectl get po -owide -A name: "installCilium" - displayName: "Install Cilium on AKS Overlay" + displayName: "Install Cilium on AKS Dualstack Overlay" - script: | echo "install cilium CLI" @@ -117,21 +116,6 @@ steps: name: "validatePods" displayName: "Validate Pods" - - script: | - echo "validate pod IP assignment before CNS restart" - kubectl get pod -owide -A - echo "validate pod state before CNS restarts" - cd test/integration/load - CNI_TYPE=cilium_dualstack go test -timeout 30m -tags load -run ^TestValidateState$ - echo "restart CNS" - kubectl rollout restart ds azure-cns -n kube-system - kubectl rollout status ds azure-cns -n kube-system - kubectl get pod -owide -A - echo "validate pods after CNS restart" - CNI_TYPE=cilium_dualstack go test -timeout 30m -tags load -run ^TestValidateState$ - name: "restartCNS" - displayName: "Restart CNS and validate pods" - - script: | echo "Run wireserver and metadata connectivity Tests" bash test/network/wireserver_metadata_test.sh diff --git a/test/validate/linux_validate.go b/test/validate/linux_validate.go index d7959f3aff..4c12cb7833 100644 --- a/test/validate/linux_validate.go +++ b/test/validate/linux_validate.go @@ -47,7 +47,7 @@ var linuxChecksMap = map[string][]check{ {"azure dualstackoverlay", azureVnetStateIps, privilegedLabelSelector, privilegedNamespace, azureVnetStateFileCmd}, }, "cilium_dualstack": { - {"cns", cnsManagedStateFileDualStackIps, cnsLabelSelector, privilegedNamespace, cnsManagedStateFileCmd}, // cns configmap "ManageEndpointState": true, | Endpoints managed in CNS State File + {"cns dualstack", cnsManagedStateFileDualStackIps, cnsLabelSelector, privilegedNamespace, cnsManagedStateFileCmd}, // cns configmap "ManageEndpointState": true, | Endpoints managed in CNS State File {"cilium", ciliumStateFileDualStackIps, ciliumLabelSelector, privilegedNamespace, ciliumStateFileCmd}, {"cns cache", cnsCacheStateFileIps, cnsLabelSelector, privilegedNamespace, cnsCachedAssignedIPStateCmd}, },