Skip to content

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Oct 10, 2025

Resolves: RUN-3567 (partly)

@github-actions github-actions bot added the common Related to "common" package label Oct 10, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 10, 2025
@podmanbot
Copy link

✅ A new PR has been created in buildah to vendor these changes: containers/buildah#6423

@lsm5
Copy link
Member Author

lsm5 commented Oct 10, 2025

@containers/container-libs-maintainers I think it'd be nice to have a podman6 or cgv1 or some such label here as well. Mind creating one please?

@lsm5 lsm5 changed the title common: remove Cgroups v1 support common: remove Cgroups v1 support (podman6) Oct 10, 2025
@lsm5
Copy link
Member Author

lsm5 commented Oct 10, 2025

ah if it's manual merges here, then no need I guess.

@Luap99 Luap99 added the podman 6 breaking changes that should go only into podman 6 only label Oct 10, 2025
@Luap99
Copy link
Member

Luap99 commented Oct 10, 2025

yeah manual merge, keep the PR as draft until we branched.

Still a label to track all the things is still a good idea so I added the "podman 6" label.

Fixes: RUN-3567 (partly)

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 10, 2025
Copy link
Contributor

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know absolutely nothing about the problem space, this is just looking at the diff + immediately surrounding code.

// Load loads an existing cgroup control.
func Load(path string) (*CgroupControl, error) {
cgroup2, err := IsCgroup2UnifiedMode()
_, err := IsCgroup2UnifiedMode()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are several other callers of this, and quite a few code paths that could potentially be deleted if this never returns false, nil. Do we want to update those as well? If not, what’s the exact scope of changes we do want to make?


Assuming we do change all of the callers to expect (_, err) or (true, nil), should wereplace the IsCgroup2UnifiedMode function by a function with some other name (IsProcCgroupMounted???), or perhaps remove it entirely?


But then again, note that non-Linux code is hard-coded to return (false, nil). Is that still what we want?

}
control := &CgroupControl{
cgroup2: cgroup2,
cgroup2: true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Eliminating this field if it is always true would be an intermediate step to removing a fair bit of code.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

common Related to "common" package podman 6 breaking changes that should go only into podman 6 only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants