ci: cleanup Cilium cli and connectivity test usage

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

@@ -65,7 +65,7 @@ stages:
  - ${{ if eq(parameters.upgradeScenario, false) }}:
  - create_${{ parameters.name }}
  - ${{ else }}:
- - ${{ parameters.dependsOn }} 
+ - ${{ parameters.dependsOn }}
  - publish
  - setup
  displayName: "Cilium Test - ${{ parameters.name }}"
@@ -122,7 +122,7 @@ stages:
 
  envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
  kubectl get po -owide -A
- 
+
  - ${{if eq(parameters.hubbleEnabled, true)}}:
  - job: deploy_cilium_components
  displayName: Deploy Cilium with Hubble
@@ -184,7 +184,7 @@ stages:
  IPAM=$(UPGRADE_AZURE_IPAM_VERSION)
  echo "UPGRADE_AZURE_IPAM_VERSION is set to $IPAM"
  fi
- 
+
  if [ -z "$UPGRADE_CNS_VERSION" ]
  then
  echo "UPGRADE_CNS_VERSION is not set, using default value"
@@ -214,9 +214,9 @@ stages:
  echo "TEST_CNS_VERSION is set to $CNS"
  fi
  fi
- 
+
  echo "Deploy Azure-CNS"
- sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO) 
+ sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO)
  kubectl get po -owide -A
  kubectl get crd -A
 
@@ -287,12 +287,7 @@ stages:
  make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
  name: "GetCluster"
  displayName: "Get AKS Cluster"
- - script: |
- kubectl delete ns load-test
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors,!no-unexpected-packet-drops'
- retryCountOnTaskFailure: 6
- name: "CiliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ - template: ../../templates/cilium-connectivity-tests.yaml
  - script: |
  cd hack/scripts
  chmod +x async-delete-test.sh

.pipelines/cni/cilium/nightly-release-test.yml

@@ -162,11 +162,11 @@ stages:
  make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=ciliumnightly-$(commitID)
 
  set -e
- echo "Run Cilium Connectivity Tests"
+ echo "Check Cilium Connectivity Test Logs"
  cilium status
  cilium connectivity test --test check-log-errors --log-check-levels error
- name: "ciliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ name: "ciliumConnectivityLogs"
+ displayName: "Check Cilium Connectivity Test Logs"
  condition: always()
 
  - template: ../../templates/log-check-template.yaml # Operator Check

.pipelines/cni/lsg/lsg-cni-intergration-template.yaml

@@ -187,24 +187,7 @@ stages:
  dependsOn: recover
  condition: and( succeeded(), ${{ contains(parameters.cni, 'cilium') }} )
  steps:
- - script: |
- echo "install cilium CLI"
- if [[ ${CILIUM_VERSION_TAG} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
- echo "Cilium Agent Version ${BASH_REMATCH[0]}"
- CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable-v0.14.txt)
- else
- echo "Cilium Agent Version ${CILIUM_VERSION_TAG}"
- CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/master/stable.txt)
- fi
- CLI_ARCH=amd64
- curl -L --fail --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${CILIUM_CLI_VERSION}/cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
- sha256sum --check cilium-linux-${CLI_ARCH}.tar.gz.sha256sum
- sudo tar xzvfC cilium-linux-${CLI_ARCH}.tar.gz /usr/local/bin
- rm cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
- cilium status
- cilium version
- name: "InstallCiliumCli"
- displayName: "Install Cilium CLI"
+ - template: ../../templates/cilium-cli.yaml
  - task: AzureCLI@2
  inputs:
  azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
@@ -216,12 +199,7 @@ stages:
  make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
  name: "GetCluster"
  displayName: "Get AKS Cluster"
- - script: |
- kubectl delete ns load-test
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
- retryCountOnTaskFailure: 6
- name: "CiliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ - template: ../../templates/cilium-connectivity-tests.yaml
  - ${{ if contains(parameters.cni, 'cilium') }}:
  - template: ../k8s-e2e/k8s-e2e-job-template.yaml
  parameters:

.pipelines/networkobservability/pipeline.yaml

@@ -113,14 +113,9 @@ stages:
  displayName: "Wait for all pods to be running"
  retryCountOnTaskFailure: 3
 
- - script: |
- echo "Run Cilium Connectivity Tests"
- cilium status
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
- retryCountOnTaskFailure: 3
- name: "ciliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
- enabled: true
+ - template: ../templates/cilium-connectivity-tests.yaml
+ parameters:
+ skipTests: '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors,!to-fqdns'
 
  - script: |
  export DIR=${CILIUM_VERSION_TAG%.*}

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

@@ -107,16 +107,14 @@ steps:
  displayName: "Validate Node Restart"
  retryCountOnTaskFailure: 3
 
+ - template: ../../templates/cilium-connectivity-tests.yaml
+
  - script: |
- set -e
- echo "Run Cilium Connectivity Tests"
- cilium status
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!no-unexpected-packet-drops,!check-log-errors' --force-deploy
  ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
  echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
  retryCountOnTaskFailure: 3
- name: "ciliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ name: "nsCapture"
+ displayName: "Capture Connectivity Test Namespace"
 
  - script: |
  set -e
@@ -158,5 +156,5 @@ steps:
  fi
  name: "testAsyncDelete"
  displayName: "Verify Async Delete when CNS is down"
- 
+
  - template: ../../templates/cilium-mtu-check.yaml

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

@@ -64,7 +64,7 @@ steps:
  SCALE_UP=32 OS_TYPE=linux CNI_TYPE=cilium_dualstack VALIDATE_STATEFILE=true \
  INSTALL_CNS=true INSTALL_OVERLAY=true CLEANUP=true \
  AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_VERSION=$(CNS_VERSION) \
- IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) 
+ IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE)
  retryCountOnTaskFailure: 3
  name: "aziliumTest"
  displayName: "Run Azilium E2E on AKS Overlay"
@@ -116,16 +116,14 @@ steps:
  displayName: "Validate Node Restart"
  retryCountOnTaskFailure: 3
 
+ - template: ../../templates/cilium-connectivity-tests.yaml
+
  - script: |
- set -e
- echo "Run Cilium Connectivity Tests"
- cilium status
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!no-unexpected-packet-drops,!check-log-errors' --force-deploy
  ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
  echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
  retryCountOnTaskFailure: 3
- name: "ciliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ name: "nsCapture"
+ displayName: "Capture Connectivity Test Namespace"
 
  - script: |
  set -e
@@ -170,5 +168,5 @@ steps:
  fi
  name: "testAsyncDelete"
  displayName: "Verify Async Delete when CNS is down"
- 
+
  - template: ../../templates/cilium-mtu-check.yaml

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

@@ -111,16 +111,14 @@ steps:
  displayName: "Validate Node Restart"
  retryCountOnTaskFailure: 3
 
+ - template: ../../templates/cilium-connectivity-tests.yaml
+
  - script: |
- set -e
- echo "Run Cilium Connectivity Tests"
- cilium status
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
  ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
  echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
  retryCountOnTaskFailure: 3
- name: "ciliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ name: "nsCapture"
+ displayName: "Capture Connectivity Test Namespace"
 
  - ${{ if eq( parameters['testHubble'], true) }}:
  - script: |

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

@@ -109,16 +109,14 @@ steps:
  displayName: "Validate Node Restart"
  retryCountOnTaskFailure: 3
 
+ - template: ../../templates/cilium-connectivity-tests.yaml
+
  - script: |
- set -e
- echo "Run Cilium Connectivity Tests"
- cilium status
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
  ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
  echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
  retryCountOnTaskFailure: 3
- name: "ciliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ name: "nsCapture"
+ displayName: "Capture Connectivity Test Namespace"
 
  - ${{ if eq( parameters['testHubble'], true) }}:
  - script: |
@@ -198,7 +196,7 @@ steps:
  fi
  name: "testAsyncDelete"
  displayName: "Verify Async Delete when CNS is down"
- 
+
  - template: ../../templates/cilium-mtu-check.yaml
 
  - script: |

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

@@ -144,16 +144,14 @@ steps:
  displayName: "Validate Node Restart"
  retryCountOnTaskFailure: 3
 
+ - template: ../../templates/cilium-connectivity-tests.yaml
+
  - script: |
- set -e
- echo "Run Cilium Connectivity Tests"
- cilium status
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
  ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
  echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
  retryCountOnTaskFailure: 3
- name: "ciliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ name: "nsCapture"
+ displayName: "Capture Connectivity Test Namespace"
 
  - ${{ if eq( parameters['testHubble'], true) }}:
  - script: |
@@ -238,4 +236,4 @@ steps:
  name: "testAsyncDelete"
  displayName: "Verify Async Delete when CNS is down"
 
- - template: ../../templates/cilium-mtu-check.yaml
+ - template: ../../templates/cilium-mtu-check.yaml

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

@@ -80,7 +80,7 @@ steps:
  SCALE_UP=32 OS_TYPE=linux VALIDATE_STATEFILE=true \
  INSTALL_CNS=true INSTALL_OVERLAY=true CLEANUP=true \
  AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_VERSION=$(CNS_VERSION) \
- IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE) 
+ IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE)
  retryCountOnTaskFailure: 3
  name: "aziliumTest"
  displayName: "Run Azilium E2E on AKS Overlay"
@@ -142,16 +142,14 @@ steps:
  displayName: "Validate Node Restart"
  retryCountOnTaskFailure: 3
 
+ - template: ../../templates/cilium-connectivity-tests.yaml
+
  - script: |
- set -e
- echo "Run Cilium Connectivity Tests"
- cilium status
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
  ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
  echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
  retryCountOnTaskFailure: 3
- name: "ciliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ name: "nsCapture"
+ displayName: "Capture Connectivity Test Namespace"
 
  - ${{ if eq( parameters['testHubble'], true) }}:
  - script: |
@@ -248,7 +246,7 @@ steps:
  fi
  name: "testAsyncDelete"
  displayName: "Verify Async Delete when CNS is down"
- 
+
  - template: ../../templates/cilium-mtu-check.yaml
- 
+
 

.pipelines/templates/cilium-connectivity-tests.yaml

@@ -0,0 +1,13 @@
+parameters:
+ skipTests: '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors,!no-unexpected-packet-drops,!to-fqdns'
+
+steps:
+ - script: |
+ if ! cilium connectivity test --connect-timeout 4s --request-timeout 30s --test ${{ parameters.skipTests }} --force-deploy
+ then
+ echo "--- Connectivity Tests failed! ---"
+ echo "--- Running Connectivity Tests with --debug ---"
+ cilium connectivity test --debug --connect-timeout 4s --request-timeout 30s --test ${{ parameters.skipTests }} --force-deploy
+ fi
+ name: "CiliumConnectivityTests"
+ displayName: "Run Cilium Connectivity Tests"

.pipelines/templates/cilium-tests.yaml

@@ -46,16 +46,7 @@ steps:
  displayName: "Validate Node Restart"
  retryCountOnTaskFailure: 3
 
- - script: |
- set -e
- echo "Run Cilium Connectivity Tests"
- cilium status
- cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
- ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
- echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
- retryCountOnTaskFailure: 3
- name: "ciliumConnectivityTests"
- displayName: "Run Cilium Connectivity Tests"
+ - template: ./cilium-connectivity-tests.yaml
 
  - script: |
  set -e
@@ -81,5 +72,5 @@ steps:
  fi
  name: "testAsyncDelete"
  displayName: "Verify Async Delete when CNS is down"
- 
+
  - template: ./cilium-mtu-check.yaml