From 39a25edb71f6ab4952a20af11d7f8fadd640347c Mon Sep 17 00:00:00 2001 From: du2016 Date: Mon, 19 Dec 2016 02:50:33 -0500 Subject: [PATCH] common.sh should load before kube-down/kube-up function called --- cluster/ubuntu/util.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh index 5352f55c345..5d3806c5eda 100755 --- a/cluster/ubuntu/util.sh +++ b/cluster/ubuntu/util.sh @@ -19,6 +19,7 @@ set -e SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR -C" +source "${KUBE_ROOT}/cluster/common.sh" MASTER="" MASTER_IP="" @@ -413,8 +414,6 @@ function kube-up() { export CONTEXT="ubuntu" export KUBE_SERVER="http://${KUBE_MASTER_IP}:8080" - source "${KUBE_ROOT}/cluster/common.sh" - # set kubernetes user and password load-or-gen-kube-basicauth @@ -710,8 +709,6 @@ function kube-down() { export KUBE_CONFIG_FILE=${KUBE_CONFIG_FILE:-${KUBE_ROOT}/cluster/ubuntu/config-default.sh} source "${KUBE_CONFIG_FILE}" - source "${KUBE_ROOT}/cluster/common.sh" - tear_down_alive_resources check-pods-torn-down