Remove unused config in flannel-daemonset.yaml

images/flannel-daemonset.yml

@@ -55,25 +55,26 @@ metadata:
     tier: node
     app: flannel
 data:
-  cni-conf.json: |
+  # ------------------------------- Intentionally removed, Multus daemonset configures /etc/cni/net.d
-    {
+  #cni-conf.json: |
-      "name": "cbr0",
+  #  {
-      "plugins": [
+  #    "name": "cbr0",
-        {
+  #    "plugins": [
-          "type": "flannel",
+  #      {
-          "delegate": {
+  #        "type": "flannel",
-            "hairpinMode": true,
+  #        "delegate": {
-            "isDefaultGateway": true
+  #          "hairpinMode": true,
-          }
+  #          "isDefaultGateway": true
-        },
+  #        }
-        {
+  #      },
-          "type": "portmap",
+  #      {
-          "capabilities": {
+  #        "type": "portmap",
-            "portMappings": true
+  #        "capabilities": {
-          }
+  #          "portMappings": true
-        }
+  #        }
-      ]
+  #      }
-    }
+  #    ]
+  #  }
   net-conf.json: |
     {
       "Network": "10.244.0.0/16",