From b6d7a1737b86c1314dae90557563ff84855be5e6 Mon Sep 17 00:00:00 2001
From: qiaolei <qiaolei2@huawei.com>
Date: Fri, 14 Aug 2015 13:47:03 +0800
Subject: [PATCH] Update util.sh

Modify cluster/{vsphere,rackspace,azure,ubuntu}/util.sh, replace "~/.kubernetes_auth" with "${KUBECONFIG:-$DEFAULT_KUBECONFIG}"
---
 cluster/azure/util.sh     | 2 +-
 cluster/rackspace/util.sh | 2 +-
 cluster/ubuntu/util.sh    | 2 +-
 cluster/vsphere/util.sh   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster/azure/util.sh b/cluster/azure/util.sh
index 1419e2e72dd..849799f6585 100644
--- a/cluster/azure/util.sh
+++ b/cluster/azure/util.sh
@@ -493,7 +493,7 @@ function kube-down {
 #  echo
 #  echo "  https://${KUBE_MASTER_IP}"
 # echo
-#  echo "The user name and password to use is located in ~/.kubernetes_auth."
+#  echo "The user name and password to use is located in ${KUBECONFIG:-$DEFAULT_KUBECONFIG}."
 #  echo
 
 #}
diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh
index 8748a65dda3..0f94dce686e 100644
--- a/cluster/rackspace/util.sh
+++ b/cluster/rackspace/util.sh
@@ -371,7 +371,7 @@ kube-up() {
   echo
   echo "  https://${KUBE_MASTER_IP}"
   echo
-  echo "The user name and password to use is located in ~/.kubernetes_auth."
+  echo "The user name and password to use is located in ${KUBECONFIG:-$DEFAULT_KUBECONFIG}."
   echo
   echo "Security note: The server above uses a self signed certificate.  This is"
   echo "    subject to \"Man in the middle\" type attacks."
diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh
index 9bbd762f43d..3a7f11f970e 100755
--- a/cluster/ubuntu/util.sh
+++ b/cluster/ubuntu/util.sh
@@ -261,7 +261,7 @@ EOF
 }
 
 # Ensure that we have a password created for validating to the master. Will
-# read from $HOME/.kubernetes_auth if available.
+# read from ${KUBECONFIG:-$DEFAULT_KUBECONFIG} if available.
 #
 # Vars set:
 #   KUBE_USER
diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh
index 258c5b6e159..95c8fac035b 100755
--- a/cluster/vsphere/util.sh
+++ b/cluster/vsphere/util.sh
@@ -441,7 +441,7 @@ function kube-push {
   echo
   echo "  https://${KUBE_MASTER_IP}"
   echo
-  echo "The user name and password to use is located in ~/.kubernetes_auth."
+  echo "The user name and password to use is located in ${KUBECONFIG:-$DEFAULT_KUBECONFIG}."
   echo
 }