Skip to content

Remove Cgroups v1 support (podman6) #6424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove Cgroups v1 support (podman6) #6424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6716a3d
tests: Remove skips for Cgroups v1
lsm5 Oct 27, 2025
a1e9fc4
info.go: Remove Cgroups v1 logic
lsm5 Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,11 @@ func hostInfo() map[string]any {
info["cpus"] = runtime.NumCPU()
info["rootless"] = unshare.IsRootless()

unified, err := cgroups.IsCgroup2UnifiedMode()
_, err := cgroups.IsCgroup2UnifiedMode()
if err != nil {
logrus.Error(err, "err reading cgroups mode")
}
cgroupVersion := "v1"
ociruntime := util.Runtime()
if unified {
cgroupVersion = "v2"
}
info["CgroupVersion"] = cgroupVersion
info["OCIRuntime"] = ociruntime

mi, err := system.ReadMemInfo()
Expand Down
9 changes: 0 additions & 9 deletions tests/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
##########################
Expand Down
1 change: 0 additions & 1 deletion tests/run.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/tutorial.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down