Skip to content

bump containerd/cgroups to v3.1.2 #12579

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

Jump to bottom
Merged
fuweid merged 1 commit into from
Nov 27, 2025
Merged

bump containerd/cgroups to v3.1.2 #12579

fuweid merged 1 commit into from
Nov 27, 2025

Conversation

@akhilerm
Copy link
Member

@akhilerm akhilerm commented Nov 26, 2025

bump containerd/cgroups to fix hugetlb.events parse errors

Fix : #12503

@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Nov 26, 2025
@dosubot dosubot bot added the dependencies Pull requests that update a dependency file label Nov 26, 2025
@akhilerm akhilerm force-pushed the 3.1.2-cgroups-update branch from c9c4898 to 1f77992 Compare November 26, 2025 15:53
@AkihiroSuda AkihiroSuda added cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Nov 26, 2025
@akhilerm
Copy link
Member Author

akhilerm commented Nov 26, 2025

The windows CI failures are related to kubernetes-sigs/cri-tools#1950

@akhilerm
bump containerd/cgroups to v3.1.2
9d357f5 
bump containerd/cgroups to fix hugetlb.events parse errors

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
@akhilerm akhilerm force-pushed the 3.1.2-cgroups-update branch from 1f77992 to 9d357f5 Compare November 27, 2025 04:11
@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Nov 27, 2025
@fuweid fuweid added this pull request to the merge queue Nov 27, 2025
Merged via the queue into containerd:main with commit d8068c0 Nov 27, 2025
52 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Nov 27, 2025
@akhilerm akhilerm deleted the 3.1.2-cgroups-update branch December 1, 2025 03:30
@akhilerm akhilerm mentioned this pull request Dec 1, 2025
Closed
@akhilerm akhilerm added cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch and removed cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Dec 1, 2025
@shanduur shanduur mentioned this pull request Dec 11, 2025
Merged
@austinvazquez
Copy link
Member

austinvazquez commented Dec 11, 2025

/cherry-pick release/2.1

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 11, 2025

@austinvazquez: #12579 failed to apply on top of branch "release/2.1":

Applying: bump containerd/cgroups to v3.1.2
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/containerd/cgroups/v3/cgroup2/utils.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/containerd/cgroups/v3/cgroup2/utils.go
CONFLICT (content): Merge conflict in vendor/github.com/containerd/cgroups/v3/cgroup2/utils.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 bump containerd/cgroups to v3.1.2
Details

In response to this:

/cherry-pick release/2.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

smira added a commit to smira/pkgs that referenced this pull request Dec 11, 2025
@smira
feat: patch containerd 2.2.0 with cgroups fix patch
8c2450a 
See containerd/containerd#12579

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
@smira smira mentioned this pull request Dec 11, 2025
Merged
smira added a commit to smira/pkgs that referenced this pull request Dec 12, 2025
@smira
feat: patch containerd 2.2.0 with cgroups fix patch
b961ff8 
See containerd/containerd#12579

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
smira added a commit to smira/pkgs that referenced this pull request Dec 12, 2025
@smira
fix: patch containerd 2.1.5 with cgroups fix patch
1fc8435 
See containerd/containerd#12579

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
@smira smira mentioned this pull request Dec 12, 2025
Merged
@thaJeztah thaJeztah mentioned this pull request Dec 18, 2025
Merged
@austinvazquez austinvazquez removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels Dec 18, 2025
@austinvazquez
Copy link
Member

austinvazquez commented Dec 18, 2025

I looked into this. The feature which introduced the issue was not present in containerd releases prior to v2.2.0. So removing the cherry pick labels for stable branches before that.

@bernhardkaindl
Copy link

bernhardkaindl commented Dec 18, 2025 •
edited
Loading

(answered by thaJeztah below):

@austinvazquez, v2.2.0 has been picked up by the docker.com repos for Debian, so many people that use somewhat modern Linux 6.x kernels should see this error in their journald logs (my fresh Debian 12 LXC container installed on a fresh, current Proxmox 9.1 host logs them every 30 seconds):

https://download.docker.com/linux/debian/dists/bookworm/pool/stable/amd64/containerd.io_2.2.0-2~debian.12~bookworm_amd64.deb

Would you consier releasing 2.2.1 with this fix so docker.com can update their debian repos to 2.2.1?

@thaJeztah
Copy link
Member

thaJeztah commented Dec 18, 2025

@bernhardkaindl I think it's in progress, but may be waiting for some other changes (not sure);

This was referenced Dec 19, 2025
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@fuweid fuweid fuweid approved these changes

Assignees

No one assigned

Labels

cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch dependencies Pull requests that update a dependency file size/L

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

unable to parse "max 0" as a uint from Cgroup file

8 participants

@akhilerm @austinvazquez @k8s-infra-cherrypick-robot @bernhardkaindl @thaJeztah @AkihiroSuda @fuweid @k8s-ci-robot