From 18425172e56609e931714534372e7c7348a5e35c Mon Sep 17 00:00:00 2001
From: nikhiljindal <nikhiljindal@google.com>
Date: Sun, 12 Jun 2016 20:58:24 -0700
Subject: [PATCH] Updating federation up scripts to work in non e2e setup

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

diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
index e836f84088e..49f5f975b65 100644
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -46,7 +46,7 @@ if [[ -z "${FEDERATION_PUSH_REPO_BASE}" ]]; then
 fi
 
 FEDERATION_IMAGE_REPO_BASE=${FEDERATION_IMAGE_REPO_BASE:-'gcr.io/google_containers'}
-FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation-e2e}
+FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation}
 
 KUBE_PLATFORM=${KUBE_PLATFORM:-linux}
 KUBE_ARCH=${KUBE_ARCH:-amd64}
@@ -98,7 +98,7 @@ function create-federation-api-objects {
 
     FEDERATION_KUBECONFIG_PATH="${KUBE_ROOT}/federation/cluster/kubeconfig"
 
-    federation_kubectl="${KUBE_ROOT}/cluster/kubectl.sh --context=federated-cluster --namespace=default"
+    federation_kubectl="${KUBE_ROOT}/cluster/kubectl.sh --context=federation-cluster --namespace=default"
 
     manifests_root="${KUBE_ROOT}/federation/manifests/"
 
@@ -151,7 +151,7 @@ function create-federation-api-objects {
     # controller manager can use to talk to the federation-apiserver.
     # Note that the file name should be "kubeconfig" so that the secret key gets the same name.
     KUBECONFIG_DIR=$(dirname ${KUBECONFIG:-$DEFAULT_KUBECONFIG})
-    CONTEXT=federated-cluster \
+    CONTEXT=federation-cluster \
 	   KUBE_BEARER_TOKEN="$FEDERATION_API_TOKEN" \
            KUBECONFIG="${KUBECONFIG_DIR}/federation/federation-apiserver/kubeconfig" \
 	   create-kubeconfig
@@ -168,7 +168,7 @@ function create-federation-api-objects {
     done
 
     # Update the users kubeconfig to include federation-apiserver credentials.
-    CONTEXT=federated-cluster \
+    CONTEXT=federation-cluster \
 	   KUBE_BEARER_TOKEN="$FEDERATION_API_TOKEN" \
 	   SECONDARY_KUBECONFIG=true \
 	   create-kubeconfig
diff --git a/federation/cluster/federation-up.sh b/federation/cluster/federation-up.sh
index 90c80982302..9599d54e247 100755
--- a/federation/cluster/federation-up.sh
+++ b/federation/cluster/federation-up.sh
@@ -22,4 +22,8 @@ KUBE_ROOT=$(readlink -m $(dirname "${BASH_SOURCE}")/../../)
 
 . ${KUBE_ROOT}/federation/cluster/common.sh
 
+if [[ -f "${KUBE_ROOT}/federation/manifests/federated-image.tag" ]]; then
+    export FEDERATION_IMAGE_TAG="$(cat "${KUBE_ROOT}/federation/manifests/federated-image.tag")"
+fi
+
 create-federation-api-objects
diff --git a/federation/cluster/template.go b/federation/cluster/template.go
index 9c947bc8549..3914cfec0df 100644
--- a/federation/cluster/template.go
+++ b/federation/cluster/template.go
@@ -64,7 +64,7 @@ func main() {
 }
 
 func templateYamlFile(params map[string]string, inpath string, out io.Writer) error {
-	if tmpl, err := template.New(path.Base(inpath)).ParseFiles(inpath); err != nil {
+	if tmpl, err := template.New(path.Base(inpath)).Option("missingkey=zero").ParseFiles(inpath); err != nil {
 		return err
 	} else {
 		if err := tmpl.Execute(out, params); err != nil {