github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #824 from derekwaynecarr/fix_kubelet_in_vagrant_env

Browse Source 
Enforce -address flag is set on all Linux flavors
This commit is contained in:
Tim Hockin 2014-08-07 17:39:02 -07:00
commit b7a8fabb32
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,9 +9,11 @@
{% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %}
{% endif %}
{% set address = "-address=0.0.0.0" %}
{% set config = "-config=/etc/kubernetes/manifests" %}
{% set hostname_override = "" %}
{% if grains.minion_ip is defined %}
{% set hostname_override = " -hostname_override=" + grains.minion_ip %}
{% endif %}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}}"
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} {{address}} {{config}}"

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

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