Skip to content

Commit e772bd6

Browse files
paulyufan2paulyufan2
authored
Merge branch 'master' into coderefactorcnsswiftv2
2 parents 88df751 + c670d53 commit e772bd6

File tree

22 files changed

+75
-53
lines changed

22 files changed

+75
-53
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ stages:
120120
echo "Deploy Azure-CNS"
121121
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
122122
kubectl get po -owide -A
123+
kubectl get crd -A
123124
- ${{if eq(parameters.hubbleEnabled, true)}}:
124125
- job: deploy_cilium_components
125126
displayName: Deploy Cilium with Hubble
@@ -154,6 +155,7 @@ stages:
154155
echo "Deploy Azure-CNS"
155156
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
156157
kubectl get po -owide -A
158+
kubectl get crd -A
157159
158160
- job: deploy_pods
159161
condition: and( and( not(canceled()), not(failed()) ), or( contains(variables.CONTROL_SCENARIO, 'scaleTest') , contains(variables.CONTROL_SCENARIO, 'all') ) )
@@ -218,7 +220,7 @@ stages:
218220
displayName: "Get AKS Cluster"
219221
- script: |
220222
kubectl delete ns load-test
221-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption'
223+
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
222224
retryCountOnTaskFailure: 6
223225
name: "CiliumConnectivityTests"
224226
displayName: "Run Cilium Connectivity Tests"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ stages:
218218
displayName: "Get AKS Cluster"
219219
- script: |
220220
kubectl delete ns load-test
221-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption'
221+
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
222222
retryCountOnTaskFailure: 6
223223
name: "CiliumConnectivityTests"
224224
displayName: "Run Cilium Connectivity Tests"

‎.pipelines/networkobservability/pipeline.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ stages:
116116
- script: |
117117
echo "Run Cilium Connectivity Tests"
118118
cilium status
119-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption'
119+
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
120120
retryCountOnTaskFailure: 3
121121
name: "ciliumConnectivityTests"
122122
displayName: "Run Cilium Connectivity Tests"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ steps:
6565
echo "Waiting < 2 minutes for cilium to be ready"
6666
# Ensure Cilium is ready Xm\Xs
6767
cilium status --wait --wait-duration 2m
68+
kubectl get crd -A
6869
retryCountOnTaskFailure: 3
6970
name: "CiliumStatus"
7071
displayName: "Cilium Status"
@@ -110,7 +111,7 @@ steps:
110111
set -e
111112
echo "Run Cilium Connectivity Tests"
112113
cilium status
113-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!no-unexpected-packet-drops' --force-deploy
114+
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
114115
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
115116
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
116117
retryCountOnTaskFailure: 3

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ steps:
4949
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
5050
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
5151
kubectl get po -owide -A
52+
kubectl get crd -A
5253
name: "installCilium"
5354
displayName: "Install Cilium on AKS Dualstack Overlay"
5455

@@ -114,7 +115,7 @@ steps:
114115
set -e
115116
echo "Run Cilium Connectivity Tests"
116117
cilium status
117-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!no-unexpected-packet-drops' --force-deploy
118+
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
118119
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
119120
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
120121
retryCountOnTaskFailure: 3

‎.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-step-template.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ steps:
6969
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
7070
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
7171
kubectl get po -owide -A
72+
kubectl get crd -A
7273
name: "installCilium"
7374
displayName: "Install Cilium"
7475

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ steps:
6969
echo "Waiting < 2 minutes for cilium to be ready"
7070
# Ensure Cilium is ready Xm\Xs
7171
cilium status --wait --wait-duration 2m
72+
kubectl get crd -A
7273
retryCountOnTaskFailure: 3
7374
name: "CiliumStatus"
7475
displayName: "Cilium Status"
@@ -114,7 +115,7 @@ steps:
114115
set -e
115116
echo "Run Cilium Connectivity Tests"
116117
cilium status
117-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption' --force-deploy
118+
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
118119
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
119120
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
120121
retryCountOnTaskFailure: 3

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ steps:
6464
echo "Waiting < 2 minutes for cilium to be ready"
6565
# Ensure Cilium is ready Xm\Xs
6666
cilium status --wait --wait-duration 2m
67+
kubectl get crd -A
6768
retryCountOnTaskFailure: 3
6869
name: "CiliumStatus"
6970
displayName: "Cilium Status"
@@ -111,7 +112,7 @@ steps:
111112
set -e
112113
echo "Run Cilium Connectivity Tests"
113114
cilium status
114-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption' --force-deploy
115+
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
115116
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
116117
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
117118
workingDirectory: $(ACN_DIR)

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ steps:
9191
echo "Waiting < 2 minutes for cilium to be ready"
9292
# Ensure Cilium is ready Xm\Xs
9393
cilium status --wait --wait-duration 2m
94+
kubectl get crd -A
9495
retryCountOnTaskFailure: 3
9596
name: "CiliumStatus"
9697
displayName: "Cilium Status"
@@ -136,12 +137,7 @@ steps:
136137
set -e
137138
echo "Run Cilium Connectivity Tests"
138139
cilium status
139-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
140-
then
141-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
142-
else
143-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption' --force-deploy
144-
fi
140+
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
145141
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
146142
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
147143
retryCountOnTaskFailure: 3

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ steps:
8686
echo "Waiting < 2 minutes for cilium to be ready"
8787
# Ensure Cilium is ready Xm\Xs
8888
cilium status --wait --wait-duration 2m
89+
kubectl get crd -A
8990
retryCountOnTaskFailure: 3
9091
name: "CiliumStatus"
9192
displayName: "Cilium Status"
@@ -133,12 +134,7 @@ steps:
133134
set -e
134135
echo "Run Cilium Connectivity Tests"
135136
cilium status
136-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
137-
then
138-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
139-
else
140-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption' --force-deploy
141-
fi
137+
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
142138
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
143139
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
144140
retryCountOnTaskFailure: 3

0 commit comments

Comments
 (0)