Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to cilium v1.12.8 #1934

Merged
merged 4 commits into from
May 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cilium/cilium_helm_values.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
image:
repository: mcr.microsoft.com/oss/cilium/cilium
tag: 1.12.5
tag: 1.12.8
digest: ""
useDigest: false

operator:
image:
repository: mcr.microsoft.com/oss/cilium/operator
tag: 1.12.5
tag: 1.12.8
suffix: ""
digest: ""
useDigest: false
Expand Down
41 changes: 23 additions & 18 deletions test/integration/manifests/cilium/cilium-agent/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,8 @@ spec:
fieldPath: metadata.namespace
- name: CILIUM_CLUSTERMESH_CONFIG
value: /var/lib/cilium/clustermesh/
- name: CILIUM_CUSTOM_CNI_CONF
value: "true"
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
imagePullPolicy: IfNotPresent
lifecycle:
postStart:
exec:
command:
- /cni-install.sh
preStop:
exec:
command:
- /cni-uninstall.sh
livenessProbe:
failureThreshold: 10
httpGet:
Expand Down Expand Up @@ -157,8 +146,6 @@ spec:
name: bpf-maps
- mountPath: /var/run/cilium
name: cilium-run
- mountPath: /host/opt/cni/bin
name: cni-path
- mountPath: /host/etc/cni/net.d
name: etc-cni-netd
- mountPath: /var/lib/cilium/clustermesh
Expand All @@ -175,6 +162,24 @@ spec:
dnsPolicy: ClusterFirst
hostNetwork: true
initContainers:
- name: install-cni-binaries
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
imagePullPolicy: IfNotPresent
command:
- "/install-plugin.sh"
securityContext:
seLinuxOptions:
level: 's0'
# Running with spc_t since we have removed the privileged mode.
# Users can change it to a different type as long as they have the
# type available on the system.
type: 'spc_t'
capabilities:
drop:
- ALL
volumeMounts:
- name: cni-path
mountPath: /host/opt/cni/bin
- command:
- sh
- -ec
Expand All @@ -187,7 +192,7 @@ spec:
value: /run/cilium/cgroupv2
- name: BIN_PATH
value: /opt/cni/bin
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
imagePullPolicy: IfNotPresent
name: mount-cgroup
resources: {}
Expand Down Expand Up @@ -219,7 +224,7 @@ spec:
env:
- name: BIN_PATH
value: /opt/cni/bin
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
imagePullPolicy: IfNotPresent
name: apply-sysctl-overwrites
resources: {}
Expand Down Expand Up @@ -247,7 +252,7 @@ spec:
- /bin/bash
- -c
- --
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
imagePullPolicy: IfNotPresent
name: mount-bpf-fs
resources: {}
Expand All @@ -274,7 +279,7 @@ spec:
key: clean-cilium-bpf-state
name: cilium-config
optional: true
image: mcr.microsoft.com/oss/cilium/cilium:1.12.5.1
image: mcr.microsoft.com/oss/cilium/cilium:1.12.8
imagePullPolicy: IfNotPresent
name: clean-cilium-state
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: cilium-operator
image: "mcr.microsoft.com/oss/cilium/operator-generic:1.12.5"
image: "mcr.microsoft.com/oss/cilium/operator-generic:1.12.8"
imagePullPolicy: IfNotPresent
command:
- cilium-operator-generic
Expand Down
Loading