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

Set kubelet -address flag to 0.0.0.0 via salt

Browse Source 
Currently it binds to the eth0 IP only, this includes localhost.  The flag
default is localhost only, but we need it looser than that.
This commit is contained in:
Tim Hockin 2014-08-06 18:11:35 -07:00
parent adc9bb9451
commit b0ffa8c8f6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{% set daemon_args = "$DAEMON_ARGS" %} {% set daemon_args = "$DAEMON_ARGS" %}
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
{% set daemon_args = "" %} {% set daemon_args = "" %}
{% endif %} {% endif %}
{% if grains.etcd_servers is defined %} {% if grains.etcd_servers is defined %}
{% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %} {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %}
@ -9,10 +9,9 @@
{% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %} {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %}
{% endif %} {% endif %}
{% set hostname_override = "" %}
{% if grains.minion_ip is defined %} {% if grains.minion_ip is defined %}
{% set address = "-address=" + grains.minion_ip + " -hostname_override=" + grains.minion_ip %} {% set hostname_override = " -hostname_override=" + grains.minion_ip %}
{% else %}
{% set address = "-address=$HOSTNAME" %}
{% endif %} {% endif %}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{address}} -config=/etc/kubernetes/manifests" DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} -config=/etc/kubernetes/manifests"

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`" DAEMON_ARGS=" -config /etc/kubelet/data/`hostname` -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