From 509c3f5b9422dba2a36817f3c864d0404c9db8ab Mon Sep 17 00:00:00 2001
From: wizard <wizard_cxy@hotmail.com>
Date: Thu, 18 Jun 2015 13:59:27 +0800
Subject: [PATCH] hot fix for ubuntu k8s

---
 cluster/ubuntu/util.sh | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh
index ca6593b050..4d9ce85209 100755
--- a/cluster/ubuntu/util.sh
+++ b/cluster/ubuntu/util.sh
@@ -17,8 +17,6 @@
 # A library of helper functions that each provider hosting Kubernetes must implement to use cluster/kube-*.sh scripts.
 set -e
 
-source "${KUBE_ROOT}/cluster/common.sh"
-
 SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR"
 
 # use an array to record name and ip
@@ -254,23 +252,11 @@ EOF
 #   KUBE_USER
 #   KUBE_PASSWORD
 function get-password {
-  local file="$HOME/.kubernetes_auth"
-  if [[ -r "$file" ]]; then
-    KUBE_USER=$(cat "$file" | python -c 'import json,sys;print json.load(sys.stdin)["User"]')
-    KUBE_PASSWORD=$(cat "$file" | python -c 'import json,sys;print json.load(sys.stdin)["Password"]')
-    return
+  get-kubeconfig-basicauth
+  if [[ -z "${KUBE_USER}" || -z "${KUBE_PASSWORD}" ]]; then
+    KUBE_USER=admin
+    KUBE_PASSWORD=$(python -c 'import string,random; print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))')
   fi
-  KUBE_USER=admin
-  KUBE_PASSWORD=$(python -c 'import string,random; print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))')
-
-  # Store password for reuse.
-  cat << EOF > "$file"
-{
-  "User": "$KUBE_USER",
-  "Password": "$KUBE_PASSWORD"
-}
-EOF
-  chmod 0600 "$file"
 }
 
 # Detect the IP for the master
@@ -353,8 +339,14 @@ function kube-up {
 
   verify-cluster
   detect-master
-  export KUBE_MASTER_IP="${KUBE_MASTER_IP}:8080"
   export CONTEXT="ubuntu"
+  export KUBE_SERVER="http://${KUBE_MASTER_IP}:8080"
+
+  source "${KUBE_ROOT}/cluster/common.sh"
+
+  # set kubernetes user and password
+  get-password
+
   create-kubeconfig
 }