Skip to content

Commit 84d6bc8

Browse files
authored
Merge pull request #15242 from rastaman/update_cilium_to_1_12_3
Upgrade Cilium to version 1.12.3
2 parents a040c36 + 45262e5 commit 84d6bc8

File tree

1 file changed

+24
-8
lines changed

1 file changed

+24
-8
lines changed

pkg/minikube/cni/cilium.go

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ data:
129129
sidecar-istio-proxy-image: "cilium/istio_proxy"
130130
131131
# Name of the cluster. Only relevant when building a mesh of clusters.
132-
cluster-name: default
132+
cluster-name: cluster
133133
# Unique ID of the cluster. Must be unique across all conneted clusters and
134134
# in the range of 1 and 255. Only relevant when building a mesh of clusters.
135-
cluster-id: ""
135+
cluster-id: "1"
136136
137137
# Encapsulation mode for communication between nodes
138138
# Possible values:
@@ -299,6 +299,22 @@ rules:
299299
- list
300300
- watch
301301
- delete
302+
- apiGroups:
303+
- ""
304+
resources:
305+
- nodes
306+
verbs:
307+
- list
308+
- watch
309+
- apiGroups:
310+
- ""
311+
resources:
312+
# To remove node taints
313+
- nodes
314+
# To set NetworkUnavailable false on startup
315+
- nodes/status
316+
verbs:
317+
- patch
302318
- apiGroups:
303319
- discovery.k8s.io
304320
resources:
@@ -444,7 +460,7 @@ spec:
444460
httpGet:
445461
host: '127.0.0.1'
446462
path: /healthz
447-
port: 9876
463+
port: 9879
448464
scheme: HTTP
449465
httpHeaders:
450466
- name: "brief"
@@ -461,7 +477,7 @@ spec:
461477
httpGet:
462478
host: '127.0.0.1'
463479
path: /healthz
464-
port: 9876
480+
port: 9879
465481
scheme: HTTP
466482
httpHeaders:
467483
- name: "brief"
@@ -508,7 +524,7 @@ spec:
508524
key: custom-cni-conf
509525
name: cilium-config
510526
optional: true
511-
image: "quay.io/cilium/cilium:v1.9.9@sha256:a85d5cff13f8231c2e267d9fc3c6e43d24be4a75dac9f641c11ec46e7f17624d"
527+
image: "quay.io/cilium/cilium:v1.12.3@sha256:30de50c4dc0a1e1077e9e7917a54d5cab253058b3f779822aec00f5c817ca826"
512528
imagePullPolicy: IfNotPresent
513529
lifecycle:
514530
postStart:
@@ -570,7 +586,7 @@ spec:
570586
# same directory where we install cilium cni plugin so that exec permissions
571587
# are available.
572588
- 'cp /usr/bin/cilium-mount /hostbin/cilium-mount && nsenter --cgroup=/hostproc/1/ns/cgroup --mount=/hostproc/1/ns/mnt "${BIN_PATH}/cilium-mount" $CGROUP_ROOT; rm /hostbin/cilium-mount'
573-
image: "quay.io/cilium/cilium:v1.9.9@sha256:a85d5cff13f8231c2e267d9fc3c6e43d24be4a75dac9f641c11ec46e7f17624d"
589+
image: "quay.io/cilium/cilium:v1.12.3@sha256:30de50c4dc0a1e1077e9e7917a54d5cab253058b3f779822aec00f5c817ca826"
574590
imagePullPolicy: IfNotPresent
575591
volumeMounts:
576592
- mountPath: /hostproc
@@ -600,7 +616,7 @@ spec:
600616
key: wait-bpf-mount
601617
name: cilium-config
602618
optional: true
603-
image: "quay.io/cilium/cilium:v1.9.9@sha256:a85d5cff13f8231c2e267d9fc3c6e43d24be4a75dac9f641c11ec46e7f17624d"
619+
image: "quay.io/cilium/cilium:v1.12.3@sha256:30de50c4dc0a1e1077e9e7917a54d5cab253058b3f779822aec00f5c817ca826"
604620
imagePullPolicy: IfNotPresent
605621
name: clean-cilium-state
606622
securityContext:
@@ -762,7 +778,7 @@ spec:
762778
key: debug
763779
name: cilium-config
764780
optional: true
765-
image: "quay.io/cilium/operator-generic:v1.9.9@sha256:3726a965cd960295ca3c5e7f2b543c02096c0912c6652eb8bbb9ce54bcaa99d8"
781+
image: "quay.io/cilium/operator-generic:v1.12.3@sha256:816ec1da586139b595eeb31932c61a7c13b07fb4a0255341c0e0f18608e84eff"
766782
imagePullPolicy: IfNotPresent
767783
name: cilium-operator
768784
livenessProbe:

0 commit comments

Comments
 (0)