github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-08 06:03:23 -07:00
commit 30ad675fa1
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/ubuntu/master/init_scripts/flanneld
View File

@ -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 $?
;;

2
cluster/ubuntu/master/init_scripts/kube-controller-manager
View File

@ -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 \

8
cluster/ubuntu/minion/init_scripts/flanneld
View File

@ -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 $?
;;