From 70d0235770fb1585023e83120e30fd0fb5477319 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Fri, 22 Sep 2017 13:19:04 +0200 Subject: [PATCH] Set correct kubelet cgroup-driver also for kubeadm deployments This follows pull request #1677, adding the cgroup-driver autodetection also for kubeadm way of deploying. Info about this and the possibility to override is added to the docs. --- docs/vars.md | 3 +++ roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 | 1 + 2 files changed, 4 insertions(+) diff --git a/docs/vars.md b/docs/vars.md index b2b66d3c3..0f794ced1 100644 --- a/docs/vars.md +++ b/docs/vars.md @@ -109,6 +109,9 @@ Stack](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/dns-st dynamic kernel services are needed for mounting persistent volumes into containers. These may not be loaded by preinstall kubernetes processes. For example, ceph and rbd backed volumes. Set this variable to true to let kubelet load kernel modules. +* *kubelet_cgroup_driver* - Allows manual override of the + cgroup-driver option for Kubelet. By default autodetection is used + to match Docker configuration. ##### Custom flags for Kube Components For all kube components, custom flags can be passed in. This allows for edge cases where users need changes to the default deployment that may not be applicable to all deployments. This can be done by providing a list of flags. Example: diff --git a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 index 236b40b5c..bf3bf9dc3 100644 --- a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 +++ b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 @@ -26,6 +26,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" --pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \ --kube-reserved cpu={{ kubelet_cpu_limit }},memory={{ kubelet_memory_limit|regex_replace('Mi', 'M') }} \ --node-status-update-frequency={{ kubelet_status_update_frequency }} \ +--cgroup-driver={{ kubelet_cgroup_driver|default(kubelet_cgroup_driver_detected) }} \ {% endset %} {# DNS settings for kubelet #}