From 202578ebe5260005bc2071618d57a5aea00c132c Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Tue, 16 Feb 2016 16:08:57 -0800 Subject: [PATCH] enable for *real* new runtime and kubelet cgroup configs in GCE salt configs. Signed-off-by: Vishnu kannan --- cluster/saltbase/salt/kubelet/default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index e92a31a0f9..9c8baa3c5d 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -114,7 +114,7 @@ {% set cgroup_root = "--cgroup-root=/" -%} {% set system_container = "--system-cgroups=/system" -%} {% set runtime_container = "--runtime-cgroups=/docker-daemon" -%} - {% set kubelet_container= "--kubelet-cgroups=/kubelet" -%} + {% set kubelet_container= "--kubelet-cgroups=/kubelet" -%} {% endif %} {% endif -%} {% if grains['oscodename'] == 'vivid' -%} @@ -173,4 +173,4 @@ {% endif -%} # test_args has to be kept at the end, so they'll overwrite any prior configuration -DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{log_level}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{non_masquerade_cidr}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{ master_kubelet_args }} {{cpu_cfs_quota}} {{network_plugin}} {{kubelet_port}} {{experimental_flannel_overlay}} {{ reconcile_cidr_args }} {{ configure_hairpin_mode }} {{enable_custom_metrics}} {{test_args}}" +DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{log_level}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{non_masquerade_cidr}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{ master_kubelet_args }} {{cpu_cfs_quota}} {{network_plugin}} {{kubelet_port}} {{experimental_flannel_overlay}} {{ reconcile_cidr_args }} {{ configure_hairpin_mode }} {{enable_custom_metrics}} {{runtime_container}} {{kubelet_container}} {{test_args}}"