github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #38945 from du2016/change-source-common 

Automatic merge from submit-queue

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

#38921 common.sh should load before kube-down/kube-up function called,now it load in  kube-down/kube-up function,so can't find verify-kube-binaries command
pull/6/head
Kubernetes Submit Queue 2016-12-19 02:35:25 -08:00 committed by GitHub
parent 16f7cd189c 39a25edb71
commit 2b0a1f2b11
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