set valid kubectl path for ubuntu

pull/6/head
He Simei 2015-11-05 19:08:59 +08:00
parent 9b60fb0c4f
commit ba5b65ece2
2 changed files with 9 additions and 4 deletions

View File

@ -21,6 +21,7 @@ set -e
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source "config-default.sh"
KUBECTL="${KUBE_ROOT}/cluster/kubectl.sh"
export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl"
function init {
echo "Creating kube-system namespace..."

View File

@ -331,6 +331,7 @@ function kube-up() {
done
wait
export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl"
verify-cluster
detect-master
export CONTEXT="ubuntu"
@ -414,8 +415,8 @@ function provision-masterandnode() {
# Delete a kubernetes cluster
function kube-down {
export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl"
source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE-"config-default.sh"}"
source "${KUBE_ROOT}/cluster/common.sh"
tear_down_alive_resources
@ -469,6 +470,7 @@ function push-master {
echo "There is no required release of kubernetes, please check first"
exit 1
fi
export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl"
setClusterInfo
ii=0
@ -512,6 +514,7 @@ function push-node() {
exit 1
fi
export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl"
node_ip=${1}
setClusterInfo
ii=0
@ -556,6 +559,7 @@ function kube-push {
exit 1
fi
export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl"
#stop all the kube's process & etcd
ii=0
for i in ${nodes}; do