mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-23 11:00:25 +00:00
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 <ijc@docker.com>
This commit is contained in:
parent
35542e493c
commit
1074b4a8d4
@ -1,6 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
mount --bind /opt/cni /var/lib/cni/opt
|
mount --bind /opt/cni /var/lib/cni/opt
|
||||||
mount --bind /etc/cni /var/lib/cni/etc
|
|
||||||
until kubelet --kubeconfig=/var/lib/kubeadm/kubelet.conf \
|
until kubelet --kubeconfig=/var/lib/kubeadm/kubelet.conf \
|
||||||
--require-kubeconfig=true \
|
--require-kubeconfig=true \
|
||||||
--pod-manifest-path=/var/lib/kubeadm/manifests \
|
--pod-manifest-path=/var/lib/kubeadm/manifests \
|
||||||
@ -10,8 +9,8 @@ until kubelet --kubeconfig=/var/lib/kubeadm/kubelet.conf \
|
|||||||
--cgroups-per-qos=false \
|
--cgroups-per-qos=false \
|
||||||
--enforce-node-allocatable= \
|
--enforce-node-allocatable= \
|
||||||
--network-plugin=cni \
|
--network-plugin=cni \
|
||||||
--cni-conf-dir=/etc/cni/net.d \
|
--cni-conf-dir=/var/lib/cni/etc/net.d \
|
||||||
--cni-bin-dir=/opt/cni/bin \
|
--cni-bin-dir=/var/lib/cni/opt/bin \
|
||||||
$@; do
|
$@; do
|
||||||
if [ ! -f /var/config/userdata ] ; then
|
if [ ! -f /var/config/userdata ] ; then
|
||||||
sleep 1
|
sleep 1
|
||||||
|
Loading…
Reference in New Issue
Block a user