From 179c82e0cb7d5476d99bd180e410b535531131d7 Mon Sep 17 00:00:00 2001 From: pgayvallet Date: Mon, 6 Nov 2017 17:32:59 +0100 Subject: [PATCH] Move kubelet.sh.conf sourcing before exit checks Signed-off-by: pgayvallet --- projects/kubernetes/kubernetes/kubelet.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/kubernetes/kubernetes/kubelet.sh b/projects/kubernetes/kubernetes/kubelet.sh index d716626c8..5c4e7b882 100755 --- a/projects/kubernetes/kubernetes/kubelet.sh +++ b/projects/kubernetes/kubernetes/kubelet.sh @@ -2,11 +2,15 @@ # Kubelet outputs only to stderr, so arrange for everything we do to go there too exec 1>&2 +if [ -e /etc/kubelet.sh.conf ] ; then + . /etc/kubelet.sh.conf +fi + if [ -f /var/config/kubelet/disabled ] ; then echo "kubelet.sh: /var/config/kubelet/disabled file is present, exiting" exit 0 fi -if ! [ -z "$KUBELET_DISABLED" ] ; then +if [ -n "$KUBELET_DISABLED" ] ; then echo "kubelet.sh: KUBELET_DISABLED environ variable is set, exiting" exit 0 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 touch /var/lib/cni/.opt.defaults-extracted fi -if [ -e /etc/kubelet.sh.conf ] ; then - . /etc/kubelet.sh.conf -fi await=/etc/kubernetes/kubelet.conf