Merge pull request #7012 from jlowdermilk/export-kubeconfig

cluster/common.sh

@@ -38,7 +38,7 @@ DEFAULT_KUBECONFIG="${HOME}/.kube/config"
 function create-kubeconfig() {
   local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
 
-  KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
+  export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
   # KUBECONFIG determines the file we write to, but it may not exist yet
   if [[ ! -e "${KUBECONFIG}" ]]; then
     mkdir -p $(dirname "${KUBECONFIG}")
@@ -63,7 +63,7 @@ function create-kubeconfig() {
 #   KUBECONFIG
 #   CONTEXT
 function clear-kubeconfig() {
-  KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
+  export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
   local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
   "${kubectl}" config unset "clusters.${CONTEXT}"
   "${kubectl}" config unset "users.${CONTEXT}"
@@ -89,7 +89,7 @@ function clear-kubeconfig() {
 # KUBE_USER,KUBE_PASSWORD will be empty if no current-context is set, or
 # the current-context user does not exist or contain basicauth entries.
 function get-kubeconfig-basicauth() {
-  KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
+  export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
   # Templates to safely extract the username,password for the current-context
   # user.  The long chain of 'with' commands avoids indexing nil if any of the
   # entries ("current-context", "contexts"."current-context", "users", etc)

cluster/gce/util.sh

@@ -837,7 +837,6 @@ function kube-down {
     --quiet \
     "${MASTER_NAME}-ip" || true
 
-  export KUBECONFIG="${HOME}/.kube/.kubeconfig"
   export CONTEXT="${PROJECT}_${INSTANCE_PREFIX}"
   clear-kubeconfig
 }