diff --git a/docs/vars.md b/docs/vars.md index b2b66d3c396c36679fbe5cada9e9d3b28f42d63e..0f794ced1f40554950978dcd704946c1fd9042f3 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 236b40b5c6b59043cfd66d34d3fe8ca27eeb4848..bf3bf9dc3bd142d4d0dca86693f489edde4b0c59 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 #}