helm: Remove deprecated option containerRuntime.integration

Relates: #24161 Signed-off-by: Tam Mach <tam.mach@cilium.io>
cilium · Apr 13, 2024 · dafdba4 · dafdba4
1 parent 926adfb
commit dafdba4
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 46 deletions.
diff --git a/Documentation/helm-values.rst b/Documentation/helm-values.rst
diff --git a/Documentation/network/kubernetes/configuration.rst b/Documentation/network/kubernetes/configuration.rst
@@ -333,8 +333,7 @@ If you want to use CRIO, use the instructions below.
 .. parsed-literal::
 
    helm install cilium |CHART_RELEASE| \\
-     --namespace kube-system \\
-     --set containerRuntime.integration=crio
+     --namespace kube-system
 
 Since CRI-O does not automatically detect that a new CNI plugin has been
 installed, you will need to restart the CRI-O daemon for it to pick up the

diff --git a/Documentation/network/kubernetes/kata.rst b/Documentation/network/kubernetes/kata.rst
@@ -72,8 +72,7 @@ Deploy Cilium release via Helm:
         .. parsed-literal::
 
            helm install cilium |CHART_RELEASE| \\
-             --namespace kube-system \\
-             --set containerRuntime.integration=containerd
+             --namespace kube-system
 
 .. warning::
 

diff --git a/Documentation/operations/upgrade.rst b/Documentation/operations/upgrade.rst
@@ -345,6 +345,7 @@ Helm Options
   ``enable-remote-node-identity=false`` make sure to update them.
 * The clustermesh-apiserver ``podSecurityContext`` and ``securityContext`` settings now
   default to drop all capabilities and run as non-root user.
+* Deprecated Helm option ``containerRuntime.integration`` is removed. If you are using cri-o, please check :ref:`crio-instructions`.
 
 Added Metrics
 ~~~~~~~~~~~~~

diff --git a/install/kubernetes/cilium/README.md b/install/kubernetes/cilium/README.md
diff --git a/install/kubernetes/cilium/templates/cilium-agent/daemonset.yaml b/install/kubernetes/cilium/templates/cilium-agent/daemonset.yaml
@@ -302,8 +302,7 @@ spec:
         - mountPath: /host/proc/sys/kernel
           name: host-proc-sys-kernel
         {{- end}}
-        {{- /* CRI-O already mounts the BPF filesystem */ -}}
-        {{- if and .Values.bpf.autoMount.enabled (not (eq .Values.containerRuntime.integration "crio")) }}
+        {{- if .Values.bpf.autoMount.enabled }}
         - name: bpf-maps
           mountPath: /sys/fs/bpf
           {{- if .Values.securityContext.privileged }}
@@ -582,8 +581,7 @@ spec:
         terminationMessagePolicy: FallbackToLogsOnError
         securityContext:
           privileged: true
-      {{- /* CRI-O already mounts the BPF filesystem */ -}}
-      {{- if and .Values.bpf.autoMount.enabled (not (eq .Values.containerRuntime.integration "crio")) }}
+      {{- if and .Values.bpf.autoMount.enabled }}
         volumeMounts:
         - name: bpf-maps
           mountPath: /sys/fs/bpf
@@ -664,8 +662,7 @@ spec:
               - ALL
           {{- end}}
         volumeMounts:
-        {{- /* CRI-O already mounts the BPF filesystem */ -}}
-        {{- if and .Values.bpf.autoMount.enabled (not (eq .Values.containerRuntime.integration "crio")) }}
+        {{- if .Values.bpf.autoMount.enabled}}
         - name: bpf-maps
           mountPath: /sys/fs/bpf
         {{- end }}
@@ -791,8 +788,7 @@ spec:
         hostPath:
           path: {{ .Values.daemon.runPath }}
           type: DirectoryOrCreate
-      {{- /* CRI-O already mounts the BPF filesystem */ -}}
-      {{- if and .Values.bpf.autoMount.enabled (not (eq .Values.containerRuntime.integration "crio")) }}
+      {{- if .Values.bpf.autoMount.enabled }}
         # To keep state between restarts / upgrades for bpf maps
       - name: bpf-maps
         hostPath:

diff --git a/install/kubernetes/cilium/values.schema.json b/install/kubernetes/cilium/values.schema.json
@@ -1346,14 +1346,6 @@
     "conntrackGCMaxInterval": {
       "type": "string"
     },
-    "containerRuntime": {
-      "properties": {
-        "integration": {
-          "type": "string"
-        }
-      },
-      "type": "object"
-    },
     "crdWaitTimeout": {
       "type": "string"
     },

diff --git a/install/kubernetes/cilium/values.yaml b/install/kubernetes/cilium/values.yaml
diff --git a/install/kubernetes/cilium/values.yaml.tmpl b/install/kubernetes/cilium/values.yaml.tmpl
@@ -621,14 +621,6 @@ conntrackGCInterval: ""
 # and has no effect when 'conntrackGCInterval' is set. This can be set to more frequently
 # clean up unused identities created from ToFQDN policies.
 conntrackGCMaxInterval: ""
-# -- Configure container runtime specific integration.
-# Deprecated in favor of bpf.autoMount.enabled. To be removed in 1.15.
-containerRuntime:
-  # -- Enables specific integrations for container runtimes.
-  # Supported values:
-  # - crio
-  # - none
-  integration: none
 # -- (string) Configure timeout in which Cilium will exit if CRDs are not available
 # @default -- `"5m"`
 crdWaitTimeout: ""