From b0ffa8c8f63b753c4188eff625f9dbd6996e24c8 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 6 Aug 2014 18:11:35 -0700 Subject: [PATCH] Set kubelet -address flag to 0.0.0.0 via salt Currently it binds to the eth0 IP only, this includes localhost. The flag default is localhost only, but we need it looser than that. --- cluster/saltbase/salt/kubelet/default | 9 ++++----- cluster/saltbase/salt/kubelet/initd | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 9e5769c6905..d9b05390bf9 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -1,6 +1,6 @@ {% set daemon_args = "$DAEMON_ARGS" %} {% if grains['os_family'] == 'RedHat' %} - {% set daemon_args = "" %} + {% set daemon_args = "" %} {% endif %} {% if grains.etcd_servers is defined %} {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %} @@ -9,10 +9,9 @@ {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %} {% endif %} +{% set hostname_override = "" %} {% if grains.minion_ip is defined %} - {% set address = "-address=" + grains.minion_ip + " -hostname_override=" + grains.minion_ip %} -{% else %} - {% set address = "-address=$HOSTNAME" %} + {% set hostname_override = " -hostname_override=" + grains.minion_ip %} {% endif %} -DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{address}} -config=/etc/kubernetes/manifests" +DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} -config=/etc/kubernetes/manifests" diff --git a/cluster/saltbase/salt/kubelet/initd b/cluster/saltbase/salt/kubelet/initd index 8abf28c530a..1db34ed332f 100644 --- a/cluster/saltbase/salt/kubelet/initd +++ b/cluster/saltbase/salt/kubelet/initd @@ -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/kubelet/data/`hostname`" +DAEMON_ARGS=" -config /etc/kubelet/data/`hostname` -address=0.0.0.0" DAEMON_LOG_FILE=/var/log/$NAME.log PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME