Remove unnecessarily included scripts in federation deployment scripts

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 {

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"

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"