Skip to content

Commit 96fb8b8

Browse files
jpayne3506jpayne3506
authored
ci: Update Cilium image usage for release/v1.4 (#3097)
ci: Update CILIUM_VERSION_TAG to CILIUM_VERSION_TAG_V1_4
1 parent 45e58cc commit 96fb8b8

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ stages:
4949
kubectl apply -f test/integration/manifests/cilium/cilium-agent
5050
kubectl apply -f test/integration/manifests/cilium/cilium-operator
5151
# Passes Cilium image to daemonset and deployment
52-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
53-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
52+
envsubst '${CILIUM_VERSION_TAG_V1_4},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
53+
envsubst '${CILIUM_VERSION_TAG_V1_4},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
5454
kubectl get po -owide -A
5555
echo "deploy ip-masq-agent for overlay"
5656
kubectl create -f test/integration/manifests/ip-masq-agent/ip-masq-agent.yaml --validate=false

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ steps:
3838
pwd
3939
kubectl cluster-info
4040
kubectl get po -owide -A
41-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then FILE_PATH=-nightly && echo "Running nightly"; fi
41+
if [ "$CILIUM_VERSION_TAG_V1_4" = "cilium-nightly-pipeline" ]; then FILE_PATH=-nightly && echo "Running nightly"; fi
4242
echo "deploy Cilium ConfigMap"
4343
kubectl apply -f cilium/configmap.yaml
4444
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-config.yaml
45-
echo "install Cilium ${CILIUM_VERSION_TAG}"
45+
echo "install Cilium ${CILIUM_VERSION_TAG_V1_4}"
4646
# Passes Cilium image to daemonset and deployment
47-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
48-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
47+
envsubst '${CILIUM_VERSION_TAG_V1_4},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
48+
envsubst '${CILIUM_VERSION_TAG_V1_4},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
4949
# Use different file directories for nightly and current cilium version
5050
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-agent
5151
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-operator
@@ -55,11 +55,11 @@ steps:
5555

5656
- script: |
5757
echo "install cilium CLI"
58-
if [[ ${CILIUM_VERSION_TAG} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
58+
if [[ ${CILIUM_VERSION_TAG_V1_4} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
5959
echo "Cilium Agent Version ${BASH_REMATCH[0]}"
6060
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable-v0.14.txt)
6161
else
62-
echo "Cilium Agent Version ${CILIUM_VERSION_TAG}"
62+
echo "Cilium Agent Version ${CILIUM_VERSION_TAG_V1_4}"
6363
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/master/stable.txt)
6464
fi
6565
CLI_ARCH=amd64
@@ -83,7 +83,7 @@ steps:
8383
cd ../../../..
8484
kubectl get po -owide -A
8585
# Nightly does not build images per commit. Will use existing image.
86-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
86+
if [ "$CILIUM_VERSION_TAG_V1_4" = "cilium-nightly-pipeline" ]
8787
then
8888
CNS=$(CNS_VERSION) CNI=$(CNI_VERSION) && echo "Running nightly"
8989
else
@@ -136,7 +136,7 @@ steps:
136136
# Deleting echo-external-node deployment until cilium version matches TODO. https://github.com/cilium/cilium-cli/issues/67 is addressing the change.
137137
# Saves 17 minutes
138138
kubectl delete deploy -n cilium-test echo-external-node
139-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
139+
if [ "$CILIUM_VERSION_TAG_V1_4" = "cilium-nightly-pipeline" ]; then
140140
echo "Check cilium identities in cilium-test namepsace during nightly run"
141141
echo "expect the identities to be deleted when the namespace is deleted"
142142
kubectl get ciliumidentity | grep cilium-test
@@ -150,7 +150,7 @@ steps:
150150
displayName: "Validate Pods"
151151
152152
- script: |
153-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
153+
if [ "$CILIUM_VERSION_TAG_V1_4" = "cilium-nightly-pipeline" ]; then
154154
kubectl get pod -owide -n cilium-test
155155
echo "wait for pod and cilium identity deletion in cilium-test namespace"
156156
ns="cilium-test"

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ steps:
4141
echo "deploy Cilium ConfigMap"
4242
kubectl apply -f cilium/configmap.yaml
4343
kubectl apply -f test/integration/manifests/cilium/cilium-config.yaml
44-
echo "install Cilium ${CILIUM_VERSION_TAG}"
45-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
46-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
44+
echo "install Cilium ${CILIUM_VERSION_TAG_V1_4}"
45+
envsubst '${CILIUM_VERSION_TAG_V1_4},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
46+
envsubst '${CILIUM_VERSION_TAG_V1_4},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
4747
kubectl apply -f test/integration/manifests/cilium/cilium-agent
4848
kubectl apply -f test/integration/manifests/cilium/cilium-operator
4949
kubectl get po -owide -A
@@ -52,11 +52,11 @@ steps:
5252

5353
- script: |
5454
echo "install cilium CLI"
55-
if [[ ${CILIUM_VERSION_TAG} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
55+
if [[ ${CILIUM_VERSION_TAG_V1_4} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
5656
echo "Cilium Agent Version ${BASH_REMATCH[0]}"
5757
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable-v0.14.txt)
5858
else
59-
echo "Cilium Agent Version ${CILIUM_VERSION_TAG}"
59+
echo "Cilium Agent Version ${CILIUM_VERSION_TAG_V1_4}"
6060
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/master/stable.txt)
6161
fi
6262
CLI_ARCH=amd64

‎test/integration/manifests/cilium/daemonset.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
fieldPath: metadata.namespace
6767
- name: CILIUM_CLUSTERMESH_CONFIG
6868
value: /var/lib/cilium/clustermesh/
69-
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG
69+
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG_V1_4
7070
imagePullPolicy: IfNotPresent
7171
livenessProbe:
7272
failureThreshold: 10
@@ -163,7 +163,7 @@ spec:
163163
hostNetwork: true
164164
initContainers:
165165
- name: install-cni-binaries
166-
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG
166+
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG_V1_4
167167
imagePullPolicy: IfNotPresent
168168
command:
169169
- "/install-plugin.sh"
@@ -192,7 +192,7 @@ spec:
192192
value: /run/cilium/cgroupv2
193193
- name: BIN_PATH
194194
value: /opt/cni/bin
195-
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG
195+
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG_V1_4
196196
imagePullPolicy: IfNotPresent
197197
name: mount-cgroup
198198
resources: {}
@@ -224,7 +224,7 @@ spec:
224224
env:
225225
- name: BIN_PATH
226226
value: /opt/cni/bin
227-
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG
227+
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG_V1_4
228228
imagePullPolicy: IfNotPresent
229229
name: apply-sysctl-overwrites
230230
resources: {}
@@ -252,7 +252,7 @@ spec:
252252
- /bin/bash
253253
- -c
254254
- --
255-
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG
255+
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG_V1_4
256256
imagePullPolicy: IfNotPresent
257257
name: mount-bpf-fs
258258
resources: {}
@@ -279,7 +279,7 @@ spec:
279279
key: clean-cilium-bpf-state
280280
name: cilium-config
281281
optional: true
282-
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG
282+
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG_V1_4
283283
imagePullPolicy: IfNotPresent
284284
name: clean-cilium-state
285285
resources:
@@ -338,7 +338,7 @@ spec:
338338
name: host-usr-lib
339339
readOnly: true
340340
- name: block-wireserver
341-
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG
341+
image: $CILIUM_IMAGE_REGISTRY/cilium/cilium:$CILIUM_VERSION_TAG_V1_4
342342
imagePullPolicy: IfNotPresent
343343
command:
344344
- /bin/bash

‎test/integration/manifests/cilium/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
spec:
3030
containers:
3131
- name: cilium-operator
32-
image: $CILIUM_IMAGE_REGISTRY/cilium/operator-generic:$CILIUM_VERSION_TAG
32+
image: $CILIUM_IMAGE_REGISTRY/cilium/operator-generic:$CILIUM_VERSION_TAG_V1_4
3333
imagePullPolicy: IfNotPresent
3434
command:
3535
- cilium-operator-generic

0 commit comments

Comments
 (0)