Skip to content

K
k3s
Commit 39a25edb authored by du2016's avatar du2016
Browse files
Options

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

parent 7e1cacaa
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
cluster/ubuntu/util.sh
View file @ 39a25edb
...@@ -19,6 +19,7 @@ ...@@ -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() { ...@@ -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() { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment