github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

common.sh should load before kube-down/kube-up function called

Browse Source
This commit is contained in:
du2016 2016-12-19 02:50:33 -05:00
parent 7e1cacaa91
commit 39a25edb71
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/ubuntu/util.sh
View File

@ -19,6 +19,7 @@
set -e set -e
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR -C" SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR -C"
source "${KUBE_ROOT}/cluster/common.sh"
MASTER="" MASTER=""
MASTER_IP="" MASTER_IP=""
@ -413,8 +414,6 @@ function kube-up() {
export CONTEXT="ubuntu" export CONTEXT="ubuntu"
export KUBE_SERVER="http://${KUBE_MASTER_IP}:8080" export KUBE_SERVER="http://${KUBE_MASTER_IP}:8080"
source "${KUBE_ROOT}/cluster/common.sh"
# set kubernetes user and password # set kubernetes user and password
load-or-gen-kube-basicauth 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} export KUBE_CONFIG_FILE=${KUBE_CONFIG_FILE:-${KUBE_ROOT}/cluster/ubuntu/config-default.sh}
source "${KUBE_CONFIG_FILE}" source "${KUBE_CONFIG_FILE}"
source "${KUBE_ROOT}/cluster/common.sh"
tear_down_alive_resources tear_down_alive_resources
check-pods-torn-down check-pods-torn-down