Merge pull request #15287 from ZJU-SEL/fix-ubuntu-upstart-script

cluster/ubuntu/master/init_scripts/flanneld

@@ -69,22 +69,22 @@ case "$1" in
 	start)
 		fail_unless_root
 		log_begin_msg "Starting $FLANNEL_DESC: $BASE"
-        $KUBE_APISERVER_START
+        $FLANNEL_START
 		log_end_msg $?
 		;;
 
 	stop)
 		fail_unless_root
 		log_begin_msg "Stopping $FLANNEL_DESC: $BASE"
-		$KUBE_APISERVER_STOP
+		$FLANNEL_STOP
 		log_end_msg $?
 		;;
 
 	restart | force-reload)
 		fail_unless_root
 		log_begin_msg "Stopping $FLANNEL_DESC: $BASE"
-		$KUBE_APISERVER_STOP
-		$KUBE_APISERVER_START
+		$FLANNEL_STOP
+		$FLANNEL_START
 		log_end_msg $?
 		;;
 

cluster/ubuntu/master/init_scripts/kube-controller-manager

@@ -9,7 +9,7 @@ set -e
 # Should-Stop:        
 # Default-Start:      
 # Default-Stop:       
-# Short-Description:  Start kube-controller-managerservice
+# Short-Description:  Start kube-controller-manager service
 # Description:
 #  http://www.github.com/GoogleCloudPlatform/Kubernetes
 ### END INIT INFO
@@ -59,7 +59,7 @@ KUBE_CONTROLLER_MANAGER_START="start-stop-daemon
 --make-pidfile \
 --pidfile $KUBE_CONTROLLER_MANAGER_PIDFILE \
 -- $KUBE_CONTROLLER_MANAGER_OPTS \
->> "$KUBE_CONTROLLER_MANAGER_LOGFILE" 2>&1
+>> $KUBE_CONTROLLER_MANAGER_LOGFILE 2>&1"
 
 KUBE_CONTROLLER_MANAGER_STOP="start-stop-daemon \
 --stop \

cluster/ubuntu/minion/init_scripts/flanneld

@@ -69,22 +69,22 @@ case "$1" in
 	start)
 		fail_unless_root
 		log_begin_msg "Starting $FLANNEL_DESC: $BASE"
-        $KUBE_APISERVER_START
+        $FLANNEL_START
 		log_end_msg $?
 		;;
 
 	stop)
 		fail_unless_root
 		log_begin_msg "Stopping $FLANNEL_DESC: $BASE"
-		$KUBE_APISERVER_STOP
+		$FLANNEL_STOP
 		log_end_msg $?
 		;;
 
 	restart | force-reload)
 		fail_unless_root
 		log_begin_msg "Stopping $FLANNEL_DESC: $BASE"
-		$KUBE_APISERVER_STOP
-		$KUBE_APISERVER_START
+		$FLANNEL_STOP
+		$FLANNEL_START
 		log_end_msg $?
 		;;