From 3b4a31dc8177332ff941f56df394facf160eae13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= <lhuard@amadeus.com>
Date: Thu, 16 Jul 2015 18:05:18 +0200
Subject: [PATCH] Fix libvirt-coreos cluster

KUBERNETES=libvirt-coreos cluster/kube-up.sh produced the following error:

cluster/../cluster/libvirt-coreos/../../cluster/common.sh: line 83: user_args[@]: unbound variable

This was coming from the fact that, as a libvirt-coreos cluster runs locally on local VMs,
there is no authentication mechanism. This led to have user_args of common.sh unset.

In the case of libvirt-coreos, it is in fact expected to have no authentication token.
---
 cluster/common.sh              | 4 +++-
 cluster/libvirt-coreos/util.sh | 7 -------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cluster/common.sh b/cluster/common.sh
index cb75be8a19..542a9604ad 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -80,7 +80,9 @@ function create-kubeconfig() {
   fi
 
   "${kubectl}" config set-cluster "${CONTEXT}" "${cluster_args[@]}"
-  "${kubectl}" config set-credentials "${CONTEXT}" "${user_args[@]}"
+  if [ -n "${user_args[@]:-}" ]; then
+      "${kubectl}" config set-credentials "${CONTEXT}" "${user_args[@]}"
+  fi
   "${kubectl}" config set-context "${CONTEXT}" --cluster="${CONTEXT}" --user="${CONTEXT}"
   "${kubectl}" config use-context "${CONTEXT}"  --cluster="${CONTEXT}"
 
diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh
index 0cce224687..828adf995e 100644
--- a/cluster/libvirt-coreos/util.sh
+++ b/cluster/libvirt-coreos/util.sh
@@ -200,7 +200,6 @@ function wait-cluster-readiness {
 function kube-up {
   detect-master
   detect-minions
-  get-password
   initialize-pool keep_base_image
   initialize-network
 
@@ -328,12 +327,6 @@ function test-teardown {
   kube-down
 }
 
-# Set the {KUBE_USER} and {KUBE_PASSWORD} environment values required to interact with provider
-function get-password {
-  export KUBE_USER=''
-  export KUBE_PASSWORD=''
-}
-
 # SSH to a node by name or IP ($1) and run a command ($2).
 function ssh-to-node {
   local node="$1"