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.

Sign up for GitHub

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

[release/v1.5] Update Cilium to v1.12.3 #2534

Merged
merged 1 commit into from
Dec 9, 2022
Merged

[release/v1.5] Update Cilium to v1.12.3 #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions addons/cni-cilium/cilium.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@ data:
enable-local-redirect-policy: "false"

{{ if eq .Config.ClusterNetwork.CNI.Cilium.KubeProxyReplacement "strict" }}
kube-proxy-replacement: "strict"
kube-proxy-replacement: "strict"
kube-proxy-replacement-healthz-bind-address: ""
{{ else }}
kube-proxy-replacement: "disabled"
kube-proxy-replacement: "disabled"
{{ end }}
bpf-lb-sock: "false"
enable-health-check-nodeport: "true"
Expand Down Expand Up @@ -234,10 +234,10 @@ data:
cluster-name: default
peer-service: "hubble-peer.kube-system.svc.cluster.local:443"
listen-address: :4245
dial-timeout:
retry-timeout:
sort-buffer-len-max:
sort-buffer-drain-timeout:
dial-timeout:
retry-timeout:
sort-buffer-len-max:
sort-buffer-drain-timeout:
tls-client-cert-file: /var/lib/hubble-relay/tls/client.crt
tls-client-key-file: /var/lib/hubble-relay/tls/client.key
tls-hubble-server-ca-files: /var/lib/hubble-relay/tls/hubble-server-ca.crt
Expand Down Expand Up @@ -1417,6 +1417,7 @@ spec:
subPath: nginx.conf
- name: tmp-dir
mountPath: /tmp
terminationMessagePolicy: FallbackToLogsOnError
- name: backend
image: {{ .InternalImages.Get "HubbleUIBackend" }}
imagePullPolicy: IfNotPresent
Expand Down
6 changes: 3 additions & 3 deletions pkg/templates/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,16 +376,16 @@ func optionalResources() map[Resource]map[string]string {
WeaveNetCNINPC: {"*": "docker.io/weaveworks/weave-npc:2.8.1"},

// Cilium
Cilium: {"*": "quay.io/cilium/cilium:v1.12.2@sha256:986f8b04cfdb35cf714701e58e35da0ee63da2b8a048ab596ccb49de58d5ba36"},
CiliumOperator: {"*": "quay.io/cilium/operator-generic:v1.12.2@sha256:00508f78dae5412161fa40ee30069c2802aef20f7bdd20e91423103ba8c0df6e"},
Cilium: {"*": "quay.io/cilium/cilium:v1.12.3@sha256:30de50c4dc0a1e1077e9e7917a54d5cab253058b3f779822aec00f5c817ca826"},
CiliumOperator: {"*": "quay.io/cilium/operator-generic:v1.12.3@sha256:816ec1da586139b595eeb31932c61a7c13b07fb4a0255341c0e0f18608e84eff"},

// Calico VXLAN
CalicoVXLANCNI: {"*": "quay.io/calico/cni:v3.23.3"},
CalicoVXLANController: {"*": "quay.io/calico/kube-controllers:v3.23.3"},
CalicoVXLANNode: {"*": "quay.io/calico/node:v3.23.3"},

// Hubble
HubbleRelay: {"*": "quay.io/cilium/hubble-relay:v1.12.2@sha256:6f3496c28f23542f2645d614c0a9e79e3b0ae2732080da794db41c33e4379e5c"},
HubbleRelay: {"*": "quay.io/cilium/hubble-relay:v1.12.3@sha256:320dff9389e3fc6e2d33863510d497e8bcf245a5755236ae466a0729cc656a79"},
HubbleUI: {"*": "quay.io/cilium/hubble-ui:v0.9.2@sha256:d3596efc94a41c6b772b9afe6fe47c17417658956e04c3e2a28d293f2670663e"},
HubbleUIBackend: {"*": "quay.io/cilium/hubble-ui-backend:v0.9.2@sha256:a3ac4d5b87889c9f7cc6323e86d3126b0d382933bd64f44382a92778b0cde5d7"},
CiliumCertGen: {"*": "quay.io/cilium/certgen:v0.1.8@sha256:4a456552a5f192992a6edcec2febb1c54870d665173a33dc7d876129b199ddbd"},
Expand Down