mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
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
This commit is contained in:
commit
2b0a1f2b11
@ -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=""
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user