From 5184b4008647c3432d6d2bae10f76566215281e6 Mon Sep 17 00:00:00 2001 From: gmarek Date: Fri, 16 Oct 2015 16:00:03 +0200 Subject: [PATCH] API server now must be started before controller-manager. Fix this in Kubemark startup script --- test/kubemark/start-kubemark-master.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/kubemark/start-kubemark-master.sh b/test/kubemark/start-kubemark-master.sh index ee3c3562810..fbb477ee352 100644 --- a/test/kubemark/start-kubemark-master.sh +++ b/test/kubemark/start-kubemark-master.sh @@ -32,8 +32,6 @@ ulimit -n 65536 tar xzf kubernetes-server-linux-amd64.tar.gz -kubernetes/server/bin/kube-controller-manager --master=127.0.0.1:8080 --service-account-private-key-file=/srv/kubernetes/server.key --root-ca-file=/srv/kubernetes/ca.crt --v=2 &> /var/log/kube-controller-manager.log & - kubernetes/server/bin/kube-scheduler --master=127.0.0.1:8080 --v=2 &> /var/log/kube-scheduler.log & kubernetes/server/bin/kube-apiserver \ @@ -50,4 +48,10 @@ kubernetes/server/bin/kube-apiserver \ --secure-port=443 \ --basic-auth-file=/srv/kubernetes/basic_auth.csv &> /var/log/kube-apiserver.log & +# kube-contoller-manager now needs running kube-api server to actually start +until [ "$(curl 127.0.0.1:8080/healthz)" == "ok" ]; do + sleep 1 +done +kubernetes/server/bin/kube-controller-manager --master=127.0.0.1:8080 --service-account-private-key-file=/srv/kubernetes/server.key --root-ca-file=/srv/kubernetes/ca.crt --v=2 &> /var/log/kube-controller-manager.log & + rm -rf kubernetes