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

Merge pull request #6298 from roberthbailey/kubelet-config

Browse Source 
Remove salt configuration that matches the default settings in the Kubelet.
This commit is contained in:
Dawn Chen 2015-04-01 14:31:31 -07:00
commit ab1a8b1e7c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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}}"

3
cmd/kubelet/app/server.go
View File

@ -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")),