Merge pull request kubernetes-sigs#540 from codenrhoden/systemd-cgroup

Set systemd cgroup driver for K8s >= 1.21
g-gaston · Mar 9, 2021 · facf334 · facf334
2 parents 1d3ed9d + d7b14e3
commit facf334
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/images/capi/ansible/roles/containerd/templates/etc/containerd/config.toml b/images/capi/ansible/roles/containerd/templates/etc/containerd/config.toml
@@ -37,7 +37,11 @@ version = 2
 [plugins]
   [plugins."io.containerd.grpc.v1.cri"]
     sandbox_image = "{{ containerd_pause_image }}"
+  {% if kubernetes_semver is version('v1.21.0', '>=') %}
+  [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+      SystemdCgroup = true
+  {% endif %}
 
 {% endif %}
-    
+
 {{containerd_additional_settings | b64decode}}