Skip to content

Conversation

@lsm5
Copy link
Member

@lsm5 lsm5 commented Oct 24, 2025

Following up on review comments in #387 . Reattempting with finer commits for easier review.

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

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

@lsm5 lsm5 changed the title common: remove cgv1 (reattempt with finer commits) [WIP] common: remove cgv1 (reattempt with finer commits) Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
@lsm5 lsm5 force-pushed the podman6-no-cgv1-new branch from e82ef0f to c69aaf4 Compare October 24, 2025 19:22
@packit-as-a-service
Copy link

Packit jobs failed. @containers/packit-build please check.

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
@lsm5 lsm5 force-pushed the podman6-no-cgv1-new branch from 1c21882 to 453e6e8 Compare October 24, 2025 21:43
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
@lsm5 lsm5 force-pushed the podman6-no-cgv1-new branch from 9002044 to 7cf077c Compare October 24, 2025 22:34
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
@lsm5 lsm5 force-pushed the podman6-no-cgv1-new branch from 7cf077c to c30076c Compare October 24, 2025 23:00
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025
@lsm5
Copy link
Member Author

lsm5 commented Oct 24, 2025

@Luap99 @mtrmac PTAL. Smaller commits so should be hopefully easier to review.

I haven't removed any of the IsCgroup2UnifiedMode calls where there were error checks. Only assumed the bool to be true there, and removed the cgv1 parts.

Unless there are any critical blockers like some change being obviously wrong or some cgv1 logic still present and open to being called, I'd prefer to leave any cleanups / simplifications for followup.

@lsm5 lsm5 marked this pull request as ready for review October 24, 2025 23:25
@lsm5
Copy link
Member Author

lsm5 commented Oct 24, 2025

should obsolete #387

@lsm5 lsm5 changed the title [WIP] common: remove cgv1 (reattempt with finer commits) common: remove cgv1 (reattempt with finer commits) Oct 25, 2025
lsm5 added 2 commits October 25, 2025 09:27
Replace with cgroups.IsCgroup2UnifiedMode.

Signed-off-by: Lokesh Mandvekar <[email protected]>
And all the cgroup v1 logic that relied on the cgroup2 bool

Signed-off-by: Lokesh Mandvekar <[email protected]>
lsm5 added 9 commits October 25, 2025 09:27
- exclude param from getAvailableControllers
- cgroupV1GetAllSubsystems
- CgroupControl.createGroupDirectory
- readAcct
- readAcctList

Signed-off-by: Lokesh Mandvekar <[email protected]>
Also inline some struct element values with constant values

Signed-off-by: Lokesh Mandvekar <[email protected]>
I can only see it being called in libpod/oci_conmon_linux.go that too
when CgroupManager is not systemd, so it should be safe to remove.

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the podman6-no-cgv1-new branch from df3ce3a to 26e4421 Compare October 25, 2025 13:30
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 25, 2025
podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 25, 2025
@lsm5 lsm5 changed the title common: remove cgv1 (reattempt with finer commits) common: remove cgv1 for podman6 (reattempt with finer commits) Oct 25, 2025
@lsm5 lsm5 changed the title common: remove cgv1 for podman6 (reattempt with finer commits) common: remove cgv1 for podman6 Oct 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

common Related to "common" package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants