Merge pull request #11792 from GoogleCloudPlatform/revert-11379-fix_libvirt_coreos

cluster/common.sh

@@ -80,9 +80,7 @@ function create-kubeconfig() {
   fi
 
   "${kubectl}" config set-cluster "${CONTEXT}" "${cluster_args[@]}"
-  if [ -n "${user_args[@]:-}" ]; then
-      "${kubectl}" config set-credentials "${CONTEXT}" "${user_args[@]}"
-  fi
+  "${kubectl}" config set-credentials "${CONTEXT}" "${user_args[@]}"
   "${kubectl}" config set-context "${CONTEXT}" --cluster="${CONTEXT}" --user="${CONTEXT}"
   "${kubectl}" config use-context "${CONTEXT}"  --cluster="${CONTEXT}"
 

cluster/libvirt-coreos/util.sh

@@ -200,6 +200,7 @@ function wait-cluster-readiness {
 function kube-up {
   detect-master
   detect-minions
+  get-password
   initialize-pool keep_base_image
   initialize-network
 
@@ -327,6 +328,12 @@ 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"