Remove Cgroups v1 support (podman6)

lsm5 · lsm5 · commit 1c35ea0ae809 · 2025-10-17T10:54:16.000-04:00
Fixes: RUN-3567 (partly)

Signed-off-by: Lokesh Mandvekar &lt;lsm5@redhat.com&gt;
diff --git a/go.mod b/go.mod
@@ -138,4 +138,4 @@ require (
 	tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
 )
 
-replace go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251014193343-b41c3b4c87fd
+replace go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251017145150-d8e5f3a7ff42
diff --git a/go.sum b/go.sum
@@ -152,8 +152,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2TSgRbAhD7yjZzTQmcN25sDRPEeinR51yQ=
 github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk=
-github.com/lsm5/container-libs/common v0.0.0-20251014193343-b41c3b4c87fd h1:l6X4N7DeA7W4h3WTvD6mZzsmYUqSow95XMD7I5apK74=
-github.com/lsm5/container-libs/common v0.0.0-20251014193343-b41c3b4c87fd/go.mod h1:kv0yXx/yrT60lUcVb86hezMGz/lXmyx3epvdFlM9du4=
+github.com/lsm5/container-libs/common v0.0.0-20251017145150-d8e5f3a7ff42 h1:ap41K+m613zPEpoO21W1TP+6vZzKf+tH5oL9CG6NaKc=
+github.com/lsm5/container-libs/common v0.0.0-20251017145150-d8e5f3a7ff42/go.mod h1:kv0yXx/yrT60lUcVb86hezMGz/lXmyx3epvdFlM9du4=
 github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
 github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
diff --git a/info.go b/info.go
@@ -55,12 +55,11 @@ func hostInfo() map[string]any {
 	if err != nil {
 		logrus.Error(err, "err reading cgroups mode")
 	}
-	cgroupVersion := "v1"
-	ociruntime := util.Runtime()
-	if unified {
-		cgroupVersion = "v2"
+	if !unified {
+		logrus.Fatalf("Did not detect Cgroups v2.")
 	}
-	info["CgroupVersion"] = cgroupVersion
+
+	ociruntime := util.Runtime()
 	info["OCIRuntime"] = ociruntime
 
 	mi, err := system.ReadMemInfo()
diff --git a/internal/mkcw/embed/entrypoint_amd64.gz b/internal/mkcw/embed/entrypoint_amd64.gz
diff --git a/tests/helpers.bash b/tests/helpers.bash
@@ -700,15 +700,6 @@ function skip_if_cgroupsv2() {
     fi
 }
 
-#######################
-#  skip_if_cgroupsv1  #  Some tests don't work with cgroupsv1
-#######################
-function skip_if_cgroupsv1() {
-    if ! is_cgroupsv2; then
-        skip "${1:-test does not work with cgroups v1}"
-    fi
-}
-
 ##########################
 #  skip_if_in_container  #
 ##########################
diff --git a/tests/run.bats b/tests/run.bats
@@ -947,7 +947,6 @@ _EOF
 
 @test "rootless on cgroupv2 and systemd runs under user.slice" {
 	skip_if_no_runtime
-	skip_if_cgroupsv1
 	skip_if_in_container
 	skip_if_root_environment
 	if test "$DBUS_SESSION_BUS_ADDRESS" = ""; then
diff --git a/tests/tutorial.bats b/tests/tutorial.bats
@@ -5,7 +5,6 @@ load helpers
 @test "tutorial-cgroups" {
 	# confidence check for the sake of packages that consume our library
 	skip_if_no_runtime
-	skip_if_cgroupsv1
 	skip_if_rootless_environment
 	skip_if_chroot
 
diff --git a/vendor/go.podman.io/common/pkg/cgroups/cgroups_linux.go b/vendor/go.podman.io/common/pkg/cgroups/cgroups_linux.go
diff --git a/vendor/go.podman.io/common/pkg/cgroups/cgroups_unsupported.go b/vendor/go.podman.io/common/pkg/cgroups/cgroups_unsupported.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -464,7 +464,7 @@ go.opentelemetry.io/otel/trace
 go.opentelemetry.io/otel/trace/embedded
 go.opentelemetry.io/otel/trace/internal/telemetry
 go.opentelemetry.io/otel/trace/noop
-# go.podman.io/common v0.65.1-0.20250916163606-92222dcd3da4 => github.com/lsm5/container-libs/common v0.0.0-20251014193343-b41c3b4c87fd
+# go.podman.io/common v0.65.1-0.20250916163606-92222dcd3da4 => github.com/lsm5/container-libs/common v0.0.0-20251017145150-d8e5f3a7ff42
 ## explicit; go 1.24.2
 go.podman.io/common/internal
 go.podman.io/common/internal/attributedstring
@@ -825,4 +825,4 @@ tags.cncf.io/container-device-interface/pkg/parser
 # tags.cncf.io/container-device-interface/specs-go v1.0.0
 ## explicit; go 1.19
 tags.cncf.io/container-device-interface/specs-go
-# go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251014193343-b41c3b4c87fd
+# go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251017145150-d8e5f3a7ff42

Original file line number	Diff line number	Diff line change
`@@ -138,4 +138,4 @@ require (`
`138`	`138`	`tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect`
`139`	`139`	`)`
`140`	`140`
`141`		`-replace go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251014193343-b41c3b4c87fd`
	`141`	`+replace go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251017145150-d8e5f3a7ff42`