Merge pull request #18338 from deads2k/controller-03-test-cmd-wait

wait for lease acquisition that indicates the controllers and schedul…
openshift · Jan 30, 2018 · 709c3a8 · 709c3a8
2 parents 48a0122 + b083af8
commit 709c3a8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/hack/lib/start.sh b/hack/lib/start.sh
@@ -290,6 +290,11 @@ function os::start::master() {
 	os::cmd::try_until_text "oc get --raw /healthz --as system:unauthenticated --config='${ADMIN_KUBECONFIG}'" 'ok' $(( 160 * second )) 0.25
 	os::cmd::try_until_text "oc get --raw /healthz/ready --as system:unauthenticated --config='${ADMIN_KUBECONFIG}'" 'ok' $(( 160 * second )) 0.25
 	os::cmd::try_until_success "oc get service kubernetes --namespace default --config='${ADMIN_KUBECONFIG}'" $(( 160 * second )) 0.25
+
+	# wait for lease acquisition that indicates the controllers and scheduler have successfully started
+	os::cmd::try_until_success "oc get configmap kube-controller-manager --namespace kube-system --config='${ADMIN_KUBECONFIG}'" $(( 160 * second )) 0.25
+	os::cmd::try_until_success "oc get configmap openshift-master-controllers --namespace kube-system --config='${ADMIN_KUBECONFIG}'" $(( 160 * second )) 0.25
+	os::cmd::try_until_success "oc get configmap kube-scheduler --namespace kube-system --config='${ADMIN_KUBECONFIG}'" $(( 160 * second )) 0.25
 	os::test::junit::declare_suite_end
 
 	os::log::debug "OpenShift server health checks done at: $( date )"