From 813138734d347b3d84c527ed135fb37e509983f0 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 7 May 2021 22:24:55 +0900 Subject: [PATCH] containerd: upgrade `io.containerd.runtime.v1.linux` to `io.containerd.runc.v2` To support cgroup v2, the runtime has to be upgraded to `io.containerd.runc.v2`. Also, `io.containerd.runtime.v1.linux` has been deprecated since containerd v1.4. Tested with `--driver=docker`, on Ubuntu 21.04 + Docker 20.10 + cgroup v2. Fix issue 11310 Signed-off-by: Akihiro Suda --- pkg/minikube/cruntime/containerd.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 70ebd3f95e35..ece59ae93478 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -84,11 +84,10 @@ oom_score = 0 max_container_log_line_size = 16384 [plugins.cri.containerd] snapshotter = "overlayfs" - no_pivot = true [plugins.cri.containerd.default_runtime] - runtime_type = "io.containerd.runtime.v1.linux" - runtime_engine = "" - runtime_root = "" + runtime_type = "io.containerd.runc.v2" + [plugins.cri.containerd.default_runtime.options] + NoPivotRoot = true [plugins.cri.containerd.untrusted_workload_runtime] runtime_type = "" runtime_engine = "" @@ -107,12 +106,6 @@ oom_score = 0 {{ end -}} [plugins.diff-service] default = ["walking"] - [plugins.linux] - shim = "containerd-shim" - runtime = "runc" - runtime_root = "" - no_shim = false - shim_debug = false [plugins.scheduler] pause_threshold = 0.02 deletion_threshold = 0