Skip to content

Commit

Permalink
Merge pull request #38945 from du2016/change-source-common
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Kubernetes Submit Queue committed Dec 19, 2016
2 parents 16f7cd1 + 39a25ed commit 2b0a1f2
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions cluster/ubuntu/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 2b0a1f2

Please sign in to comment.