From 9fa57e09cf832cc6b14125482a493fc7afe7d91c Mon Sep 17 00:00:00 2001
From: Medya Ghazizadeh <medyagh@users.noreply.github.com>
Date: Tue, 25 May 2021 19:41:10 -0700
Subject: [PATCH] Revert "containerd: upgrade `io.containerd.runtime.v1.linux`
 to `io.containerd.runc.v2` (suppot cgroup v2)"

---
 pkg/minikube/cruntime/containerd.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go
index 02526a49fc..f74646e113 100644
--- a/pkg/minikube/cruntime/containerd.go
+++ b/pkg/minikube/cruntime/containerd.go
@@ -84,10 +84,11 @@ 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.runc.v2"
-        [plugins.cri.containerd.default_runtime.options]
-          NoPivotRoot = true
+        runtime_type = "io.containerd.runtime.v1.linux"
+        runtime_engine = ""
+        runtime_root = ""
       [plugins.cri.containerd.untrusted_workload_runtime]
         runtime_type = ""
         runtime_engine = ""
@@ -106,6 +107,12 @@ 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