From 3787fc5eca7891ca5082b5bb3802b8430b09bd00 Mon Sep 17 00:00:00 2001
From: Jeff Lowdermilk <jeffml@google.com>
Date: Thu, 16 Apr 2015 16:41:04 -0700
Subject: [PATCH] set KUBECONFIG in common.sh, default to new location

and preserve value in ginkgo e2e test driver
---
 cluster/aws/util.sh            |  1 -
 cluster/azure/util.sh          |  1 -
 cluster/libvirt-coreos/util.sh |  1 -
 cluster/rackspace/util.sh      |  1 -
 cluster/vagrant/util.sh        |  1 -
 cluster/vsphere/util.sh        |  1 -
 hack/ginkgo-e2e.sh             | 26 ++++----------------------
 7 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 30c6860811d..be86edb4fbc 100644
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -605,7 +605,6 @@ function kube-up {
   echo "Kubernetes cluster created."
 
   # TODO use token instead of kube_auth
-  export KUBECONFIG="${KUBECONFIG:-${HOME}/.kube/.kubeconfig}"
   export KUBE_CERT="/tmp/$RANDOM-kubecfg.crt"
   export KUBE_KEY="/tmp/$RANDOM-kubecfg.key"
   export CA_CERT="/tmp/$RANDOM-kubernetes.ca.crt"
diff --git a/cluster/azure/util.sh b/cluster/azure/util.sh
index b57928c5ca2..515917bea95 100644
--- a/cluster/azure/util.sh
+++ b/cluster/azure/util.sh
@@ -420,7 +420,6 @@ function kube-up {
     printf "\n"
     echo "Kubernetes cluster created."
 
-    export KUBECONFIG="${KUBECONFIG:-${HOME}/.kube/.kubeconfig}"
     export KUBE_CERT="/tmp/$RANDOM-kubecfg.crt"
     export KUBE_KEY="/tmp/$RANDOM-kubecfg.key"
     export CA_CERT="/tmp/$RANDOM-kubernetes.ca.crt"
diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh
index 31920510be0..af353edd1c8 100644
--- a/cluster/libvirt-coreos/util.sh
+++ b/cluster/libvirt-coreos/util.sh
@@ -237,7 +237,6 @@ function kube-up {
     rm $domain_xml
   done
 
-  export KUBECONFIG="${KUBECONFIG:-${HOME}/.kube/.kubeconfig}"
   export KUBE_SERVER="http://192.168.10.1:8080"
   export CONTEXT="libvirt-coreos"
   create-kubeconfig
diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh
index 01ce8528466..771bae4d245 100644
--- a/cluster/rackspace/util.sh
+++ b/cluster/rackspace/util.sh
@@ -318,7 +318,6 @@ kube-up() {
 
   echo "Kubernetes cluster created."
 
-  export KUBECONFIG="${KUBECONFIG-${HOME}/.kube/.kubeconfig}"
   export KUBE_CERT=""
   export KUBE_KEY=""
   export CA_CERT=""
diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh
index db0db1c6cb2..f18975ecf3a 100644
--- a/cluster/vagrant/util.sh
+++ b/cluster/vagrant/util.sh
@@ -253,7 +253,6 @@ function kube-up {
 
   vagrant up
 
-  export KUBECONFIG="${KUBECONFIG:-${HOME}/.kube/.kubeconfig}"
   export KUBE_CERT="/tmp/$RANDOM-kubecfg.crt"
   export KUBE_KEY="/tmp/$RANDOM-kubecfg.key"
   export CA_CERT="/tmp/$RANDOM-kubernetes.ca.crt"
diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh
index 92b2d191d57..90fbf928d52 100755
--- a/cluster/vsphere/util.sh
+++ b/cluster/vsphere/util.sh
@@ -364,7 +364,6 @@ function kube-up {
   echo "Kubernetes cluster created."
 
   # TODO use token instead of basic auth
-  export KUBECONFIG="${KUBECONFIG:-"${HOME}/.kube/.kubeconfig"}"
   export KUBE_CERT="/tmp/$RANDOM-kubecfg.crt"
   export KUBE_KEY="/tmp/$RANDOM-kubecfg.key"
   export CA_CERT="/tmp/$RANDOM-kubernetes.ca.crt"
diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh
index 662ab3861c9..6044b54f546 100755
--- a/hack/ginkgo-e2e.sh
+++ b/hack/ginkgo-e2e.sh
@@ -87,15 +87,7 @@ if [[ -z "${AUTH_CONFIG:-}" ]];  then
 
     detect-master >/dev/null
 
-
-    if [[ "$KUBERNETES_PROVIDER" == "vagrant" ]]; then
-      # When we are using vagrant it has hard coded auth.  We repeat that here so that
-      # we don't clobber auth that might be used for a publicly facing cluster.
-      auth_config=(
-        "--auth_config=${HOME}/.kubernetes_vagrant_auth"
-        "--kubeconfig=${HOME}/.kubernetes_vagrant_kubeconfig"
-      )
-    elif [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then
+    if [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then
       # GKE stores its own kubeconfig in gcloud's config directory.
       detect-project &> /dev/null
       auth_config=(
@@ -103,25 +95,15 @@ if [[ -z "${AUTH_CONFIG:-}" ]];  then
         # gcloud doesn't set the current-context, so we have to set it
         "--context=gke_${PROJECT}_${ZONE}_${CLUSTER_NAME}"
       )
-    elif [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
-      auth_config=(
-        "--kubeconfig=${KUBECONFIG:-$DEFAULT_KUBECONFIG}"
-      )
-    elif [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
-      auth_config=(
-        "--auth_config=${HOME}/.kube/${INSTANCE_PREFIX}/kubernetes_auth"
-      )
-    elif [[ "${KUBERNETES_PROVIDER}" == "libvirt-coreos" ]]; then
-      auth_config=(
-        "--kubeconfig=${HOME}/.kube/.kubeconfig"
-      )
     elif [[ "${KUBERNETES_PROVIDER}" == "conformance_test" ]]; then
       auth_config=(
         "--auth_config=${KUBERNETES_CONFORMANCE_TEST_AUTH_CONFIG:-}"
         "--cert_dir=${KUBERNETES_CONFORMANCE_TEST_CERT_DIR:-}"
       )
     else
-      auth_config=()
+      auth_config=(
+      "--kubeconfig=${KUBECONFIG:-$DEFAULT_KUBECONFIG}"
+    )
     fi
 else
   echo "Conformance Test.  No cloud-provider-specific preparation."