From 384ba18c003c9787a31049d6ca4ced7adf2a01ee Mon Sep 17 00:00:00 2001
From: Zhang Yong <npu21@163.com>
Date: Fri, 30 Oct 2020 09:25:17 +0800
Subject: [PATCH] update containerd systemd configuration

---
 .../container-runtimes.md                     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/content/zh/docs/setup/production-environment/container-runtimes.md b/content/zh/docs/setup/production-environment/container-runtimes.md
index 500ea95345..fc4494cf73 100644
--- a/content/zh/docs/setup/production-environment/container-runtimes.md
+++ b/content/zh/docs/setup/production-environment/container-runtimes.md
@@ -877,9 +877,16 @@ Start-Service containerd
 
 <!--
 ```shell
-### systemd
-
-To use the `systemd` cgroup driver, set `plugins.cri.systemd_cgroup = true` in `/etc/containerd/config.toml`.
+### systemd {#containerd-systemd}
+    
+    To use the `systemd` cgroup driver in `/etc/containerd/config.toml` with `runc`, set
+    
+    ```
+    [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+      ...
+      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+        SystemdCgroup = true
+    ```
 When using kubeadm, manually configure the
 [cgroup driver for kubelet](/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#configure-cgroup-driver-used-by-kubelet-on-master-node)
 
@@ -888,12 +895,14 @@ When using kubeadm, manually configure the
 Refer to the [Frakti QuickStart guide](https://github.com/kubernetes/frakti#quickstart) for more information.
 ```
 -->
-### systemd
+### systemd {#containerd-systemd}
 
 使用 `systemd` cgroup 驱动，在 `/etc/containerd/config.toml` 中设置 
 ```
-[plugins.cri]
-systemd_cgroup = true
+ [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+      ...
+      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+        SystemdCgroup = true
 ```
 当使用 kubeadm 时，请手动配置
 [kubelet 的 cgroup 驱动](/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#configure-cgroup-driver-used-by-kubelet-on-master-node)