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

Move kubelet.sh.conf sourcing before exit checks

Browse Source 
Signed-off-by: pgayvallet <pierre.gayvallet@gmail.com>
This commit is contained in:
pgayvallet 2017-11-06 17:32:59 +01:00
parent ba8e01bf13
commit 179c82e0cb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,11 +2,15 @@
# Kubelet outputs only to stderr, so arrange for everything we do to go there too # Kubelet outputs only to stderr, so arrange for everything we do to go there too
exec 1>&2 exec 1>&2
if [ -e /etc/kubelet.sh.conf ] ; then
. /etc/kubelet.sh.conf
fi
if [ -f /var/config/kubelet/disabled ] ; then if [ -f /var/config/kubelet/disabled ] ; then
echo "kubelet.sh: /var/config/kubelet/disabled file is present, exiting" echo "kubelet.sh: /var/config/kubelet/disabled file is present, exiting"
exit 0 exit 0
fi fi
if ! [ -z "$KUBELET_DISABLED" ] ; then if [ -n "$KUBELET_DISABLED" ] ; then
echo "kubelet.sh: KUBELET_DISABLED environ variable is set, exiting" echo "kubelet.sh: KUBELET_DISABLED environ variable is set, exiting"
exit 0 exit 0
fi fi
@ -16,9 +20,6 @@ if [ ! -e /var/lib/cni/.opt.defaults-extracted ] ; then
tar -xzf /root/cni.tgz -C /var/lib/cni/opt/bin tar -xzf /root/cni.tgz -C /var/lib/cni/opt/bin
touch /var/lib/cni/.opt.defaults-extracted touch /var/lib/cni/.opt.defaults-extracted
fi fi
if [ -e /etc/kubelet.sh.conf ] ; then
. /etc/kubelet.sh.conf
fi
await=/etc/kubernetes/kubelet.conf await=/etc/kubernetes/kubelet.conf