github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30428 from CodeJuan/master

Browse Source 
Automatic merge from submit-queue

fixed typos, the path is not docker



<!-- Reviewable:start -->
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30428)
<!-- Reviewable:end -->
This commit is contained in:
Kubernetes Submit Queue 2016-08-11 10:03:56 -07:00 committed by GitHub
commit 74bf443911
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/ubuntu/master-flannel/init_conf/flanneld.conf
View File

@ -19,7 +19,7 @@ pre-start script
end script
script
# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
# modify these in /etc/default/$UPSTART_JOB (/etc/default/flanneld)
FLANNEL=/opt/bin/$UPSTART_JOB
FLANNEL_OPTS=""
if [ -f /etc/default/$UPSTART_JOB ]; then

2
cluster/ubuntu/master/init_conf/etcd.conf
View File

@ -24,7 +24,7 @@ pre-start script
end script
script
# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
# modify these in /etc/default/$UPSTART_JOB (/etc/default/etcd)
ETCD=/opt/bin/$UPSTART_JOB
ETCD_OPTS=""
if [ -f /etc/default/$UPSTART_JOB ]; then

2
cluster/ubuntu/master/init_conf/kube-apiserver.conf
View File

@ -20,7 +20,7 @@ pre-start script
end script
script
# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
# modify these in /etc/default/$UPSTART_JOB (/etc/default/kube-apiserver)
KUBE_APISERVER=/opt/bin/$UPSTART_JOB
KUBE_APISERVER_OPTS=""
if [ -f /etc/default/$UPSTART_JOB ]; then

2
cluster/ubuntu/master/init_conf/kube-controller-manager.conf
View File

@ -20,7 +20,7 @@ pre-start script
end script
script
# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
# modify these in /etc/default/$UPSTART_JOB (/etc/default/kube-controller-manager)
KUBE_CONTROLLER_MANAGER=/opt/bin/$UPSTART_JOB
KUBE_CONTROLLER_MANAGER_OPTS=""
if [ -f /etc/default/$UPSTART_JOB ]; then

2
cluster/ubuntu/master/init_conf/kube-scheduler.conf
View File

@ -20,7 +20,7 @@ pre-start script
end script
script
# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
# modify these in /etc/default/$UPSTART_JOB (/etc/default/kube-scheduler)
KUBE_SCHEDULER=/opt/bin/$UPSTART_JOB
KUBE_SCHEDULER_OPTS=""
if [ -f /etc/default/$UPSTART_JOB ]; then

2
cluster/ubuntu/minion-flannel/init_conf/flanneld.conf
View File

@ -18,7 +18,7 @@ pre-start script
end script
script
# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
# modify these in /etc/default/$UPSTART_JOB (/etc/default/flanneld)
FLANNEL=/opt/bin/$UPSTART_JOB
FLANNEL_OPTS=""
if [ -f /etc/default/$UPSTART_JOB ]; then

2
cluster/ubuntu/minion/init_conf/kube-proxy.conf
View File

@ -22,7 +22,7 @@ pre-start script
end script
script
# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
# modify these in /etc/default/$UPSTART_JOB (/etc/default/kube-proxy)
KUBE_PROXY=/opt/bin/$UPSTART_JOB
KUBE_PROXY_OPTS=""
if [ -f /etc/default/$UPSTART_JOB ]; then

2
cluster/ubuntu/minion/init_conf/kubelet.conf
View File

@ -20,7 +20,7 @@ pre-start script
end script
script
# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
# modify these in /etc/default/$UPSTART_JOB (/etc/default/kubelet)
KUBELET=/opt/bin/$UPSTART_JOB
KUBELET_OPTS=""
if [ -f /etc/default/$UPSTART_JOB ]; then