feat(platform): change runtime cgdriver to systemd (#2029)

tkestack · Jul 25, 2022 · 3ce92b2 · 3ce92b2
1 parent bde64a6
commit 3ce92b2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkg/platform/provider/baremetal/conf/containerd/config.toml b/pkg/platform/provider/baremetal/conf/containerd/config.toml
@@ -17,6 +17,14 @@ state = "/run/containerd"
       conf_dir = "/etc/cni/net.d"
     [plugins."io.containerd.grpc.v1.cri".containerd]
       default_runtime_name="runc"
+
+      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
+
+        [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+          runtime_type = "io.containerd.runc.v2"
+          [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+            SystemdCgroup = true
+
       {{ if .IsGPU}}
       [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
         [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]

diff --git a/pkg/platform/provider/baremetal/conf/docker/daemon.json b/pkg/platform/provider/baremetal/conf/docker/daemon.json
@@ -1,6 +1,7 @@
 {
   "experimental": true,
   "debug": false,
+  "exec-opts": ["native.cgroupdriver=systemd"],
 {{- if .IsGPU }}
   "default-runtime": "nvidia",
   "runtimes": {