only use fuse-overlayfs if in user namespace

pull/13807/head
Steven Powell 2022-03-23 13:29:57 -07:00
parent a29adcd555
commit 1294c2080b
1 changed files with 4 additions and 2 deletions

View File

@ -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