Added cni file configuration on the chart

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>

Author: rbrtbnfgl

chart/kube-flannel/templates/config.yaml

@@ -7,26 +7,7 @@ metadata:
     tier: node
     app: flannel
 data:
-  cni-conf.json: |
-    {
-      "name": "cbr0",
-      "cniVersion": "0.3.1",
-      "plugins": [
-        {
-          "type": "flannel",
-          "delegate": {
-            "hairpinMode": true,
-            "isDefaultGateway": true
-          }
-        },
-        {
-          "type": "portmap",
-          "capabilities": {
-            "portMappings": true
-          }
-        }
-      ]
-    }
+  cni-conf.json: {{ .Values.flannel.cniConf | toJson }}
   net-conf.json: |
     {
 {{- if .Values.podCidr }}

chart/kube-flannel/values.yaml

@@ -55,6 +55,27 @@ flannel:
   # Persistent keep interval to use
   # keepaliveInterval: 0
   #
+  cniConf: |
+    {
+      "name": "cbr0",
+      "cniVersion": "0.3.1",
+      "plugins": [
+        {
+          "type": "flannel",
+          "delegate": {
+            "hairpinMode": true,
+            "isDefaultGateway": true
+          }
+        },
+        {
+          "type": "portmap",
+          "capabilities": {
+            "portMappings": true
+          }
+        }
+      ]
+    }
+  #
   # General daemonset configs
   #
   tolerations: