github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Remove duplicate -config param

Browse Source 
This is duplicated in cluster/saltbase/salt/kubelet/default
cluster/saltbase/salt/kubelet/initd
This commit is contained in:
Tim Hockin 2014-08-06 10:54:27 -07:00
parent 14c379d27b
commit 7e9c142392
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/kubelet/default
View File

@ -14,4 +14,4 @@
{% set hostname_override = " -hostname_override=" + grains.minion_ip %} {% set hostname_override = " -hostname_override=" + grains.minion_ip %}
{% endif %} {% endif %}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} -config=/etc/kubernetes/manifests" DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}}"

2
cluster/saltbase/salt/kubelet/initd
View File

@ -17,7 +17,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="The Kubernetes container manager" DESC="The Kubernetes container manager"
NAME=kubelet NAME=kubelet
DAEMON=/usr/local/bin/kubelet DAEMON=/usr/local/bin/kubelet
DAEMON_ARGS=" -config /etc/kubelet/data/`hostname` -address=0.0.0.0" DAEMON_ARGS="-config=/etc/kubernetes/manifests -address=0.0.0.0"
DAEMON_LOG_FILE=/var/log/$NAME.log DAEMON_LOG_FILE=/var/log/$NAME.log
PIDFILE=/var/run/$NAME.pid PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME