From 48d7842211d681a82538a3eb93eab349dc20c08f Mon Sep 17 00:00:00 2001
From: "Madhusudan.C.S" <madhusudancs@google.com>
Date: Thu, 16 Feb 2017 13:25:17 -0800
Subject: [PATCH 1/2] Move common global variables to common.sh script that is
 sourced in both federation-up.sh and federation-down.sh.

---
 federation/cluster/common.sh        | 9 +++++++++
 federation/cluster/federation-up.sh | 8 +++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
index 50fe6016804..4bcc151828b 100644
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -54,6 +54,15 @@ KUBE_BUILD_STAGE=${KUBE_BUILD_STAGE:-release-stage}
 
 source "${KUBE_ROOT}/cluster/common.sh"
 
+# kubefed configuration
+FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-e2e-federation}"
+HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-${1}}"
+
+# kube-dns configuration.
+KUBEDNS_CONFIGMAP_NAME="kube-dns"
+KUBEDNS_CONFIGMAP_NAMESPACE = "kube-system"
+KUBEDNS_FEDERATION_FLAG="federations"
+
 host_kubectl="${KUBE_ROOT}/cluster/kubectl.sh --namespace=${FEDERATION_NAMESPACE}"
 
 # required:
diff --git a/federation/cluster/federation-up.sh b/federation/cluster/federation-up.sh
index 46a3271f46e..606ea61cc6c 100755
--- a/federation/cluster/federation-up.sh
+++ b/federation/cluster/federation-up.sh
@@ -29,13 +29,15 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 # For `kube::log::status` function since it already sources
 # "${KUBE_ROOT}/cluster/lib/logging.sh" and DEFAULT_KUBECONFIG
 source "${KUBE_ROOT}/cluster/common.sh"
-# For $FEDERATION_PUSH_REPO_BASE and $FEDERATION_NAMESPACE.
+# For $FEDERATION_KUBE_CONTEXT, $HOST_CLUSTER_CONTEXT,
+# $KUBEDNS_CONFIGMAP_NAME, $KUBEDNS_CONFIGMAP_NAMESPACE and
+# $KUBEDNS_FEDERATION_FLAG.
 source "${KUBE_ROOT}/federation/cluster/common.sh"
 
 FEDERATION_NAME="${FEDERATION_NAME:-e2e-federation}"
-FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-e2e-federation}"
+
 DNS_ZONE_NAME="${FEDERATION_DNS_ZONE_NAME:-}"
-HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-${1}}"
+FEDERATIONS_DOMAIN_MAP="${FEDERATIONS_DOMAIN_MAP:-}"
 
 # get_version returns the version in KUBERNETES_RELEASE or defaults to the
 # value in the federation `versions` file.

From ceb88b3869979b9aade5d4d2a5a45c2efd793336 Mon Sep 17 00:00:00 2001
From: "Madhusudan.C.S" <madhusudancs@google.com>
Date: Thu, 16 Feb 2017 13:26:19 -0800
Subject: [PATCH 2/2] Make join cluster function in federation-up.sh a little
 more succinct.

---
 federation/cluster/common.sh        | 2 +-
 federation/cluster/federation-up.sh | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
index 4bcc151828b..1cc840f6a10 100644
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -60,7 +60,7 @@ HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-${1}}"
 
 # kube-dns configuration.
 KUBEDNS_CONFIGMAP_NAME="kube-dns"
-KUBEDNS_CONFIGMAP_NAMESPACE = "kube-system"
+KUBEDNS_CONFIGMAP_NAMESPACE="kube-system"
 KUBEDNS_FEDERATION_FLAG="federations"
 
 host_kubectl="${KUBE_ROOT}/cluster/kubectl.sh --namespace=${FEDERATION_NAMESPACE}"
diff --git a/federation/cluster/federation-up.sh b/federation/cluster/federation-up.sh
index 606ea61cc6c..22668978496 100755
--- a/federation/cluster/federation-up.sh
+++ b/federation/cluster/federation-up.sh
@@ -87,9 +87,9 @@ function init() {
       --image="${kube_registry}/hyperkube-amd64:${kube_version}"
 }
 
-# join_cluster_to_federation joins the clusters in the local kubeconfig to federation. The clusters
+# join_clusters joins the clusters in the local kubeconfig to federation. The clusters
 # and their kubeconfig entries in the local kubeconfig are created while deploying clusters, i.e. when kube-up is run.
-function join_cluster_to_federation() {
+function join_clusters() {
   for cluster in $("${KUBE_ROOT}/cluster/kubectl.sh" config get-clusters |sed -n '1!p'); do
     # Skip federation context
     if [[ "${cluster}" == "${FEDERATION_NAME}" ]]; then
@@ -114,8 +114,7 @@ USE_KUBEFED="${USE_KUBEFED:-}"
 
 if [[ "${USE_KUBEFED}" == "true" ]]; then
   init
-
-  join_cluster_to_federation
+  join_clusters
 else
   export FEDERATION_IMAGE_TAG="$(get_version)"
   create-federation-api-objects