Merge pull request #36483 from nikhiljindal/fedE2e

Automatic merge from submit-queue Fixing script to bring up federation control plane Fixes https://github.com/kubernetes/kubernetes/issues/36287 Adding a wait to check if load balancer status is set before checking the ingress field. cc @kubernetes/sig-cluster-federation

Merge pull request #36483 from nikhiljindal/fedE2e
8b5264e0 · Kubernetes Submit Queue · GitHub · 06fa13ef · a519506c · 8b5264e0
Commit 8b5264e0 authored Nov 09, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 09, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

common.sh federation/cluster/common.sh +7 -0

federation-controller-manager-deployment.yaml ...n/manifests/federation-controller-manager-deployment.yaml +1 -1

No files found.
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -129,6 +129,13 @@ function create-federation-api-objects {
 	$template "${manifests_root}/federation-apiserver-lb-service.yaml" | $host_kubectl create -f -
 	for i in {1..30};do
 	    echo "attempting to get federation-apiserver loadbalancer hostname ($i / 30)"
+	    LB_STATUS=`${host_kubectl} get -o=jsonpath svc/${FEDERATION_APISERVER_DEPLOYMENT_NAME} --template '{.status.loadBalancer}'`
+	    # Check if ingress field has been set in load balancer status.
+	    if [[ "${LB_STATUS}" != *"ingress"* ]]; then
+	        echo "Waiting for load balancer status to be set"
+	        sleep 5
+	        continue
+	    fi
 	    for field in ip hostname;do
 		FEDERATION_API_HOST=`${host_kubectl} get -o=jsonpath svc/${FEDERATION_APISERVER_DEPLOYMENT_NAME} --template '{.status.loadBalancer.ingress[*].'"${field}}"`
 		if [[ ! -z "${FEDERATION_API_HOST// }" ]];then

--- a/federation/manifests/federation-controller-manager-deployment.yaml
+++ b/federation/manifests/federation-controller-manager-deployment.yaml
@@ -28,7 +28,7 @@ spec:
          mountPath: /etc/ssl/certs
        - name: kubeconfig
          readOnly: true
-          mountPath: "/etc/federation/controller-manager",
+          mountPath: "/etc/federation/controller-manager"
        image: {{.FEDERATION_CONTROLLER_MANAGER_IMAGE_REPO}}:{{.FEDERATION_CONTROLLER_MANAGER_IMAGE_TAG}}
        command:
        - /usr/local/bin/hyperkube