Merge pull request #27592 from nikhiljindal/fixFedTest

Automatic merge from submit-queue federation: reverse the order of creating controller manager and secret since controller requires secret Ref #26762 federation-controller-manager fails if the secret is not there when it comes up: https://github.com/kubernetes/kubernetes/blob/970104df3199eeb30710d1067da28f952ae36403/federation/cmd/federation-controller-manager/app/controllermanager.go#L82. Updating the bring up scripts to first create the secrets and then create the deployments. @kubernetes/sig-cluster-federation @mml

Merge pull request #27592 from nikhiljindal/fixFedTest
c3a32410 · k8s-merge-robot · GitHub · 9f607c52 · 71e1fea2 · c3a32410
Commit c3a32410 authored Jun 17, 2016 by k8s-merge-robot Committed by GitHub Jun 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

common.sh federation/cluster/common.sh +3 -3

No files found.
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -145,9 +145,6 @@ function create-federation-api-objects {
    FEDERATION_API_TOKEN="$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null)"
    export FEDERATION_API_KNOWN_TOKENS="${FEDERATION_API_TOKEN},admin,admin"

-    $template "${manifests_root}/federation-apiserver-"{deployment,secrets}".yaml" | $host_kubectl create -f -
-    $template "${manifests_root}/federation-controller-manager-deployment.yaml" | $host_kubectl create -f -
-
    # Create a kubeconfig with credentails 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.
@@ -169,6 +166,9 @@ function create-federation-api-objects {
      $host_kubectl create secret generic ${name} --from-file="${dir}/kubeconfig" --namespace="${FEDERATION_NAMESPACE}"
    done

+    $template "${manifests_root}/federation-apiserver-"{deployment,secrets}".yaml" | $host_kubectl create -f -
+    $template "${manifests_root}/federation-controller-manager-deployment.yaml" | $host_kubectl create -f -
+
    # Update the users kubeconfig to include federation-apiserver credentials.
    CONTEXT=federation-cluster \
 	   KUBE_BEARER_TOKEN="$FEDERATION_API_TOKEN" \