Skip to content

Commit 9867258

Browse files
Rui Gaoclaude
andcommitted
upgrade Cilium v1.18.8 to v1.18.9 to fix S360 grpc vulnerability (google.golang.org/grpc v1.74.2 -> v1.79.3)
Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
1 parent bcce1d3 commit 9867258

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

contrib/aks/k8s-deploy/cilium.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ spec:
903903
type: Unconfined
904904
containers:
905905
- name: cilium-agent
906-
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.8-update"
906+
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update"
907907
imagePullPolicy: Always
908908
command:
909909
- cilium-agent
@@ -1067,7 +1067,7 @@ spec:
10671067

10681068
initContainers:
10691069
- name: config
1070-
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.8-update"
1070+
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update"
10711071
imagePullPolicy: Always
10721072
command:
10731073
- cilium-dbg
@@ -1090,7 +1090,7 @@ spec:
10901090
# Required to mount cgroup2 filesystem on the underlying Kubernetes node.
10911091
# We use nsenter command with host's cgroup and mount namespaces enabled.
10921092
- name: mount-cgroup
1093-
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.8-update"
1093+
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update"
10941094
imagePullPolicy: Always
10951095
env:
10961096
- name: CGROUP_ROOT
@@ -1127,7 +1127,7 @@ spec:
11271127
#drop:
11281128
# - ALL
11291129
- name: apply-sysctl-overwrites
1130-
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.8-update"
1130+
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update"
11311131
imagePullPolicy: Always
11321132
env:
11331133
- name: BIN_PATH
@@ -1165,7 +1165,7 @@ spec:
11651165
# from a privileged container because the mount propagation bidirectional
11661166
# only works from privileged containers.
11671167
- name: mount-bpf-fs
1168-
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.8-update"
1168+
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update"
11691169
imagePullPolicy: Always
11701170
args:
11711171
- 'mount | grep "/sys/fs/bpf type bpf" || mount -t bpf bpf /sys/fs/bpf'
@@ -1181,7 +1181,7 @@ spec:
11811181
mountPath: /sys/fs/bpf
11821182
mountPropagation: Bidirectional
11831183
- name: clean-cilium-state
1184-
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.8-update"
1184+
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update"
11851185
imagePullPolicy: Always
11861186
command:
11871187
- /init-container.sh
@@ -1228,7 +1228,7 @@ spec:
12281228
mountPath: /var/run/cilium # wait-for-kube-proxy
12291229
# Install the CNI binaries in an InitContainer so we don't have a writable host mount in the agent
12301230
- name: install-cni-binaries
1231-
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.8-update"
1231+
image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update"
12321232
imagePullPolicy: Always
12331233
command:
12341234
- "/install-plugin.sh"
@@ -1412,7 +1412,7 @@ spec:
14121412
type: Unconfined
14131413
containers:
14141414
- name: cilium-envoy
1415-
image: "luciaopenpai.azurecr.io/cilium/cilium-envoy:v1.35.9-1773656288-update"
1415+
image: "luciaopenpai.azurecr.io/cilium/cilium-envoy:v1.36.6-1776000132-update"
14161416
imagePullPolicy: Always
14171417
command:
14181418
- /usr/bin/cilium-envoy-starter
@@ -1590,7 +1590,7 @@ spec:
15901590
type: RuntimeDefault
15911591
containers:
15921592
- name: cilium-operator
1593-
image: "luciaopenpai.azurecr.io/cilium/operator-generic:v1.18.8-update"
1593+
image: "luciaopenpai.azurecr.io/cilium/operator-generic:v1.18.9-update"
15941594
imagePullPolicy: Always
15951595
command:
15961596
- cilium-operator-generic

src/cilium/build/cilium-agent.common.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
#
2525

2626
ARG GOLANG_VERSION=1.25.9
27-
ARG CILIUM_VERSION=v1.18.8
27+
ARG CILIUM_VERSION=v1.18.9
2828
ARG CNI_PLUGINS_VERSION=v1.9.0
2929
ARG GOPS_VERSION=v0.3.27
30-
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:8f79229999eadc0ced8eacdfdd3574759246d025@sha256:4b36fa5fdeff01bcb7b5dacc9689539ec7f7cdf4a4b758933b0c5b5523a1069a
31-
ARG CILIUM_ENVOY_IMAGE=quay.io/cilium/cilium-envoy:v1.35.9-1773656288-7b052e66eb2cfc5ac130ce0a5be66202a10d83be@sha256:60031f39669542b21aedf05a3317d14e8d3ea48255790af039b315a1c9637361
30+
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:13e905399a00ec93849808d5dc775ccc4a6a91a6@sha256:86dfbe17994adef8e7817b8d97351fd0120576a5fc845198f7d39a2788b891e9
31+
ARG CILIUM_ENVOY_IMAGE=quay.io/cilium/cilium-envoy:v1.36.6-1776000132-2437d2edeaf4d9b56ef279bd0d71127440c067aa@sha256:ba0ab8adac082d50d525fd2c5ba096c8facea3a471561b7c61c7a5b9c2e0de0d
3232

3333
# Stage 1: Build all Go binaries from source with Go 1.25.9
3434
FROM golang:${GOLANG_VERSION} AS builder

src/cilium/build/cilium-envoy.common.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1717

1818
# Rebuild cilium-envoy image with latest OS security patches.
19-
# Base: official cilium-envoy matching cilium v1.18.8
19+
# Base: official cilium-envoy matching cilium v1.18.9
2020
# This patches OS-level CVEs (libc6, libgnutls30t64, libsystemd0).
2121
#
2222

23-
ARG CILIUM_ENVOY_TAG=v1.35.9-1773656288-7b052e66eb2cfc5ac130ce0a5be66202a10d83be
24-
FROM quay.io/cilium/cilium-envoy:${CILIUM_ENVOY_TAG}@sha256:60031f39669542b21aedf05a3317d14e8d3ea48255790af039b315a1c9637361
23+
ARG CILIUM_ENVOY_TAG=v1.36.6-1776000132-2437d2edeaf4d9b56ef279bd0d71127440c067aa
24+
FROM quay.io/cilium/cilium-envoy:${CILIUM_ENVOY_TAG}@sha256:ba0ab8adac082d50d525fd2c5ba096c8facea3a471561b7c61c7a5b9c2e0de0d
2525

2626
# Apply latest Ubuntu security updates
2727
RUN apt-get update && \

src/cilium/build/cilium-operator.common.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#
2222

2323
ARG GOLANG_VERSION=1.25.9
24-
ARG CILIUM_VERSION=v1.18.8
24+
ARG CILIUM_VERSION=v1.18.9
2525

2626
# Stage 1: Build operator binary
2727
FROM golang:${GOLANG_VERSION} AS builder

0 commit comments

Comments
 (0)