Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Dec 19, 2016
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions cluster/ubuntu/util.sh
View file
Open in desktop
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