From c69b6f5ba77d17033007be54088bc485ffcb2f8c Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Wed, 17 Jun 2015 15:33:36 -0400 Subject: [PATCH] Respect KUBECTL_BIN in kube-addon-update.sh not just kube-addons.sh --- cluster/saltbase/salt/kube-addons/kube-addon-update.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/kube-addons/kube-addon-update.sh b/cluster/saltbase/salt/kube-addons/kube-addon-update.sh index dd6ade57c82..174887a6ac5 100755 --- a/cluster/saltbase/salt/kube-addons/kube-addon-update.sh +++ b/cluster/saltbase/salt/kube-addons/kube-addon-update.sh @@ -44,7 +44,9 @@ # global config -KUBECTL=${TEST_KUBECTL:-/usr/local/bin/kubectl} # substitute for tests +KUBECTL=${TEST_KUBECTL:-} # substitute for tests +KUBECTL=${KUBECTL:-${KUBECTL_BIN:-}} +KUBECTL=${KUBECTL:-/usr/local/bin/kubectl} if [[ ! -x ${KUBECTL} ]]; then echo "ERROR: kubectl command (${KUBECTL}) not found or is not executable" 1>&2 exit 1