Merge pull request kubernetes#4353 from erictune/fix_get_password

Don't fail get-password when no current-context.
duda · Feb 11, 2015 · 0194ed8 · 0194ed8
2 parents 2ed8885 + c348b30
commit 0194ed8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
@@ -199,9 +199,9 @@ function detect-master () {
 #   KUBE_PASSWORD
 function get-password {
   # go template to extract the auth-path of the current-context user
-  local template='{{$ctx := index . "current-context"}}{{$user := index . "contexts" $ctx "user"}}{{index . "users" $user "auth-path"}}'
+  local template='{{with $ctx := index . "current-context"}}{{$user := index . "contexts" $ctx "user"}}{{index . "users" $user "auth-path"}}{{end}}'
   local file=$("${KUBE_ROOT}/cluster/kubectl.sh" config view -o template --template="${template}")
-  if [[ -r "$file" ]]; then
+  if [[ ! -z "$file" && -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