Merge pull request #27333 from nikhiljindal/FederationName

Automatic merge from submit-queue federation: setting a default value for FEDERATION_NAME federation tests are failing right now on jenkins: http://kubekins.dls.corp.google.com/view/Critical%20Builds/job/kubernetes-e2e-gce-federation/694/ ``` FEDERATION_NAME environment variable must be set ``` Setting a default value to "federation" cc @kubernetes/sig-cluster-federation @mml
kubernetes · Jun 14, 2016 · 6e5faf5 · 6e5faf5
2 parents 1a23da5 + e0bdb32
commit 6e5faf5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
@@ -93,6 +93,7 @@ function create-federation-api-objects {
     #We will use loadbalancer services where we can
     export FEDERATION_API_NODEPORT=32111
     export FEDERATION_NAMESPACE
+    export FEDERATION_NAME="${FEDERATION_NAME:-federation}"
 
     template="go run ${KUBE_ROOT}/federation/cluster/template.go"