Merge pull request kubernetes#6298 from roberthbailey/kubelet-config

Remove salt configuration that matches the default settings in the Kubelet.
duda · Apr 1, 2015 · ab1a8b1 · ab1a8b1
2 parents 2db427a + 40ebed8
commit ab1a8b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
@@ -15,22 +15,17 @@
   {% 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' %}
   {% set cluster_dns = "--cluster_dns=" + pillar['dns_server'] %}
   {% 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
@@ -97,7 +97,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,
@@ -106,6 +106,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")),