Skip to content

Commit b1eb4cf

Browse files
jpayne3506santhoshmprabhu
jpayne3506
and
santhoshmprabhu
authored
[backport] ci: Update Cilium image usage for release/v1.5 (#3098)
* fix: update pipeline to handle an extra character 'v' in version tag (#3089) * fix: update pipeline to handle v in version tag * chore: empty commit for pipeline run * ci: update CILIUM_VERSION_TAG to CILIUM_VERSION_TAG_V1_5 --------- Co-authored-by: Santhosh Prabhu <[email protected]>
1 parent ae00180 commit b1eb4cf

File tree

18 files changed

+92
-92
lines changed

18 files changed

+92
-92
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ stages:
8787
8888
if [ ! -z ${{ parameters.dualstackVersion }} ]; then
8989
echo "Use dualstack version of Cilium"
90-
export CILIUM_VERSION_TAG=${{ parameters.dualstackVersion }}
90+
export CILIUM_VERSION_TAG_V1_5=${{ parameters.dualstackVersion }}
9191
fi
9292
93-
echo "install Cilium ${CILIUM_VERSION_TAG}"
94-
export DIR=${CILIUM_VERSION_TAG%.*}
93+
echo "install Cilium ${CILIUM_VERSION_TAG_V1_5}"
94+
export DIR=$(echo ${CILIUM_VERSION_TAG_V1_5#v} | cut -d. -f1,2)
9595
echo "installing files from ${DIR}"
9696
9797
echo "deploy Cilium ConfigMap"
@@ -106,8 +106,8 @@ stages:
106106
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
107107
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
108108
109-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
110-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
109+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
110+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
111111
kubectl get po -owide -A
112112
113113
echo "Deploy Azure-CNS"
@@ -134,14 +134,14 @@ stages:
134134
kubectl get po -owide -A
135135
136136
echo "install Cilium onto Overlay Cluster with hubble enabled"
137-
export CILIUM_VERSION_TAG=${CILIUM_HUBBLE_VERSION_TAG}
138-
export DIR=${CILIUM_VERSION_TAG%.*}
137+
export CILIUM_VERSION_TAG_V1_5=${CILIUM_HUBBLE_VERSION_TAG}
138+
export DIR=${CILIUM_VERSION_TAG_V1_5%.*}
139139
echo "installing files from ${DIR}"
140140
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
141141
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
142142
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
143-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
144-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
143+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG_V1_5}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
144+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG_V1_5}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
145145
kubectl get po -owide -A
146146
147147
echo "Deploy Azure-CNS"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ stages:
9494
kubectl cluster-info
9595
kubectl get po -owide -A
9696
97-
echo "install Cilium ${CILIUM_VERSION_TAG}"
98-
export DIR=${CILIUM_VERSION_TAG%.*}
97+
echo "install Cilium ${CILIUM_VERSION_TAG_V1_5}"
98+
export DIR=$(echo ${CILIUM_VERSION_TAG_V1_5#v} | cut -d. -f1,2)
9999
echo "installing files from ${DIR}"
100100
101101
echo "deploy Cilium ConfigMap"
@@ -105,8 +105,8 @@ stages:
105105
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
106106
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
107107
108-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
109-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
108+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
109+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
110110
kubectl get po -owide -A
111111
echo "Deploy Azure-CNS"
112112
sudo -E env "PATH=$PATH" make test-load CNS_ONLY=true AZURE_IPAM_VERSION=$(ipamVersion) CNS_VERSION=$(cnsVersion) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO)
@@ -189,11 +189,11 @@ stages:
189189
steps:
190190
- script: |
191191
echo "install cilium CLI"
192-
if [[ ${CILIUM_VERSION_TAG} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
192+
if [[ ${CILIUM_VERSION_TAG_V1_5} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
193193
echo "Cilium Agent Version ${BASH_REMATCH[0]}"
194194
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable-v0.14.txt)
195195
else
196-
echo "Cilium Agent Version ${CILIUM_VERSION_TAG}"
196+
echo "Cilium Agent Version ${CILIUM_VERSION_TAG_V1_5}"
197197
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/master/stable.txt)
198198
fi
199199
CLI_ARCH=amd64

‎.pipelines/cni/pipeline.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ stages:
360360
nodeCount: ${NODE_COUNT_CILIUM}
361361
vmSize: ${VM_SIZE_CILIUM}
362362
arch: amd64
363-
dualstackVersion: ${CILIUM_DUALSTACK_VERSION}
363+
dualstackVersion: ${CILIUM_DUALSTACK_VERSION_V1_5}
364364
cni: "cilium_dualstack"
365365

366366
- stage: delete_resources

‎.pipelines/networkobservability/pipeline.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,20 @@ stages:
7777
scriptType: "bash"
7878
addSpnToEnvironment: true
7979
inlineScript: |
80-
export DIR=${CILIUM_VERSION_TAG%.*}
80+
export DIR=$(echo ${CILIUM_VERSION_TAG_V1_5#v} | cut -d. -f1,2)
8181
echo "installing files from ${DIR}"
8282
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
8383
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
8484
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
85-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
86-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
85+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
86+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
8787
# Use different file directories for nightly and current cilium version
8888
name: "installCilium"
8989
displayName: "Install Cilium on AKS Overlay"
9090

9191
- script: |
9292
echo "Start Azilium E2E Tests on Overlay Cluster"
93-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
93+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]
9494
then
9595
CNS=$(CNS_VERSION) IPAM=$(AZURE_IPAM_VERSION) && echo "Running nightly"
9696
else
@@ -123,7 +123,7 @@ stages:
123123
enabled: true
124124
125125
- script: |
126-
export DIR=${CILIUM_VERSION_TAG%.*}
126+
export DIR=${CILIUM_VERSION_TAG_V1_5%.*}
127127
kubectl apply -f test/integration/manifests/cilium/v${DIR}/hubble/hubble-peer-svc.yaml
128128
kubectl get pods -Aowide
129129
echo "verify Hubble metrics endpoint is usable"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ steps:
3333
pwd
3434
kubectl cluster-info
3535
kubectl get po -owide -A
36-
echo "install Cilium ${CILIUM_DUALSTACK_VERSION}"
37-
export DIR=${CILIUM_DUALSTACK_VERSION%.*}
36+
echo "install Cilium ${CILIUM_DUALSTACK_VERSION_V1_5}"
37+
export DIR=$(echo ${CILIUM_DUALSTACK_VERSION_V1_5#v} | cut -d. -f1,2)
3838
echo "installing files from ${DIR}"
3939
echo "deploy Cilium ConfigMap"
4040
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-dualstack.yaml
4141
# Passes Cilium image to daemonset and deployment
4242
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
4343
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
4444
45-
export CILIUM_VERSION_TAG=${CILIUM_DUALSTACK_VERSION}
45+
export CILIUM_VERSION_TAG_V1_5=${CILIUM_DUALSTACK_VERSION_V1_5}
4646
export IPV6_HP_BPF_VERSION=$(make ipv6-hp-bpf-version)
47-
echo "install Cilium ${CILIUM_DUALSTACK_VERSION} onto Overlay Cluster"
48-
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 -
49-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
47+
echo "install Cilium ${CILIUM_DUALSTACK_VERSION_V1_5} onto Overlay Cluster"
48+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
49+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
5050
kubectl get po -owide -A
5151
name: "installCilium"
5252
displayName: "Install Cilium on AKS Dualstack Overlay"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ steps:
3737
set -e
3838
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
3939
ls -lah
40-
export CILIUM_VERSION_TAG=${CILIUM_HUBBLE_VERSION_TAG}
41-
export DIR=${CILIUM_VERSION_TAG%.*}
40+
export CILIUM_VERSION_TAG_V1_5=${CILIUM_HUBBLE_VERSION_TAG}
41+
export DIR=$(echo ${CILIUM_VERSION_TAG_V1_5#v} | cut -d. -f1,2)
4242
echo "installing files from ${DIR}"
4343
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
4444
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
4545
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
46-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
47-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
46+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG_V1_5}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
47+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG_V1_5}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
4848
# Use different file directories for nightly and current cilium version
4949
name: "installCilium"
5050
displayName: "Install Cilium on AKS Overlay"
@@ -53,7 +53,7 @@ steps:
5353

5454
- script: |
5555
echo "Start Azilium E2E Tests on Overlay Cluster"
56-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
56+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]
5757
then
5858
CNS=$(CNS_VERSION) IPAM=$(AZURE_IPAM_VERSION) && echo "Running nightly"
5959
else
@@ -138,7 +138,7 @@ steps:
138138
# Deleting echo-external-node deployment until cilium version matches TODO. https://github.com/cilium/cilium-cli/issues/67 is addressing the change.
139139
# Saves 17 minutes
140140
kubectl delete deploy -n cilium-test echo-external-node
141-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
141+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]; then
142142
echo "Check cilium identities in cilium-test namepsace during nightly run"
143143
echo "expect the identities to be deleted when the namespace is deleted"
144144
kubectl get ciliumidentity | grep cilium-test
@@ -152,7 +152,7 @@ steps:
152152
displayName: "Validate Pods"
153153
154154
- script: |
155-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
155+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]; then
156156
kubectl get pod -owide -n cilium-test
157157
echo "wait for pod and cilium identity deletion in cilium-test namespace"
158158
ns="cilium-test"

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,29 @@ steps:
4141
pwd
4242
kubectl cluster-info
4343
kubectl get po -owide -A
44-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
44+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]; then
4545
FILE_PATH=-nightly
4646
echo "Running nightly"
4747
echo "deploy Cilium ConfigMap"
4848
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-config.yaml
4949
# Passes Cilium image to daemonset and deployment
50-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
51-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
50+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
51+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
5252
# Use different file directories for nightly and current cilium version
5353
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-agent
5454
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-operator
5555
else
56-
echo "install Cilium ${CILIUM_VERSION_TAG}"
57-
export DIR=${CILIUM_VERSION_TAG%.*}
56+
echo "install Cilium ${CILIUM_VERSION_TAG_V1_5}"
57+
export DIR=$(echo ${CILIUM_VERSION_TAG_V1_5#v} | cut -d. -f1,2)
5858
echo "installing files from ${DIR}"
5959
echo "deploy Cilium ConfigMap"
6060
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
6161
# Passes Cilium image to daemonset and deployment
6262
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
6363
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
6464
65-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
66-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
65+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
66+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
6767
fi
6868
6969
kubectl get po -owide -A
@@ -74,7 +74,7 @@ steps:
7474

7575
- script: |
7676
echo "Start Azilium E2E Tests on Overlay Cluster"
77-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
77+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]
7878
then
7979
CNS=$(CNS_VERSION) IPAM=$(AZURE_IPAM_VERSION) && echo "Running nightly"
8080
else
@@ -134,7 +134,7 @@ steps:
134134
- script: |
135135
echo "Run Cilium Connectivity Tests"
136136
cilium status
137-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
137+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]
138138
then
139139
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
140140
else
@@ -165,7 +165,7 @@ steps:
165165
# Deleting echo-external-node deployment until cilium version matches TODO. https://github.com/cilium/cilium-cli/issues/67 is addressing the change.
166166
# Saves 17 minutes
167167
kubectl delete deploy -n cilium-test echo-external-node
168-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
168+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]; then
169169
echo "Check cilium identities in cilium-test namepsace during nightly run"
170170
echo "expect the identities to be deleted when the namespace is deleted"
171171
kubectl get ciliumidentity | grep cilium-test
@@ -179,7 +179,7 @@ steps:
179179
displayName: "Validate Pods"
180180
181181
- script: |
182-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
182+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]; then
183183
kubectl get pod -owide -n cilium-test
184184
echo "wait for pod and cilium identity deletion in cilium-test namespace"
185185
ns="cilium-test"
@@ -226,7 +226,7 @@ steps:
226226
displayName: "Run Wireserver and Metadata Connectivity Tests"
227227
228228
- script: |
229-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
229+
if [ "$CILIUM_VERSION_TAG_V1_5" = "cilium-nightly-pipeline" ]; then
230230
echo "Running nightly, skip async delete test"
231231
else
232232
cd hack/scripts

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ steps:
3939
pwd
4040
kubectl cluster-info
4141
kubectl get po -owide -A
42-
echo "install Cilium ${CILIUM_VERSION_TAG}"
43-
export DIR=${CILIUM_VERSION_TAG%.*}
42+
echo "install Cilium ${CILIUM_VERSION_TAG_V1_5}"
43+
export DIR=$(echo ${CILIUM_VERSION_TAG_V1_5#v} | cut -d. -f1,2)
4444
echo "installing files from ${DIR}"
4545
echo "deploy Cilium ConfigMap"
4646
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
4747
# Passes Cilium image to daemonset and deployment
4848
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
4949
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
5050
51-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
52-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
51+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
52+
envsubst '${CILIUM_VERSION_TAG_V1_5},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
5353
kubectl get po -owide -A
5454
name: "installCilium"
5555
displayName: "Install Cilium"

0 commit comments

Comments
 (0)