From 5af5378fce5824fa5eb8b4e07d299d1117429c1f Mon Sep 17 00:00:00 2001
From: "Madhusudan.C.S" <madhusudancs@google.com>
Date: Wed, 5 Apr 2017 16:36:42 -0700
Subject: [PATCH] Default FEDERATION_KUBE_CONTEXT to FEDERATION_NAME in
 federation e2e up/down scripts.

This is consistent with how kubefed creates kubeconfig contexts.
---
 federation/cluster/common.sh        | 2 +-
 federation/cluster/federation-up.sh | 2 +-
 hack/federated-ginkgo-e2e.sh        | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
index 3d4755062d..e62e8a7d36 100644
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -24,7 +24,7 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
 # kubefed configuration
 FEDERATION_NAME="${FEDERATION_NAME:-e2e-federation}"
 FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation-system}
-FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-e2e-federation}"
+FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-${FEDERATION_NAME}}"
 HOST_CLUSTER_ZONE="${FEDERATION_HOST_CLUSTER_ZONE:-}"
 # If $HOST_CLUSTER_ZONE isn't specified, arbitrarily choose
 # last zone as the host cluster zone.
diff --git a/federation/cluster/federation-up.sh b/federation/cluster/federation-up.sh
index 56158aacd9..a75493b4b1 100755
--- a/federation/cluster/federation-up.sh
+++ b/federation/cluster/federation-up.sh
@@ -108,7 +108,7 @@ function join_clusters() {
         "${context}" \
         --federation-system-namespace=${FEDERATION_NAMESPACE} \
         --host-cluster-context="${HOST_CLUSTER_CONTEXT}" \
-        --context="${FEDERATION_NAME}" \
+        --context="${FEDERATION_KUBE_CONTEXT}" \
         --secret-name="${context//_/-}"    # Replace "_" by "-"
   done
 }
diff --git a/hack/federated-ginkgo-e2e.sh b/hack/federated-ginkgo-e2e.sh
index 611b42410d..09478a9f3c 100755
--- a/hack/federated-ginkgo-e2e.sh
+++ b/hack/federated-ginkgo-e2e.sh
@@ -21,10 +21,14 @@ set -o pipefail
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 
 source "${KUBE_ROOT}/cluster/kube-util.sh"
+source "${KUBE_ROOT}/federation/cluster/common.sh"
 
 : "${FEDERATION_HOST_CLUSTER_ZONE?Must set FEDERATION_HOST_CLUSTER_ZONE env var}"
 
 (
     set-federation-zone-vars "${FEDERATION_HOST_CLUSTER_ZONE}"
+    # Export FEDERATION_KUBE_CONTEXT to ensure that it is available to
+    # ginkgo-e2e.sh and is thus passed on to the federation tests.
+    export FEDERATION_KUBE_CONTEXT
     "${KUBE_ROOT}/hack/ginkgo-e2e.sh" $@
 )