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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Remove Cgroups v1 support (podman6) #6424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,5 @@ require (
sigs.k8s.io/yaml v1.6.0 // indirect
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-20251021180406-fcafd250e223
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +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-20251021180406-fcafd250e223 h1:UEJkMkGL3RzIatWazc5zmLJDuLyw6vdFS/MgIuivgnM=
github.com/lsm5/container-libs/common v0.0.0-20251021180406-fcafd250e223/go.mod h1:aNd2a0S7pY+fx1X5kpQYuF4hbwLU8ZOccuVrhu7h1Xc=
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=
Expand Down Expand Up @@ -317,8 +319,6 @@ go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKr
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
go.podman.io/common v0.66.0 h1:KElE3HKLFdMdJL+jv5ExBiX2Dh4Qcv8ovmzaBGRsyZM=
go.podman.io/common v0.66.0/go.mod h1:aNd2a0S7pY+fx1X5kpQYuF4hbwLU8ZOccuVrhu7h1Xc=
go.podman.io/image/v5 v5.38.0 h1:aUKrCANkPvze1bnhLJsaubcfz0d9v/bSDLnwsXJm6G4=
go.podman.io/image/v5 v5.38.0/go.mod h1:hSIoIUzgBnmc4DjoIdzk63aloqVbD7QXDMkSE/cvG90=
go.podman.io/storage v1.61.0 h1:5hD/oyRYt1f1gxgvect+8syZBQhGhV28dCw2+CZpx0Q=
Expand Down
9 changes: 4 additions & 5 deletions info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Binary file modified internal/mkcw/embed/entrypoint_amd64.gz
View file
Open in desktop
Binary file not shown.
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
123 changes: 30 additions & 93 deletions vendor/go.podman.io/common/pkg/cgroups/blkio_linux.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading