Update cilium to v1.14.0

Signed-off-by: Roberto Bonafiglia <[email protected]>
rancher · Aug 4, 2023 · 97bdb7e · 97bdb7e
1 parent ee7586b
commit 97bdb7e
Show file tree

Hide file tree

Showing 9 changed files with 152 additions and 80 deletions.
diff --git a/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch b/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch
@@ -1,16 +1,16 @@
 --- charts-original/Chart.yaml
 +++ charts/Chart.yaml
-@@ -105,8 +105,7 @@
+@@ -124,8 +124,7 @@
  apiVersion: v2
- appVersion: 1.13.4
+ appVersion: 1.14.0
  description: eBPF-based Networking, Security, and Observability
 -home: https://cilium.io/
--icon: https://cdn.jsdelivr.net/gh/cilium/cilium@v1.13/Documentation/images/logo-solo.svg
+-icon: https://cdn.jsdelivr.net/gh/cilium/cilium@v1.14/Documentation/images/logo-solo.svg
 +home: https://docs.rke2.io/
  keywords:
  - BPF
  - eBPF
-@@ -116,7 +115,7 @@
+@@ -135,7 +134,7 @@
  - Observability
  - Troubleshooting
  kubeVersion: '>= 1.16.0-0'
@@ -19,4 +19,4 @@
  sources:
 -- https://github.com/cilium/cilium
 +- https://github.com/rancher/rke2-charts
- version: 1.13.4
+ version: 1.14.0
diff --git a/packages/rke2-cilium/generated-changes/patch/templates/cilium-agent/daemonset.yaml.patch b/packages/rke2-cilium/generated-changes/patch/templates/cilium-agent/daemonset.yaml.patch
@@ -21,7 +21,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- if .Values.sleepAfterInit }}
          command:
-@@ -377,7 +385,7 @@
+@@ -372,7 +380,7 @@
          {{- end }}
        {{- if .Values.monitor.enabled }}
        - name: cilium-monitor
@@ -30,7 +30,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
          - /bin/bash
-@@ -405,6 +413,16 @@
+@@ -400,8 +408,18 @@
        {{- toYaml .Values.extraContainers | nindent 6 }}
        {{- end }}
        initContainers:
@@ -45,9 +45,12 @@
 +          value: "bandwidth,bridge,dhcp,firewall,flannel,host-device,host-local,ipvlan,loopback,macvlan,ptp,sbr,static,tuning,vlan,vrf"
 +      {{- end }}
        - name: config
-         image: {{ include "cilium.image" .Values.image | quote }}
+-        image: {{ include "cilium.image" .Values.image | quote }}
++        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.image }}"
          imagePullPolicy: {{ .Values.image.pullPolicy }}
-@@ -447,7 +465,7 @@
+         command:
+         - cilium
+@@ -445,7 +463,7 @@
        # Required to mount cgroup2 filesystem on the underlying Kubernetes node.
        # We use nsenter command with host's cgroup and mount namespaces enabled.
        - name: mount-cgroup
@@ -56,7 +59,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          env:
          - name: CGROUP_ROOT
-@@ -493,7 +511,7 @@
+@@ -491,7 +509,7 @@
                - ALL
            {{- end}}
        - name: apply-sysctl-overwrites
@@ -65,7 +68,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          env:
          - name: BIN_PATH
-@@ -538,7 +556,7 @@
+@@ -536,7 +554,7 @@
        # from a privileged container because the mount propagation bidirectional
        # only works from privileged containers.
        - name: mount-bpf-fs
@@ -74,7 +77,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          args:
          - 'mount | grep "/sys/fs/bpf type bpf" || mount -t bpf bpf /sys/fs/bpf'
-@@ -559,7 +577,7 @@
+@@ -557,7 +575,7 @@
        {{- end }}
        {{- if and .Values.nodeinit.enabled .Values.nodeinit.bootstrapFile }}
        - name: wait-for-node-init
@@ -83,7 +86,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
          - sh
-@@ -573,9 +591,11 @@
+@@ -571,9 +589,11 @@
          volumeMounts:
          - name: cilium-bootstrap-file-dir
            mountPath: "/tmp/cilium-bootstrap.d"
@@ -96,7 +99,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
          - /init-container.sh
-@@ -638,7 +658,7 @@
+@@ -636,7 +656,7 @@
          {{- end }}
        {{- if and .Values.waitForKubeProxy (ne $kubeProxyReplacement "strict") }}
        - name: wait-for-kube-proxy
@@ -105,3 +108,12 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          securityContext:
            privileged: true
+@@ -670,7 +690,7 @@
+       {{- if .Values.cni.install }}
+       # Install the CNI binaries in an InitContainer so we don't have a writable host mount in the agent
+       - name: install-cni-binaries
+-        image: {{ include "cilium.image" .Values.image | quote }}
++        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.image }}"
+         imagePullPolicy: {{ .Values.image.pullPolicy }}
+         command:
+           - "/install-plugin.sh"
diff --git a/packages/rke2-cilium/generated-changes/patch/templates/cilium-configmap.yaml.patch b/packages/rke2-cilium/generated-changes/patch/templates/cilium-configmap.yaml.patch
@@ -12,7 +12,7 @@
  {{- if and (.Values.agent) (not .Values.preflight.enabled) }}
  {{- /*  Default values with backwards compatibility */ -}}
  {{- $defaultEnableCnpStatusUpdates := "true" -}}
-@@ -238,7 +246,11 @@
+@@ -265,7 +273,11 @@
 
    # Enable IPv6 addressing. If enabled, all endpoints are allocated an IPv6
    # address.
@@ -25,16 +25,18 @@
 
  {{- if .Values.cleanState }}
    # If a serious issue occurs during Cilium startup, this
-@@ -400,6 +412,8 @@
-   enable-local-node-route: "false"
- {{- else if .Values.aksbyocni.enabled }}
-   tunnel: "vxlan"
-+{{- else if not .Values.ipv4.enabled }}
-+  tunnel: "disabled"
- {{- else }}
-   tunnel: {{ .Values.tunnel | quote }}
+@@ -434,7 +446,9 @@
+   tunnel-protocol: "vxlan"
  {{- end }}
-@@ -566,6 +580,8 @@
+
+-{{- if eq .Values.tunnel "disabled" }}
++{{- if not .Values.ipv4.enabled }}
++  routing-mode: "native"
++{{- else if eq .Values.tunnel "disabled" }}
+   routing-mode: "native"
+ {{- else if eq .Values.tunnel "vxlan" }}
+   routing-mode: "tunnel"
+@@ -625,6 +639,8 @@
 
  {{- if .Values.ipv6NativeRoutingCIDR }}
    ipv6-native-routing-cidr: {{ .Values.ipv6NativeRoutingCIDR }}

diff --git a/packages/rke2-cilium/generated-changes/patch/templates/cilium-envoy/daemonset.yaml.patch b/packages/rke2-cilium/generated-changes/patch/templates/cilium-envoy/daemonset.yaml.patch
@@ -0,0 +1,11 @@
+--- charts-original/templates/cilium-envoy/daemonset.yaml
++++ charts/templates/cilium-envoy/daemonset.yaml
+@@ -58,7 +58,7 @@
+       {{- end }}
+       containers:
+       - name: cilium-envoy
+-        image: {{ include "cilium.image" .Values.envoy.image | quote }}
++        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.envoy.image }}"
+         imagePullPolicy: {{ .Values.envoy.image.pullPolicy }}
+         command:
+         - /usr/bin/cilium-envoy
diff --git a/packages/rke2-cilium/generated-changes/patch/templates/cilium-operator/deployment.yaml.patch b/packages/rke2-cilium/generated-changes/patch/templates/cilium-operator/deployment.yaml.patch
@@ -12,7 +12,7 @@
  ---
  apiVersion: apps/v1
  kind: Deployment
-@@ -55,7 +62,7 @@
+@@ -67,7 +74,7 @@
        {{- end }}
        containers:
        - name: cilium-operator

diff --git a/...rke2-cilium/generated-changes/patch/templates/clustermesh-apiserver/deployment.yaml.patch b/...rke2-cilium/generated-changes/patch/templates/clustermesh-apiserver/deployment.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/templates/clustermesh-apiserver/deployment.yaml
 +++ charts/templates/clustermesh-apiserver/deployment.yaml
-@@ -41,7 +41,7 @@
+@@ -44,7 +44,7 @@
        {{- end }}
        initContainers:
        - name: etcd-init
@@ -9,7 +9,7 @@
          imagePullPolicy: {{ .Values.clustermesh.apiserver.etcd.image.pullPolicy }}
          command: ["/bin/sh", "-c"]
          args:
-@@ -82,7 +82,7 @@
+@@ -89,7 +89,7 @@
          {{- end }}
        containers:
        - name: etcd
@@ -18,7 +18,7 @@
          imagePullPolicy: {{ .Values.clustermesh.apiserver.etcd.image.pullPolicy }}
          command:
          - /usr/local/bin/etcd
-@@ -122,7 +122,7 @@
+@@ -142,7 +142,7 @@
            {{- toYaml . | nindent 10 }}
          {{- end }}
        - name: apiserver
@@ -27,3 +27,12 @@
          imagePullPolicy: {{ .Values.clustermesh.apiserver.image.pullPolicy }}
          command:
          - /usr/bin/clustermesh-apiserver
+@@ -220,7 +220,7 @@
+         {{- end }}
+       {{- if .Values.clustermesh.apiserver.kvstoremesh.enabled }}
+       - name: kvstoremesh
+-        image: {{ include "cilium.image" .Values.clustermesh.apiserver.kvstoremesh.image | quote }}
++        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.clustermesh.apiserver.kvstoremesh.image }}"
+         imagePullPolicy: {{ .Values.clustermesh.apiserver.kvstoremesh.image.pullPolicy }}
+         command:
+         - /usr/bin/kvstoremesh
diff --git a/packages/rke2-cilium/generated-changes/patch/templates/hubble-relay/deployment.yaml.patch b/packages/rke2-cilium/generated-changes/patch/templates/hubble-relay/deployment.yaml.patch
@@ -1,9 +1,9 @@
 --- charts-original/templates/hubble-relay/deployment.yaml
 +++ charts/templates/hubble-relay/deployment.yaml
-@@ -46,7 +46,7 @@
-       {{- end }}
-       containers:
-         - name: hubble-relay
+@@ -49,7 +49,7 @@
+           securityContext:
+             {{- toYaml . | nindent 12 }}
+           {{- end }}
 -          image: {{ include "cilium.image" .Values.hubble.relay.image | quote }}
 +          image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.hubble.relay.image }}"
            imagePullPolicy: {{ .Values.hubble.relay.image.pullPolicy }}