From 4356cb633d57b6cf2f68498c1e88697202e56f05 Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Wed, 2 Nov 2016 17:36:30 +0100
Subject: [PATCH] Revert "Merge pull request #36065 from
 kubernetes/revert-35918-supervisor"

This reverts commit a4ee3ed026fc9cb63707498d8d480e80ec070d6b, reversing
changes made to 8c90bc35e241564884f02b16ea8ed836013e0b94.
---
 test/kubemark/start-kubemark-master.sh | 41 +++++++++++++++++---------
 test/kubemark/start-kubemark.sh        |  8 +++--
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/test/kubemark/start-kubemark-master.sh b/test/kubemark/start-kubemark-master.sh
index 970e8a6c2ca..0ae028d4ab6 100644
--- a/test/kubemark/start-kubemark-master.sh
+++ b/test/kubemark/start-kubemark-master.sh
@@ -16,6 +16,19 @@
 
 # TODO: figure out how to get etcd tag from some real configuration and put it here.
 
+function write_supervisor_conf() {
+	local name=$1
+	local exec_command=$2
+	cat >>"/etc/supervisor/conf.d/${name}.conf" <<EOF
+[program:${name}]
+command=${exec_command}
+stderr_logfile=/var/log/${name}.log
+stdout_logfile=/var/log/${name}.log
+autorestart=true
+startretries=1000000
+EOF
+}
+
 EVENT_STORE_IP=$1
 EVENT_STORE_URL="http://${EVENT_STORE_IP}:4002"
 NUM_NODES=$2
@@ -111,15 +124,13 @@ retry sudo docker run --net=host \
 	--listen-client-urls=http://0.0.0.0:2379 \
 	--data-dir=/var/etcd/data ${ETCD_QUOTA_BYTES} 1>> /var/log/etcd.log 2>&1"
 
-# Increase the allowed number of open file descriptors
-ulimit -n 65536
+ulimit_command='bash -c "ulimit -n 65536;'
 
+cd /
 tar xzf kubernetes-server-linux-amd64.tar.gz
 
-kubernetes/server/bin/kube-scheduler --master=127.0.0.1:8080 $(cat scheduler_flags) &>> /var/log/kube-scheduler.log &
-
-kubernetes/server/bin/kube-apiserver \
-	--insecure-bind-address=0.0.0.0 \
+write_supervisor_conf "kube-scheduler" "${ulimit_command} /kubernetes/server/bin/kube-scheduler --master=127.0.0.1:8080 $(cat /scheduler_flags | tr '\n' ' ')\""
+write_supervisor_conf "kube-apiserver" "${ulimit_command} /kubernetes/server/bin/kube-apiserver --insecure-bind-address=0.0.0.0 \
 	--etcd-servers=http://127.0.0.1:2379 \
 	--etcd-servers-overrides=/events#${EVENT_STORE_URL} \
 	--tls-cert-file=/srv/kubernetes/server.cert \
@@ -129,14 +140,16 @@ kubernetes/server/bin/kube-apiserver \
 	--secure-port=443 \
 	--basic-auth-file=/srv/kubernetes/basic_auth.csv \
 	--target-ram-mb=$((${NUM_NODES} * 60)) \
-	$(cat apiserver_flags) &>> /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 2> /dev/null)" == "ok" ]; do
-	sleep 1
-done
-kubernetes/server/bin/kube-controller-manager \
+	$(cat /apiserver_flags | tr '\n' ' ')\""
+write_supervisor_conf "kube-contoller-manager" "${ulimit_command} /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 \
-  $(cat controllers_flags) &>> /var/log/kube-controller-manager.log &
+  $(cat /controllers_flags | tr '\n' ' ')\""
+
+supervisorctl reread
+supervisorctl update
+
+until [ "$(curl 127.0.0.1:8080/healthz 2> /dev/null)" == "ok" ]; do
+	sleep 1
+done
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index 4d4bb185d36..a803d3f850d 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -168,11 +168,12 @@ gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
   "${RESOURCE_DIRECTORY}/apiserver_flags" \
   "${RESOURCE_DIRECTORY}/scheduler_flags" \
   "${RESOURCE_DIRECTORY}/controllers_flags" \
-  "${MASTER_NAME}":~
+  "root@${MASTER_NAME}":/
+
 
 gcloud compute ssh "${MASTER_NAME}" --zone="${ZONE}" --project="${PROJECT}" \
-  --command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && \
-             sudo ./start-kubemark-master.sh ${EVENT_STORE_IP:-127.0.0.1} ${NUM_NODES:-0} ${EVENT_PD:-false} ${ETCD_IMAGE:-}"
+  --command="sudo chmod a+x /configure-kubectl.sh && sudo chmod a+x /start-kubemark-master.sh && \
+             sudo /start-kubemark-master.sh ${EVENT_STORE_IP:-127.0.0.1} ${NUM_NODES:-0} ${EVENT_PD:-false} ${ETCD_IMAGE:-}"
 
 # create kubeconfig for Kubelet:
 KUBECONFIG_CONTENTS=$(echo "apiVersion: v1
@@ -301,5 +302,6 @@ until [[ "${ready}" -ge "${NUM_NODES}" ]]; do
 done
 echo ""
 
+echo "Master IP: ${MASTER_IP}"
 echo "Password to kubemark master: ${password}"
 echo "Kubeconfig for kubemark master is written in ${LOCAL_KUBECONFIG}"