Change CNI config directory to /etc/cni/net.d

* Change CNI config directory from `/etc/kubernetes/cni/net.d` to `/etc/cni/net.d` (Kubelet default)
poseidon · Apr 1, 2021 · f87aa7f · f87aa7f
1 parent 8c2e766
commit f87aa7f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/resources/calico/daemonset.yaml b/resources/calico/daemonset.yaml
@@ -63,7 +63,7 @@ spec:
             - name: SLEEP
               value: "false"
             - name: CNI_NET_DIR
-              value: "/etc/kubernetes/cni/net.d"
+              value: "/etc/cni/net.d"
           volumeMounts:
             - name: cni-bin-dir
               mountPath: /host/opt/cni/bin
@@ -195,4 +195,5 @@ spec:
             path: /opt/cni/bin
         - name: cni-conf-dir
           hostPath:
-            path: /etc/kubernetes/cni/net.d
+            type: DirectoryOrCreate
+            path: /etc/cni/net.d
diff --git a/resources/cilium/daemonset.yaml b/resources/cilium/daemonset.yaml
@@ -172,5 +172,5 @@ spec:
       - name: cni-conf-dir
         hostPath:
           type: DirectoryOrCreate
-          path: /etc/kubernetes/cni/net.d
+          path: /etc/cni/net.d
 
diff --git a/resources/flannel/daemonset.yaml b/resources/flannel/daemonset.yaml
@@ -90,7 +90,8 @@ spec:
             path: /opt/cni/bin
         - name: cni-conf-dir
           hostPath:
-            path: /etc/kubernetes/cni/net.d
+            type: DirectoryOrCreate
+            path: /etc/cni/net.d
         # Access iptables concurrently
         - name: xtables-lock
           hostPath: