diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 7030494a7adaf..3e5183c43306d 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -15,17 +15,12 @@ {% set api_servers = "--api_servers=https://" + ips[0][0] + ":6443" -%} {% 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 -%} -{% set auth_path = "--auth_path=/var/lib/kubelet/kubernetes_auth" -%} - -{% set registry_qps = "--registry_qps=0.1" %} - {% set cluster_dns = "" %} {% set cluster_domain = "" %} {% if pillar.get('enable_cluster_dns', '').lower() == 'true' %} @@ -33,4 +28,4 @@ {% set cluster_domain = "--cluster_domain=" + pillar['dns_domain'] %} {% endif %} -DAEMON_ARGS="{{daemon_args}} {{api_servers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}}" +DAEMON_ARGS="{{daemon_args}} {{api_servers}} {{hostname_override}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}}" diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 53fff33b04a05..e841b1087771e 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -102,7 +102,7 @@ func NewKubeletServer() *KubeletServer { FileCheckFrequency: 20 * time.Second, HTTPCheckFrequency: 20 * time.Second, EnableServer: true, - Address: util.IP(net.ParseIP("127.0.0.1")), + Address: util.IP(net.ParseIP("0.0.0.0")), Port: ports.KubeletPort, PodInfraContainerImage: kubelet.PodInfraContainerImage, RootDirectory: defaultRootDir, @@ -111,6 +111,7 @@ func NewKubeletServer() *KubeletServer { MinimumGCAge: 1 * time.Minute, MaxPerPodContainerCount: 5, MaxContainerCount: 100, + AuthPath: "/var/lib/kubelet/kubernetes_auth", CadvisorPort: 4194, HealthzPort: 10248, HealthzBindAddress: util.IP(net.ParseIP("127.0.0.1")),