Skip to content

Commit

Permalink
Quote a bash variable, fix a typo and add some additional logging.
Browse files Browse the repository at this point in the history
  • Loading branch information
madhusudancs committed Jan 6, 2017
1 parent 0c81f60 commit 48f79cf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 4 additions & 2 deletions federation/cluster/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion test/e2e/framework/framework.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 48f79cf

Please sign in to comment.