From d1b6761f0a5dbda282ecaae77ec8abbb1dd5470a Mon Sep 17 00:00:00 2001 From: gjmzj Date: Sat, 23 May 2020 17:58:32 +0800 Subject: [PATCH] revert cgroup driver to 'cgroupfs' #848 --- roles/docker/templates/daemon.json.j2 | 2 +- roles/kube-node/templates/kubelet-config.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker/templates/daemon.json.j2 b/roles/docker/templates/daemon.json.j2 index 2484c6b..7b3401b 100644 --- a/roles/docker/templates/daemon.json.j2 +++ b/roles/docker/templates/daemon.json.j2 @@ -1,6 +1,6 @@ { "data-root": "{{ STORAGE_DIR }}", - "exec-opts": ["native.cgroupdriver=systemd"], + "exec-opts": ["native.cgroupdriver=cgroupfs"], {% if ENABLE_MIRROR_REGISTRY %} "registry-mirrors": {{ REG_MIRRORS }}, {% endif %} diff --git a/roles/kube-node/templates/kubelet-config.yaml.j2 b/roles/kube-node/templates/kubelet-config.yaml.j2 index eb5603e..e370083 100644 --- a/roles/kube-node/templates/kubelet-config.yaml.j2 +++ b/roles/kube-node/templates/kubelet-config.yaml.j2 @@ -14,7 +14,7 @@ authorization: webhook: cacheAuthorizedTTL: 5m0s cacheUnauthorizedTTL: 30s -cgroupDriver: systemd +cgroupDriver: cgroupfs cgroupsPerQOS: true clusterDNS: - {{ CLUSTER_DNS_SVC_IP }}