From 48f79cf60005aa349ad69e0b55c8390becebc2f0 Mon Sep 17 00:00:00 2001
From: "Madhusudan.C.S" <madhusudancs@google.com>
Date: Fri, 6 Jan 2017 19:13:59 +0530
Subject: [PATCH] Quote a bash variable, fix a typo and add some additional
 logging.

---
 federation/cluster/common.sh    | 6 ++++--
 test/e2e/framework/framework.go | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
index 3a68d970489..3d09ce7c9a4 100644
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -160,7 +160,7 @@ function create-federation-api-objects {
     gen-kube-basicauth
     export FEDERATION_API_BASIC_AUTH="${KUBE_PASSWORD},${KUBE_USER},admin"
 
-    # Create a kubeconfig with credentails for federation-apiserver. We will
+    # Create a kubeconfig with credentials for federation-apiserver. We will
     # then use this kubeconfig to create a secret which the federation
     # 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.
@@ -203,12 +203,14 @@ function create-federation-api-objects {
     export FEDERATION_ADMISSION_CONTROL="${FEDERATION_ADMISSION_CONTROL:-NamespaceLifecycle}"
 
     for file in federation-etcd-pvc.yaml federation-apiserver-{deployment,secrets}.yaml federation-controller-manager-deployment.yaml; do
+      echo "Creating manifest: ${file}"
+      $template "${manifests_root}/${file}"
       $template "${manifests_root}/${file}" | $host_kubectl create -f -
     done
 
     # Update the users kubeconfig to include federation-apiserver credentials.
     CONTEXT=${FEDERATION_KUBE_CONTEXT} \
-	   KUBE_BEARER_TOKEN="$FEDERATION_API_TOKEN" \
+	   KUBE_BEARER_TOKEN="${FEDERATION_API_TOKEN}" \
            KUBE_USER="${KUBE_USER}" \
            KUBE_PASSWORD="${KUBE_PASSWORD}" \
 	   SECONDARY_KUBECONFIG=true \
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index bc57f5b8647..ede7fd1c4f1 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -751,7 +751,6 @@ func (f *Framework) GetUnderlyingFederatedContexts() []E2EContext {
 	e2eContexts := []E2EContext{}
 	for _, context := range kubeconfig.Contexts {
 		if strings.HasPrefix(context.Name, "federation") && context.Name != federatedKubeContext {
-
 			user := kubeconfig.findUser(context.Context.User)
 			if user == nil {
 				Failf("Could not find user for context %+v", context)