Merge pull request containerd#9169 from AkihiroSuda/cherrypick-9158-1.6

[release/1.6] cri: stop recommending disable_cgroup
Kern-- · Oct 6, 2023 · 4908fef · 4908fef
2 parents 4845c1d + 7a0c8b6
commit 4908fef
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/cri/server/service_linux.go b/pkg/cri/server/service_linux.go
@@ -33,8 +33,8 @@ const networkAttachCount = 2
 // initPlatform handles linux specific initialization for the CRI service.
 func (c *criService) initPlatform() (err error) {
 	if userns.RunningInUserNS() {
-		if !(c.config.DisableCgroup && !c.apparmorEnabled() && c.config.RestrictOOMScoreAdj) {
-			logrus.Warn("Running containerd in a user namespace typically requires disable_cgroup, disable_apparmor, restrict_oom_score_adj set to be true")
+		if c.apparmorEnabled() || !c.config.RestrictOOMScoreAdj {
+			logrus.Warn("Running CRI plugin in a user namespace typically requires disable_apparmor and restrict_oom_score_adj to be true")
 		}
 	}