Merge pull request #403 from mgfritch/update-cilium-v1.15.0

Update to Cilium v1.15.0
rancher · Feb 10, 2024 · c7de4c5 · c7de4c5
2 parents ad1ddf8 + bd6faf3
commit c7de4c5
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 130 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
-@@ -124,8 +124,7 @@
+@@ -81,8 +81,7 @@
  apiVersion: v2
- appVersion: 1.14.5
+ appVersion: 1.15.0
  description: eBPF-based Networking, Security, and Observability
 -home: https://cilium.io/
--icon: https://cdn.jsdelivr.net/gh/cilium/cilium@v1.14/Documentation/images/logo-solo.svg
+-icon: https://cdn.jsdelivr.net/gh/cilium/cilium@v1.15/Documentation/images/logo-solo.svg
 +home: https://docs.rke2.io/
  keywords:
  - BPF
  - eBPF
-@@ -135,7 +134,7 @@
+@@ -92,7 +91,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.14.5
+ version: 1.15.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
@@ -12,7 +12,7 @@
  {{- if and .Values.agent (not .Values.preflight.enabled) }}
 
  {{- /*  Default values with backwards compatibility */ -}}
-@@ -83,7 +91,7 @@
+@@ -87,7 +95,7 @@
        {{- end }}
        containers:
        - name: cilium-agent
@@ -21,7 +21,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- if .Values.sleepAfterInit }}
          command:
-@@ -372,7 +380,7 @@
+@@ -386,7 +394,7 @@
          {{- end }}
        {{- if .Values.monitor.enabled }}
        - name: cilium-monitor
@@ -30,7 +30,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
          - /bin/bash
-@@ -403,8 +411,18 @@
+@@ -417,8 +425,18 @@
        {{- toYaml .Values.extraContainers | nindent 6 }}
        {{- end }}
        initContainers:
@@ -49,8 +49,8 @@
 +        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.image }}"
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
-         - cilium
-@@ -448,7 +466,7 @@
+         - cilium-dbg
+@@ -465,7 +483,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
@@ -59,7 +59,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          env:
          - name: CGROUP_ROOT
-@@ -494,7 +512,7 @@
+@@ -511,7 +529,7 @@
                - ALL
            {{- end}}
        - name: apply-sysctl-overwrites
@@ -68,7 +68,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- with .Values.initResources }}
          resources:
-@@ -543,7 +561,7 @@
+@@ -560,7 +578,7 @@
        # from a privileged container because the mount propagation bidirectional
        # only works from privileged containers.
        - name: mount-bpf-fs
@@ -77,7 +77,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- with .Values.initResources }}
          resources:
-@@ -568,7 +586,7 @@
+@@ -585,7 +603,7 @@
        {{- end }}
        {{- if and .Values.nodeinit.enabled .Values.nodeinit.bootstrapFile }}
        - name: wait-for-node-init
@@ -86,7 +86,7 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- with .Values.initResources }}
          resources:
-@@ -586,9 +604,11 @@
+@@ -603,9 +621,11 @@
          volumeMounts:
          - name: cilium-bootstrap-file-dir
            mountPath: "/tmp/cilium-bootstrap.d"
@@ -99,16 +99,16 @@
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
          - /init-container.sh
-@@ -654,7 +674,7 @@
+@@ -677,7 +697,7 @@
          {{- end }}
-       {{- if and .Values.waitForKubeProxy (ne $kubeProxyReplacement "strict") }}
+       {{- if and .Values.waitForKubeProxy (and (ne $kubeProxyReplacement "strict") (ne $kubeProxyReplacement "true"))  }}
        - name: wait-for-kube-proxy
 -        image: {{ include "cilium.image" .Values.image | quote }}
 +        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.image }}"
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- with .Values.initResources }}
          resources:
-@@ -692,7 +712,7 @@
+@@ -715,7 +735,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

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
@@ -11,8 +11,8 @@
 +
  {{- if and (.Values.agent) (not .Values.preflight.enabled) }}
  {{- /*  Default values with backwards compatibility */ -}}
- {{- $defaultEnableCnpStatusUpdates := "true" -}}
-@@ -269,7 +277,11 @@
+ {{- $defaultBpfMapDynamicSizeRatio := 0.0 -}}
+@@ -289,7 +297,11 @@
 
    # Enable IPv6 addressing. If enabled, all endpoints are allocated an IPv6
    # address.
@@ -25,18 +25,16 @@
 
  {{- if .Values.cleanState }}
    # If a serious issue occurs during Cilium startup, this
-@@ -439,7 +451,9 @@
+@@ -463,6 +475,8 @@
+   tunnel-protocol: "vxlan"
  {{- else if .Values.routingMode }}
    routing-mode: {{ .Values.routingMode | quote }}
- {{- else }}
--  {{- if eq .Values.tunnel "disabled" }}
-+{{- if not .Values.ipv4.enabled }}
++{{- else if not .Values.ipv4.enabled }}
 +  routing-mode: "native"
-+{{- else if eq .Values.tunnel "disabled" }}
-   routing-mode: "native"
-   {{- else if eq .Values.tunnel "vxlan" }}
+ {{- else }}
+   # Default case
    routing-mode: "tunnel"
-@@ -630,6 +644,8 @@
+@@ -657,6 +671,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
@@ -1,11 +1,11 @@
 --- charts-original/templates/cilium-envoy/daemonset.yaml
 +++ charts/templates/cilium-envoy/daemonset.yaml
-@@ -58,7 +58,7 @@
+@@ -62,7 +62,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
+         - /usr/bin/cilium-envoy-starter
diff --git a/packages/rke2-cilium/generated-changes/patch/templates/cilium-nodeinit/daemonset.yaml.patch b/packages/rke2-cilium/generated-changes/patch/templates/cilium-nodeinit/daemonset.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/templates/cilium-nodeinit/daemonset.yaml
 +++ charts/templates/cilium-nodeinit/daemonset.yaml
-@@ -43,7 +43,7 @@
+@@ -47,7 +47,7 @@
        {{- end }}
        containers:
          - name: node-init

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
-@@ -67,7 +74,7 @@
+@@ -71,7 +78,7 @@
        {{- end }}
        containers:
        - name: cilium-operator

diff --git a/packages/rke2-cilium/generated-changes/patch/templates/cilium-preflight/daemonset.yaml.patch b/packages/rke2-cilium/generated-changes/patch/templates/cilium-preflight/daemonset.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/templates/cilium-preflight/daemonset.yaml
 +++ charts/templates/cilium-preflight/daemonset.yaml
-@@ -38,7 +38,7 @@
+@@ -42,7 +42,7 @@
        {{- end }}
        initContainers:
          - name: clean-cilium-state
@@ -9,7 +9,7 @@
            imagePullPolicy: {{ .Values.preflight.image.pullPolicy }}
            command: ["/bin/echo"]
            args:
-@@ -46,7 +46,7 @@
+@@ -50,7 +50,7 @@
            terminationMessagePolicy: FallbackToLogsOnError
        containers:
          - name: cilium-pre-flight-check
@@ -18,7 +18,7 @@
            imagePullPolicy: {{ .Values.preflight.image.pullPolicy }}
            command: ["/bin/sh"]
            args:
-@@ -97,7 +97,7 @@
+@@ -106,7 +106,7 @@
            terminationMessagePolicy: FallbackToLogsOnError
          {{- if ne .Values.preflight.tofqdnsPreCache "" }}
          - name: cilium-pre-flight-fqdn-precache

diff --git a/...ages/rke2-cilium/generated-changes/patch/templates/cilium-preflight/deployment.yaml.patch b/...ages/rke2-cilium/generated-changes/patch/templates/cilium-preflight/deployment.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/templates/cilium-preflight/deployment.yaml
 +++ charts/templates/cilium-preflight/deployment.yaml
-@@ -33,7 +33,7 @@
+@@ -37,7 +37,7 @@
        {{- end }}
        containers:
          - name: cnp-validator

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,24 +1,24 @@
 --- charts-original/templates/clustermesh-apiserver/deployment.yaml
 +++ charts/templates/clustermesh-apiserver/deployment.yaml
-@@ -44,7 +44,7 @@
+@@ -48,7 +48,7 @@
        {{- end }}
        initContainers:
        - name: etcd-init
--        image: {{ include "cilium.image" .Values.clustermesh.apiserver.etcd.image | quote }}
-+        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.clustermesh.apiserver.etcd.image }}"
-         imagePullPolicy: {{ .Values.clustermesh.apiserver.etcd.image.pullPolicy }}
-         command: ["/bin/sh", "-c"]
-         args:
-@@ -92,7 +92,7 @@
-         {{- end }}
+-        image: {{ include "cilium.image" .Values.clustermesh.apiserver.image | quote }}
++        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.clustermesh.apiserver.image }}"
+         imagePullPolicy: {{ .Values.clustermesh.apiserver.image.pullPolicy }}
+         command:
+         - /usr/bin/clustermesh-apiserver
+@@ -93,7 +93,7 @@
        containers:
        - name: etcd
--        image: {{ include "cilium.image" .Values.clustermesh.apiserver.etcd.image | quote }}
-+        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.clustermesh.apiserver.etcd.image }}"
-         imagePullPolicy: {{ .Values.clustermesh.apiserver.etcd.image.pullPolicy }}
+         # The clustermesh-apiserver container image includes an etcd binary.
+-        image: {{ include "cilium.image" .Values.clustermesh.apiserver.image | quote }}
++        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.clustermesh.apiserver.image }}"
+         imagePullPolicy: {{ .Values.clustermesh.apiserver.image.pullPolicy }}
          command:
-         - /usr/local/bin/etcd
-@@ -148,7 +148,7 @@
+         - /usr/bin/etcd
+@@ -153,7 +153,7 @@
            {{- toYaml . | nindent 10 }}
          {{- end }}
        - name: apiserver
@@ -27,12 +27,12 @@
          imagePullPolicy: {{ .Values.clustermesh.apiserver.image.pullPolicy }}
          command:
          - /usr/bin/clustermesh-apiserver
-@@ -226,7 +226,7 @@
+@@ -240,7 +240,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 }}
+-        image: {{ include "cilium.image" .Values.clustermesh.apiserver.image | quote }}
++        image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.clustermesh.apiserver.image }}"
+         imagePullPolicy: {{ .Values.clustermesh.apiserver.image.pullPolicy }}
          command:
-         - /usr/bin/kvstoremesh
+         - /usr/bin/clustermesh-apiserver
diff --git a/...enerated-changes/patch/templates/etcd-operator/cilium-etcd-operator-deployment.yaml.patch b/...enerated-changes/patch/templates/etcd-operator/cilium-etcd-operator-deployment.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/templates/etcd-operator/cilium-etcd-operator-deployment.yaml
 +++ charts/templates/etcd-operator/cilium-etcd-operator-deployment.yaml
-@@ -90,7 +90,7 @@
+@@ -94,7 +94,7 @@
            value: "revision"
          - name: CILIUM_ETCD_META_ETCD_AUTO_COMPACTION_RETENTION
            value: "25000"

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,6 +1,6 @@
 --- charts-original/templates/hubble-relay/deployment.yaml
 +++ charts/templates/hubble-relay/deployment.yaml
-@@ -49,7 +49,7 @@
+@@ -53,7 +53,7 @@
            securityContext:
              {{- toYaml . | nindent 12 }}
            {{- end }}

diff --git a/packages/rke2-cilium/generated-changes/patch/templates/hubble-ui/deployment.yaml.patch b/packages/rke2-cilium/generated-changes/patch/templates/hubble-ui/deployment.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/templates/hubble-ui/deployment.yaml
 +++ charts/templates/hubble-ui/deployment.yaml
-@@ -51,7 +51,7 @@
+@@ -55,7 +55,7 @@
        {{- end }}
        containers:
        - name: frontend
@@ -9,7 +9,7 @@
          imagePullPolicy: {{ .Values.hubble.ui.frontend.image.pullPolicy }}
          ports:
          - name: http
-@@ -79,7 +79,7 @@
+@@ -91,7 +91,7 @@
            {{- toYaml . | trim | nindent 10 }}
          {{- end }}
        - name: backend