From 84d3c2041124438320a146851c00d34ec7f76900 Mon Sep 17 00:00:00 2001
From: asilenkov <asilenkov@mirantis.com>
Date: Thu, 4 Aug 2016 19:50:14 +0300
Subject: [PATCH] [Docker] Fix upstart ans sysvinit scripts for ubuntu

 Fix the way hyperkube starts for sysv and upstart

Change-Id: If682033af5f5d58b64cec463d6d379bf79b06c8e
---
 .../package/Resources/scripts/default_scripts/kube-apiserver  | 2 +-
 .../Resources/scripts/default_scripts/kube-controller-manager | 2 +-
 .../package/Resources/scripts/default_scripts/kube-proxy      | 2 +-
 .../package/Resources/scripts/default_scripts/kube-scheduler  | 2 +-
 .../package/Resources/scripts/default_scripts/kubelet         | 2 +-
 .../package/Resources/scripts/init_conf/kube-apiserver.conf   | 4 ++--
 .../Resources/scripts/init_conf/kube-controller-manager.conf  | 4 ++--
 .../package/Resources/scripts/init_conf/kube-proxy.conf       | 4 ++--
 .../package/Resources/scripts/init_conf/kube-scheduler.conf   | 4 ++--
 .../package/Resources/scripts/init_conf/kubelet.conf          | 4 ++--
 .../package/Resources/scripts/initd_scripts/kube-apiserver    | 2 +-
 .../Resources/scripts/initd_scripts/kube-controller-manager   | 2 +-
 .../package/Resources/scripts/initd_scripts/kube-proxy        | 2 +-
 .../package/Resources/scripts/initd_scripts/kube-scheduler    | 2 +-
 .../package/Resources/scripts/initd_scripts/kubelet           | 2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
index 83c318ec..880235f9 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
@@ -1,7 +1,7 @@
 #Kube-Apiserver Upstart and SysVinit configuration file
 
 # Customize kube-apiserver binary location
-KUBE_APISERVER="/opt/bin/hyperkube apiserver"
+KUBE_APISERVER="/opt/bin/hyperkube"
 
 # Use KUBE_APISERVER_OPTS to modify the start/restart options
 KUBE_APISERVER_OPTS="--address=0.0.0.0 \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
index 4e335fe1..47900012 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
@@ -1,7 +1,7 @@
  # Kube-Controller-Manager Upstart and SysVinit configuration file
 
  # Customize kube-controller-manager binary location
- KUBE_CONTROLLER_MANAGER="/opt/bin/hyperkube controller-manager"
+  KUBE_CONTROLLER_MANAGER="/opt/bin/hyperkube"
 
  # Use KUBE_CONTROLLER_MANAGER_OPTS to modify the start/restart options
  KUBE_CONTROLLER_MANAGER_OPTS="--master=127.0.0.1:8080 \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
index 11da8ab4..2ca90532 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
@@ -1,7 +1,7 @@
 # Kube-Proxy Upstart and SysVinit configuration file
 
 # Customize kube-proxy binary location
-KUBE_PROXY="/opt/bin/hyperkube proxy"
+KUBE_PROXY="/opt/bin/hyperkube"
 
 # Use KUBE_PROXY_OPTS to modify the start/restart options
 KUBE_PROXY_OPTS="--logtostderr=false --master=http://%%MASTER_IP%%:8080 --log_dir=/var/log/kubernetes"
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
index 00f52274..2667d46c 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
@@ -1,7 +1,7 @@
 # Kube-Scheduler Upstart and SysVinit configuration file
 
 # Customize kube-apiserver binary location
-KUBE_SCHEDULER="/opt/bin/hyperkube scheduler"
+KUBE_SCHEDULER="/opt/bin/hyperkube"
 
 # Use KUBE_SCHEDULER_OPTS to modify the start/restart options
 KUBE_SCHEDULER_OPTS="--logtostderr=false --log_dir=/var/log/kubernetes \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
index a51bd2bb..057bf75a 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
@@ -1,7 +1,7 @@
 # Kubelet Upstart and SysVinit configuration file
 
 # Customize kubelet binary location
-KUBELET="/opt/bin/hyperkube kubelet"
+KUBELET="/opt/bin/hyperkube"
 
 # Use KUBELET_OPTS to modify the start/restart options
 KUBELET_OPTS="--address=%%IP%% \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
index cb6484a4..7702b5bd 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-start
-    KUBE_APISERVER=/opt/bin/hyperkube apiserver
+    KUBE_APISERVER=/opt/bin/$UPSTART_JOB
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
@@ -26,7 +26,7 @@ script
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
-    exec "$KUBE_APISERVER" $KUBE_APISERVER_OPTS
+    exec $KUBE_APISERVER apiserver $KUBE_APISERVER_OPTS
 end script
 
 start on runlevel [235]
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
index edeb7b96..c7295471 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-ubuntu-start
-    KUBE_CONTROLLER_MANAGER=/opt/bin/hyperkube controller-manager
+    KUBE_CONTROLLER_MANAGER=/opt/bin/$UPSTART_JOB
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
@@ -26,7 +26,7 @@ script
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
-    exec "$KUBE_CONTROLLER_MANAGER" $KUBE_CONTROLLER_MANAGER_OPTS
+    exec $KUBE_CONTROLLER_MANAGER controller-manager $KUBE_CONTROLLER_MANAGER_OPTS
 end script
 
 start on runlevel [235]
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
index dc1f8dff..1a4c1a80 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-start
-    KUBE_PROXY=/opt/bin/hyperkube proxy
+    KUBE_PROXY=/opt/bin/$UPSTART_JOB
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
@@ -26,7 +26,7 @@ script
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
-    exec "$KUBE_PROXY" $KUBE_PROXY_OPTS
+    exec $KUBE_PROXY proxy $KUBE_PROXY_OPTS
 end script
 
 start on runlevel [235]
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
index 0f1d0925..d8fa70b3 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-start
-    KUBE_SCHEDULER=/opt/bin/hyperkube scheduler
+    KUBE_SCHEDULER=/opt/bin/$UPSTART_JOB
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
@@ -26,7 +26,7 @@ script
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
-    exec "$KUBE_SCHEDULER" $KUBE_SCHEDULER_OPTS
+    exec $KUBE_SCHEDULER scheduler $KUBE_SCHEDULER_OPTS
 end script
 
 start on runlevel [235]
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
index 362673b3..1ed11e08 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-ubuntu-start
-    KUBELET=/opt/bin/hyperkube kubelet
+    KUBELET=/opt/bin/$UPSTART_JOB
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
@@ -26,7 +26,7 @@ script
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
-    exec "$KUBELET" $KUBELET_OPTS
+    exec $KUBELET kubelet $KUBELET_OPTS
 end script
 
 start on runlevel [235]
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
index 895e39c0..3baedb8c 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-apiserver)
-KUBE_APISERVER=/opt/bin/hyperkube apiserver
+KUBE_APISERVER="/opt/bin/hyperkube apiserver"
 # This is the pid file managed by kube-apiserver itself
 KUBE_APISERVER_PIDFILE=/var/run/$BASE.pid
 KUBE_APISERVER_LOGFILE=/var/log/$BASE.log
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
index 78f726aa..d9743e64 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-controller-manager)
-KUBE_CONTROLLER_MANAGER=/opt/bin/hyperkube controller-manager
+KUBE_CONTROLLER_MANAGER="/opt/bin/hyperkube controller-manager"
 # This is the pid file managed by kube-controller-manager itself
 KUBE_CONTROLLER_MANAGER_PIDFILE=/var/run/$BASE.pid
 KUBE_CONTROLLER_MANAGER_LOGFILE=/var/log/$BASE.log
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
index c4fae679..c9691e58 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-proxy)
-KUBE_PROXY=/opt/bin/hyperkube proxy
+KUBE_PROXY="/opt/bin/hyperkube proxy"
 # This is the pid file managed by kube-proxy itself
 KUBE_PROXY_PIDFILE=/var/run/$BASE.pid
 KUBE_PROXY_LOGFILE=/var/log/$BASE.log
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
index fe79d6df..75254351 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-scheduler)
-KUBE_SCHEDULER=/opt/bin/hyperkube scheduler
+KUBE_SCHEDULER="/opt/bin/hyperkube scheduler"
 # This is the pid file managed by kube-scheduler itself
 KUBE_SCHEDULER_PIDFILE=/var/run/$BASE.pid
 KUBE_SCHEDULER_LOGFILE=/var/log/$BASE.log
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
index b6382e9f..952490dc 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-apiserver)
-KUBELET=/opt/bin/hyperkube kubelet
+KUBELET="/opt/bin/hyperkube kubelet"
 # This is the pid file managed by kube-apiserver itself
 KUBELET_PIDFILE=/var/run/$BASE.pid
 KUBELET_LOGFILE=/var/log/$BASE.log