From f87aa7f96a31153d5d068cbb9d849a29a27cd9ea Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Thu, 1 Apr 2021 01:21:25 -0700 Subject: [PATCH] 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) --- resources/calico/daemonset.yaml | 5 +++-- resources/cilium/daemonset.yaml | 2 +- resources/flannel/daemonset.yaml | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/calico/daemonset.yaml b/resources/calico/daemonset.yaml index dad1c0f8..55038d40 100644 --- 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 index d1389959..cafbc73a 100644 --- 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 index 3d343e47..93ff7aeb 100644 --- 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: