diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml index 8f9790695ce327b47af207779d44ce2d7db03e8b..c8dafd522508bb41e52c4d2fc212350066ca9869 100644 --- a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml +++ b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml @@ -264,15 +264,15 @@ podsecuritypolicy_enabled: false # kubelet_enforce_node_allocatable: pods ## Set runtime and kubelet cgroups when using systemd as cgroup driver (default) -# kubelet_runtime_cgroups: "{{ kube_reserved_cgroups }}/{{ container_manager }}.service" -# kubelet_kubelet_cgroups: "{{ kube_reserved_cgroups }}/kubelet.service" +# kubelet_runtime_cgroups: "/{{ kube_service_cgroups }}/{{ container_manager }}.service" +# kubelet_kubelet_cgroups: "/{{ kube_service_cgroups }}/kubelet.service" ## Set runtime and kubelet cgroups when using cgroupfs as cgroup driver # kubelet_runtime_cgroups_cgroupfs: "/system.slice/{{ container_manager }}.service" # kubelet_kubelet_cgroups_cgroupfs: "/system.slice/kubelet.service" # Optionally reserve this space for kube daemons. -# kube_reserved: true +# kube_reserved: false ## Uncomment to override default values ## The following two items need to be set when kube_reserved is true # kube_reserved_cgroups_for_service_slice: kube.slice diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml index 9e786594f6baaa9ca7aeb77ebf46a150b7244ff4..88278ff1e827e41b2ac7410fd38411e54c5d8015 100644 --- a/roles/kubernetes/node/defaults/main.yml +++ b/roles/kubernetes/node/defaults/main.yml @@ -12,8 +12,9 @@ kube_resolv_conf: "/etc/resolv.conf" kubelet_enforce_node_allocatable: "\"\"" # Set runtime and kubelet cgroups when using systemd as cgroup driver (default) -kubelet_runtime_cgroups: "{{ kube_reserved_cgroups }}/{{ container_manager }}.service" -kubelet_kubelet_cgroups: "{{ kube_reserved_cgroups }}/kubelet.service" +kube_service_cgroups: "{% if kube_reserved %}{{ kube_reserved_cgroups_for_service_slice }}{% else %}system.slice{% endif %}" +kubelet_runtime_cgroups: "/{{ kube_service_cgroups }}/{{ container_manager }}.service" +kubelet_kubelet_cgroups: "/{{ kube_service_cgroups }}/kubelet.service" # Set runtime and kubelet cgroups when using cgroupfs as cgroup driver kubelet_runtime_cgroups_cgroupfs: "/system.slice/{{ container_manager }}.service"