Merge pull request #8869 from mqasimsarfraz/release/1.7

fuweid · web-flow · commit 1b659e7cc650 · 2023-07-27T09:28:38.000+08:00
[release/1.7] cri: memory.memsw.limit_in_bytes: no such file or directory
diff --git a/pkg/cri/opts/spec_linux_opts.go b/pkg/cri/opts/spec_linux_opts.go
@@ -330,7 +330,7 @@ func WithResources(resources *runtime.LinuxContainerResources, tolerateMissingHu
 				s.Linux.Resources.Memory.Swap = &limit
 			}
 		}
-		if swapLimit != 0 {
+		if swapLimit != 0 && SwapControllerAvailable() {
 			s.Linux.Resources.Memory.Swap = &swapLimit
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ func WithResources(resources *runtime.LinuxContainerResources, tolerateMissingHu`
`330`	`330`	`s.Linux.Resources.Memory.Swap = &limit`
`331`	`331`	`}`
`332`	`332`	`}`
`333`		`- if swapLimit != 0 {`
	`333`	`+ if swapLimit != 0 && SwapControllerAvailable() {`
`334`	`334`	`s.Linux.Resources.Memory.Swap = &swapLimit`
`335`	`335`	`}`
`336`	`336`