Skip to content

Commit 66acf01

Browse files
authored
Update to cilium v1.12.8 (#1934)
* update to cilium 1.12.8 * initcontainer for cni binaries * update cni-install container
1 parent f955ae0 commit 66acf01

File tree

3 files changed

+26
-21
lines changed

3 files changed

+26
-21
lines changed

cilium/cilium_helm_values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
image:
22
repository: mcr.microsoft.com/oss/cilium/cilium
3-
tag: 1.12.5
3+
tag: 1.12.8
44
digest: ""
55
useDigest: false
66

77
operator:
88
image:
99
repository: mcr.microsoft.com/oss/cilium/operator
10-
tag: 1.12.5
10+
tag: 1.12.8
1111
suffix: ""
1212
digest: ""
1313
useDigest: false

test/integration/manifests/cilium/cilium-agent/daemonset.yaml

+23-18
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,8 @@ spec:
6666
fieldPath: metadata.namespace
6767
- name: CILIUM_CLUSTERMESH_CONFIG
6868
value: /var/lib/cilium/clustermesh/
69-
- name: CILIUM_CUSTOM_CNI_CONF
70-
value: "true"
71-
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
69+
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
7270
imagePullPolicy: IfNotPresent
73-
lifecycle:
74-
postStart:
75-
exec:
76-
command:
77-
- /cni-install.sh
78-
preStop:
79-
exec:
80-
command:
81-
- /cni-uninstall.sh
8271
livenessProbe:
8372
failureThreshold: 10
8473
httpGet:
@@ -157,8 +146,6 @@ spec:
157146
name: bpf-maps
158147
- mountPath: /var/run/cilium
159148
name: cilium-run
160-
- mountPath: /host/opt/cni/bin
161-
name: cni-path
162149
- mountPath: /host/etc/cni/net.d
163150
name: etc-cni-netd
164151
- mountPath: /var/lib/cilium/clustermesh
@@ -175,6 +162,24 @@ spec:
175162
dnsPolicy: ClusterFirst
176163
hostNetwork: true
177164
initContainers:
165+
- name: install-cni-binaries
166+
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
167+
imagePullPolicy: IfNotPresent
168+
command:
169+
- "/install-plugin.sh"
170+
securityContext:
171+
seLinuxOptions:
172+
level: 's0'
173+
# Running with spc_t since we have removed the privileged mode.
174+
# Users can change it to a different type as long as they have the
175+
# type available on the system.
176+
type: 'spc_t'
177+
capabilities:
178+
drop:
179+
- ALL
180+
volumeMounts:
181+
- name: cni-path
182+
mountPath: /host/opt/cni/bin
178183
- command:
179184
- sh
180185
- -ec
@@ -187,7 +192,7 @@ spec:
187192
value: /run/cilium/cgroupv2
188193
- name: BIN_PATH
189194
value: /opt/cni/bin
190-
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
195+
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
191196
imagePullPolicy: IfNotPresent
192197
name: mount-cgroup
193198
resources: {}
@@ -219,7 +224,7 @@ spec:
219224
env:
220225
- name: BIN_PATH
221226
value: /opt/cni/bin
222-
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
227+
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
223228
imagePullPolicy: IfNotPresent
224229
name: apply-sysctl-overwrites
225230
resources: {}
@@ -247,7 +252,7 @@ spec:
247252
- /bin/bash
248253
- -c
249254
- --
250-
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
255+
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
251256
imagePullPolicy: IfNotPresent
252257
name: mount-bpf-fs
253258
resources: {}
@@ -274,7 +279,7 @@ spec:
274279
key: clean-cilium-bpf-state
275280
name: cilium-config
276281
optional: true
277-
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
282+
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
278283
imagePullPolicy: IfNotPresent
279284
name: clean-cilium-state
280285
resources:

test/integration/manifests/cilium/cilium-operator/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: "mcr.microsoft.com/oss/cilium/operator-generic:1.12.5"
32+
image: "mcr.microsoft.com/oss/cilium/operator-generic:1.12.8"
3333
imagePullPolicy: IfNotPresent
3434
command:
3535
- cilium-operator-generic

0 commit comments

Comments
 (0)