Merge pull request #2150 from vasrem/feature/allow-skipping-cni-conf-…

…installation

feat: add bool to control CNI config installation using Helm

chart/kube-flannel/templates/daemonset.yaml

@@ -44,6 +44,7 @@ spec:
         volumeMounts:
         - name: cni-plugin
           mountPath: /opt/cni/bin
+      {{- if not .Values.flannel.skipCNIConfigInstallation }}
       - name: install-cni
         image: {{ .Values.flannel.image.repository }}:{{ .Values.flannel.image.tag }}
         command:
@@ -57,6 +58,7 @@ spec:
           mountPath: /etc/cni/net.d
         - name: flannel-cfg
           mountPath: /etc/kube-flannel/
+      {{- end }}
       containers:
       - name: kube-flannel
         image: {{ .Values.flannel.image.repository }}:{{ .Values.flannel.image.tag }}

chart/kube-flannel/tests/daemonset_test.yaml

@@ -55,3 +55,21 @@ tests:
           path: spec.template.spec.imagePullSecrets
           value:
             - name: "a-test-secret"
+
+  - it: should add the install-cni init container when default values are used
+    asserts:
+      - contains:
+          path: spec.template.spec.initContainers
+          content:
+            name: install-cni
+          any: true
+
+  - it: should not add the install-cni init container when skipCNIConfigInstallation is set
+    set:
+      flannel.skipCNIConfigInstallation: true
+    asserts:
+      - notContains:
+          path: spec.template.spec.initContainers
+          content:
+            name: install-cni
+          any: true

chart/kube-flannel/values.yaml

@@ -16,6 +16,9 @@ flannel:
   image_cni:
     repository: docker.io/flannel/flannel-cni-plugin
     tag: v1.6.0-flannel1
+  # skipCNIConfigInstallation skips the installation of the flannel CNI config. This is useful when the CNI config is
+  # provided externally.
+  skipCNIConfigInstallation: false
   # flannel command arguments
   enableNFTables: false
   args: