From 34b240f17aa8cfb7a6ce0dd9d16f7ad17fafd5c0 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Wed, 13 Aug 2014 14:11:43 -0700
Subject: [PATCH] Fix kubecfg.sh

---
 cluster/kubecfg.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cluster/kubecfg.sh b/cluster/kubecfg.sh
index 14aca871f4e..35a3bc5af5f 100755
--- a/cluster/kubecfg.sh
+++ b/cluster/kubecfg.sh
@@ -26,6 +26,9 @@ if [ ! -x $CLOUDCFG ]; then
 fi
 
 detect-master > /dev/null
-export KUBERNETES_MASTER=https://${KUBE_MASTER_IP}
+if [ "$KUBE_MASTER_IP" != "" ] && [ "$KUBERNETES_MASTER" == "" ]; then
+  echo "Setting master to: https://${KUBE_MASTER_IP}"
+  export KUBERNETES_MASTER=https://${KUBE_MASTER_IP}
+fi
 
 $CLOUDCFG $@