Fix updated runc dep breaking pod devices cgroup

mheon · mheon · commit 6a727fdbee5d · 2024-02-02T09:15:35.000-05:00
The update to runc broke creation of devices for containers in
the pod cgroup. We don't support the device cgroup for pods at
present, so just disable it for now, resolving the issue.

Thanks to Giuseppe for finding this one!

[NO NEW TESTS NEEDED] This is a fix for broken tests

Signed-off-by: Matt Heon &lt;mheon@redhat.com&gt;
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go
@@ -41,6 +41,7 @@ func (r *Runtime) platformMakePod(pod *Pod, resourceLimits *spec.LinuxResources)
 						if err != nil {
 							return "", err
 						}
+						res.SkipDevices = true
 						// Need to both create and update the cgroup
 						// rather than create a new path in c/common for pod cgroup creation
 						// just create as if it is a ctr and then update figures out that we need to

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ func (r Runtime) platformMakePod(pod Pod, resourceLimits *spec.LinuxResources)`
`41`	`41`	`if err != nil {`
`42`	`42`	`return "", err`
`43`	`43`	`}`
	`44`	`+ res.SkipDevices = true`
`44`	`45`	`// Need to both create and update the cgroup`
`45`	`46`	`// rather than create a new path in c/common for pod cgroup creation`
`46`	`47`	`// just create as if it is a ctr and then update figures out that we need to`