From 1294c2080b7e6c6342380bd17fc87b5a9302b182 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 23 Mar 2022 13:29:57 -0700 Subject: [PATCH] only use fuse-overlayfs if in user namespace --- pkg/minikube/cruntime/containerd.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 8b8863ec31..819c9dba07 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -142,8 +142,10 @@ func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semve if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*conf_dir = .*$|conf_dir = \"%s\"|' -i %s", cni.ConfDir, containerdConfigFile))); err != nil { return errors.Wrap(err, "update conf_dir") } - if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*snapshotter = \"overlayfs\"|snapshotter = \"fuse-overlayfs\"|' -i %s", containerdConfigFile))); err != nil { - return errors.Wrap(err, "update snapshotter") + if inUserNamespace { + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*snapshotter = \"overlayfs\"|snapshotter = \"fuse-overlayfs\"|' -i %s", containerdConfigFile))); err != nil { + return errors.Wrap(err, "update snapshotter") + } } cPath := containerdImportedConfigFile