github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

kubernetes: Use /etc/kubernetes rather than /var/lib/kubelet

Browse Source 
This is a bind mount, but /etc/kubernetes is the path formally expected/create
by kubeadm.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-10-02 12:29:16 +01:00
parent 6e58dc2940
commit 9a99164cf7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/kubernetes/kubernetes/kubelet.sh
View File

@ -11,7 +11,7 @@ if [ -e /etc/kubelet.sh.conf ] ; then
. /etc/kubelet.sh.conf . /etc/kubelet.sh.conf
fi fi
conf=/var/lib/kubeadm/kubelet.conf conf=/etc/kubernetes/kubelet.conf
if [ -f "${conf}" ] ; then if [ -f "${conf}" ] ; then
echo "kubelet.sh: kubelet already configured" echo "kubelet.sh: kubelet already configured"
@ -43,7 +43,7 @@ echo "kubelet.sh: ${conf} has arrived" 2>&1
exec kubelet --kubeconfig=${conf} \ exec kubelet --kubeconfig=${conf} \
--require-kubeconfig=true \ --require-kubeconfig=true \
--pod-manifest-path=/var/lib/kubeadm/manifests \ --pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged=true \ --allow-privileged=true \
--cluster-dns=10.96.0.10 \ --cluster-dns=10.96.0.10 \
--cluster-domain=cluster.local \ --cluster-domain=cluster.local \