From ba5b65ece20ca7e96aa87590f4e646cdd8262558 Mon Sep 17 00:00:00 2001
From: He Simei <hesimei@zju.edu.cn>
Date: Thu, 5 Nov 2015 19:08:59 +0800
Subject: [PATCH] set valid kubectl path for ubuntu

---
 cluster/ubuntu/deployAddons.sh |  1 +
 cluster/ubuntu/util.sh         | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cluster/ubuntu/deployAddons.sh b/cluster/ubuntu/deployAddons.sh
index 73f87e8a39..878394fe56 100755
--- a/cluster/ubuntu/deployAddons.sh
+++ b/cluster/ubuntu/deployAddons.sh
@@ -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..."
diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh
index a2d41c5173..446cb2d7cf 100755
--- a/cluster/ubuntu/util.sh
+++ b/cluster/ubuntu/util.sh
@@ -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
 
@@ -464,12 +465,13 @@ function prepare-push() {
 # Update a kubernetes master with expected release
 function push-master {
   source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE-"config-default.sh"}"
-
+  
   if [[ ! -f "${KUBE_ROOT}/cluster/ubuntu/binaries/master/kube-apiserver" ]]; then
     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
   for i in ${nodes}; do
@@ -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
@@ -555,7 +558,8 @@ function kube-push {
     echo "There is no required release of kubernetes, please check first"
     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