Run kube services under /system.slice

jetstack · Jun 8, 2018 · 867c070 · 867c070
1 parent 1f97e08
commit 867c070
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/puppet/modules/kubernetes/manifests/kubelet.pp b/puppet/modules/kubernetes/manifests/kubelet.pp
@@ -30,12 +30,12 @@
     default  => 'cgroupfs',
   },
   String $cgroup_root = '/',
-  Optional[String] $cgroup_kube_name = '/podruntime.slice',
-  Optional[String] $cgroup_kube_reserved_memory = '256Mi',
-  Optional[String] $cgroup_kube_reserved_cpu = '10m',
+  Optional[String] $cgroup_kube_name = undef,
+  Optional[String] $cgroup_kube_reserved_memory = '',
+  Optional[String] $cgroup_kube_reserved_cpu = '',
   Optional[String] $cgroup_system_name = '/system.slice',
-  Optional[String] $cgroup_system_reserved_memory = '128Mi',
-  Optional[String] $cgroup_system_reserved_cpu = '10m',
+  Optional[String] $cgroup_system_reserved_memory = '1Gi',
+  Optional[String] $cgroup_system_reserved_cpu = '200m',
   Array[String] $systemd_wants = [],
   Array[String] $systemd_requires = [],
   Array[String] $systemd_after = [],

diff --git a/puppet/modules/kubernetes/templates/kubelet.service.erb b/puppet/modules/kubernetes/templates/kubelet.service.erb
@@ -73,16 +73,16 @@ ExecStart=<%= scope['kubernetes::_dest_dir'] %>/kubelet \
   --cgroup-driver=<%= @cgroup_driver %> \
   --cgroup-root=<%= @cgroup_root %> \
 <% if @cgroup_kube_name -%>
-  --kube-reserved-cgroup=<%= @cgroup_kube_name %> \
-  --runtime-cgroups=<%= @cgroup_kube_name %> \
-  --kubelet-cgroups=<%= @cgroup_kube_name %> \
 <%
     # build kube reserved command line
     @cgroup_kube_reserved = []
     @cgroup_kube_reserved << "cpu=#{@cgroup_kube_reserved_cpu}" unless @cgroup_kube_reserved_cpu.nil? or @cgroup_kube_reserved_cpu == 'nil'
     @cgroup_kube_reserved << "memory=#{@cgroup_kube_reserved_memory}" unless @cgroup_kube_reserved_memory.nil? or @cgroup_kube_reserved_memory == 'nil'
     if @cgroup_kube_reserved.length > 0
 -%>
+  --kube-reserved-cgroup=<%= @cgroup_kube_name %> \
+  --runtime-cgroups=<%= @cgroup_kube_name %> \
+  --kubelet-cgroups=<%= @cgroup_kube_name %> \
   "--kube-reserved=<%= @cgroup_kube_reserved.join(',') %>" \
 <% end -%>
 <% end -%>