From cf06dc19ef0bb2047934aed2fb83b43bf745fa8e Mon Sep 17 00:00:00 2001
From: shashidharatd <shashidhara.td@huawei.com>
Date: Mon, 18 Sep 2017 07:26:05 +0530
Subject: [PATCH] Remove unnecessarily included scripts in federation
 deployment scripts

---
 federation/cluster/common.sh        | 8 ++++----
 federation/cluster/federation-up.sh | 3 ---
 federation/cluster/upgrade.sh       | 3 ---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
index 044a0efa6a9..dba2354b4df 100644
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -17,10 +17,12 @@
 
 : "${KUBE_ROOT?Must set KUBE_ROOT env var}"
 
-# Provides the $KUBERNETES_PROVIDER, kubeconfig-federation-context()
-# and detect-project function
+# Provides the kubeconfig-federation-context() function
 source "${KUBE_ROOT}/cluster/kube-util.sh"
 
+# For `kube::log::status` function
+source "${KUBE_ROOT}/cluster/lib/logging.sh"
+
 # kubefed configuration
 FEDERATION_NAME="${FEDERATION_NAME:-e2e-federation}"
 FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation-system}
@@ -65,8 +67,6 @@ function federation_cluster_contexts() {
 }
 
 
-source "${KUBE_ROOT}/cluster/common.sh"
-
 host_kubectl="${KUBE_ROOT}/cluster/kubectl.sh --namespace=${FEDERATION_NAMESPACE}"
 
 function cleanup-federation-api-objects {
diff --git a/federation/cluster/federation-up.sh b/federation/cluster/federation-up.sh
index 7801e18749a..47f985732c5 100755
--- a/federation/cluster/federation-up.sh
+++ b/federation/cluster/federation-up.sh
@@ -26,9 +26,6 @@ set -o pipefail
 
 
 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_NAME, $FEDERATION_NAMESPACE, $FEDERATION_KUBE_CONTEXT,
 # $HOST_CLUSTER_CONTEXT and $FEDERATION_USE_PV_FOR_ETCD.
 source "${KUBE_ROOT}/federation/cluster/common.sh"
diff --git a/federation/cluster/upgrade.sh b/federation/cluster/upgrade.sh
index 81755aed808..cf8a66b561c 100755
--- a/federation/cluster/upgrade.sh
+++ b/federation/cluster/upgrade.sh
@@ -19,9 +19,6 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
-# For `kube::log::status` function since it already sources
-# "${KUBE_ROOT}/cluster/lib/logging.sh"
-source "${KUBE_ROOT}/cluster/common.sh"
 # For $FEDERATION_NAME, $FEDERATION_NAMESPACE, $HOST_CLUSTER_CONTEXT,
 source "${KUBE_ROOT}/federation/cluster/common.sh"