Merge pull request #9168 from AkihiroSuda/cherrypick-9158-1.7

fuweid · web-flow · commit c12225c6e0c9 · 2023-10-02T19:37:22.000+08:00
[release/1.7] cri: stop recommending disable_cgroup
diff --git a/pkg/cri/sbserver/service_linux.go b/pkg/cri/sbserver/service_linux.go
@@ -34,8 +34,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")
 		}
 	}
 
diff --git a/pkg/cri/server/service_linux.go b/pkg/cri/server/service_linux.go
@@ -34,8 +34,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")
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ const networkAttachCount = 2`
`34`	`34`	`// initPlatform handles linux specific initialization for the CRI service.`
`35`	`35`	`func (c *criService) initPlatform() (err error) {`
`36`	`36`	`if userns.RunningInUserNS() {`
`37`		`- if !(c.config.DisableCgroup && !c.apparmorEnabled() && c.config.RestrictOOMScoreAdj) {`
`38`		`- logrus.Warn("Running containerd in a user namespace typically requires disable_cgroup, disable_apparmor, restrict_oom_score_adj set to be true")`
	`37`	`+ if c.apparmorEnabled() \|\| !c.config.RestrictOOMScoreAdj {`
	`38`	`+ logrus.Warn("Running CRI plugin in a user namespace typically requires disable_apparmor and restrict_oom_score_adj to be true")`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`