From 6fb36dc0bc8fa0db216194040973e93c0fd374ec Mon Sep 17 00:00:00 2001
From: Prashanth Balasubramanian <beeps@google.com>
Date: Mon, 16 Feb 2015 19:41:54 -0800
Subject: [PATCH] Teach kubectl to avoid local/util, since its gone.

---
 cluster/kubectl.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cluster/kubectl.sh b/cluster/kubectl.sh
index 26e536452eb..74a6f364187 100755
--- a/cluster/kubectl.sh
+++ b/cluster/kubectl.sh
@@ -20,7 +20,10 @@ set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/cluster/kube-env.sh"
-source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
+UTILS=${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh
+if [ -f ${UTILS} ]; then
+    source "${UTILS}"
+fi
 
 # Get the absolute path of the directory component of a file, i.e. the
 # absolute path of the dirname of $1.
@@ -116,7 +119,7 @@ elif [[ "$KUBERNETES_PROVIDER" == "vagrant" ]]; then
   # When we are using vagrant it has hard coded kubeconfig, and do not clobber public endpoints
   config=(
     "--kubeconfig=$HOME/.kubernetes_vagrant_kubeconfig"
-  )  
+  )
 fi
 
 echo "current-context: \"$(${kubectl} "${config[@]:+${config[@]}}" config view -o template --template='{{index . "current-context"}}')\"" >&2