Merge pull request #15323 from rhatdan/warn

Don't warn on '/' not being shared while in a container
This commit is contained in:
OpenShift Merge Robot
2022-08-15 18:31:07 +00:00
committed by GitHub

View File

@ -251,20 +251,22 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
return false, 0, nil
}
if mounts, err := pmount.GetMounts(); err == nil {
for _, m := range mounts {
if m.Mountpoint == "/" {
isShared := false
for _, o := range strings.Split(m.Optional, ",") {
if strings.HasPrefix(o, "shared:") {
isShared = true
break
if _, inContainer := os.LookupEnv("container"); !inContainer {
if mounts, err := pmount.GetMounts(); err == nil {
for _, m := range mounts {
if m.Mountpoint == "/" {
isShared := false
for _, o := range strings.Split(m.Optional, ",") {
if strings.HasPrefix(o, "shared:") {
isShared = true
break
}
}
if !isShared {
logrus.Warningf("%q is not a shared mount, this could cause issues or missing mounts with rootless containers", m.Mountpoint)
}
break
}
if !isShared {
logrus.Warningf("%q is not a shared mount, this could cause issues or missing mounts with rootless containers", m.Mountpoint)
}
break
}
}
}