From 1074b4a8d4a235987a3b4c1cb89f301086fb6c67 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 13 Sep 2017 17:01:31 +0100 Subject: [PATCH] kubernetes: point kubelet at /var/lib/cni directly Still need the /opt bind to host for weave.yaml but no need for etc any longer. Signed-off-by: Ian Campbell --- projects/kubernetes/kubernetes/kubelet.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/kubernetes/kubernetes/kubelet.sh b/projects/kubernetes/kubernetes/kubelet.sh index de9a63535..59e80b35c 100755 --- a/projects/kubernetes/kubernetes/kubelet.sh +++ b/projects/kubernetes/kubernetes/kubelet.sh @@ -1,6 +1,5 @@ #!/bin/sh mount --bind /opt/cni /var/lib/cni/opt -mount --bind /etc/cni /var/lib/cni/etc until kubelet --kubeconfig=/var/lib/kubeadm/kubelet.conf \ --require-kubeconfig=true \ --pod-manifest-path=/var/lib/kubeadm/manifests \ @@ -10,8 +9,8 @@ until kubelet --kubeconfig=/var/lib/kubeadm/kubelet.conf \ --cgroups-per-qos=false \ --enforce-node-allocatable= \ --network-plugin=cni \ - --cni-conf-dir=/etc/cni/net.d \ - --cni-bin-dir=/opt/cni/bin \ + --cni-conf-dir=/var/lib/cni/etc/net.d \ + --cni-bin-dir=/var/lib/cni/opt/bin \ $@; do if [ ! -f /var/config/userdata ] ; then sleep 1