Skip to content

[release/2.2] Prepare release notes for v2.2.5#13628

Merged
dmcgowan merged 12 commits into
containerd:release/2.2from
samuelkarp:prepare-2.2.5
Jun 18, 2026
Merged

[release/2.2] Prepare release notes for v2.2.5#13628
dmcgowan merged 12 commits into
containerd:release/2.2from
samuelkarp:prepare-2.2.5

Conversation

@samuelkarp

Copy link
Copy Markdown
Member

containerd 2.2.5

Welcome to the v2.2.5 release of containerd!

The fifth patch release for containerd 2.2 contains various fixes
and updates including security patches.

Security Updates

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

Contributors

  • Samuel Karp
  • Chris Henzie
  • Akihiro Suda
  • Maksym Pavlenko
  • Akhil Mohan
  • Ben Cressey
  • Brian Goff
  • Davanum Srinivas
  • Derek McGowan
  • Sebastiaan van Stijn

Changes

26 commits

  • 269031099 Prepare release notes for v2.2.5
  • ad59aa564 Merge commit from fork
  • 0b4d23690 Merge commit from fork
  • be8460656 cri: filter CDI annotations on checkpoint restore
  • 347240f72 Merge commit from fork
  • cff578841 cri: do not re-tag restored checkpoints
  • 668cf2c2f Merge commit from fork
  • 357652293 cri: make checkpoint restore robust to unexpected archive content
  • d43da05af Merge commit from fork
  • 30708e8d1 Bound user-database file reads in openUserFile
  • 028647ea2 Merge commit from fork
  • b6072a49f Do not propagate reserved labels from image configs
  • vendor: golang.org/x/crypto v0.53.0 (#13607)
    • cfea2c141 [release/2.2] vendor: golang.org/x/crypto v0.53.0
  • update runc binary to v1.3.6 (#13606)
  • update go to 1.26.4/1.25.11 (#13577)
  • Configure udevd children-max for root-test (#13567)
    • 2b7dfbd7f Configure udevd children-max for root-test
  • Clean up disk space in node e2e workflow (#13548)
    • 1500e586f Clean up disk space in node e2e workflow
  • contrib/checkpoint: increase timeouts to 30s (#13460)
    • 9991e944e contrib/checkpoint: increase timeouts to 30s
  • release: don't mark 2.2 releases as latest (#13458)
    • 55a1f85d5 release: don't mark 2.2 releases as latest

Dependency Changes

  • golang.org/x/crypto v0.45.0 -> v0.53.0
  • golang.org/x/mod v0.29.0 -> v0.36.0
  • golang.org/x/net v0.47.0 -> v0.55.0
  • golang.org/x/sync v0.18.0 -> v0.21.0
  • golang.org/x/sys v0.38.0 -> v0.46.0
  • golang.org/x/term v0.37.0 -> v0.44.0
  • golang.org/x/text v0.31.0 -> v0.38.0

Previous release can be found at v2.2.4

Which file should I download?

  • containerd-<VERSION>-<OS>-<ARCH>.tar.gz: ✅Recommended. Dynamically linked with glibc 2.35 (Ubuntu 22.04).
  • containerd-static-<VERSION>-<OS>-<ARCH>.tar.gz: Statically linked. Expected to be used on Linux distributions that do not use glibc >= 2.35. Not position-independent.

In addition to containerd, typically you will have to install runc
and CNI plugins from their official sites too.

See also the Getting Started documentation.

chrishenzie and others added 12 commits May 19, 2026 01:53
openUserFile now stats the opened file, refuses anything that is not a
regular file, and wraps the returned fs.File so reads are capped at
maxUserFileBytes (10 MiB). All callers of openUserFile read either
etc/passwd or etc/group; both are regular files on real systems, well
under the cap.

The cap and the regular-file check together bound parser memory use
when reading user-database files of unexpected shape or size.

Adds tests for the cap and for the non-regular file rejection. The cap
test covers three boundary points: a small pad (trailing entry parsed),
a pad placing the entry's last byte exactly on the cap (still parsed),
and a pad past the cap (read returns an "exceeds" error).

Assisted-by: Antigravity
Signed-off-by: Chris Henzie <[email protected]>
(cherry picked from commit 7b05ec4)
Signed-off-by: Chris Henzie <[email protected]>
Google-Bug-Id: 508657842
Signed-off-by: Samuel Karp <[email protected]>
(cherry picked from commit 0c0918f)
Signed-off-by: Samuel Karp <[email protected]>
Image config labels are copied onto the container by both the CRI
plugin (BuildLabels) and the client's WithImageConfigLabels option
used by `ctr run`. Labels in the containerd.io/* namespace are
interpreted by containerd itself and labels in the io.cri-containerd*
namespace are interpreted by the CRI plugin. An image config is not a
trusted source for labels in either namespace.

Skip labels in both reserved namespaces when copying labels from an
image config to a container, and warn about each label skipped: an
image that tries to set them may be attempting to alter containerd
behavior. Oversized image labels are already skipped this way by
the CRI plugin.

Labels set explicitly by clients, for example via `ctr run --label`
or in the CRI request, are unaffected.

Verified with the CRI plugin and with `ctr run` against an image
whose config carries labels like these: the labels are no longer
present on the created container and a warning is logged for each.

Assisted-by: Claude Code
Signed-off-by: Ben Cressey <[email protected]>
Signed-off-by: Samuel Karp <[email protected]>
(cherry picked from commit 0ec1af4)
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Samuel Karp <[email protected]>
Filter out any annotations on the checkpointed container matching
`cdi.k8s.io/` or exactly `cdi.k8s.io` during restore to prevent
unauthorized device restoration. When an annotation is denied, a warning
log is generated.

Tested by:
* Unit tests for exact matching, prefix boundaries, and metadata merging
* Complete CRI integration and checkpoint restore suite

Assisted-by: Antigravity
Signed-off-by: Samuel Karp <[email protected]>
(cherry picked from commit 861ffc1)
Signed-off-by: Chris Henzie <[email protected]>
The CRI checkpoint restore path unpacked checkpoint archive/OCI image content
directly into the container's persistent state directory and read files such as
container.log back from it with a symlink-following copy. Checkpoint content is
externally provided, so make restore more defensive about what it unpacks and
how it reads those files back.

Behavior changes:

- Only unpack regular files and directories from the checkpoint archive.

- Unpack checkpoint content into a dedicated <state>/ctrd-restore
  subdirectory created fresh rather than into the state dir itself, so
  checkpoint content cannot collide with containerd's own files (e.g.
  the "status" blob). Restore and cleanup operate on that subdir;
  cleanup is now a single RemoveAll of it.

Signed-off-by: Brian Goff <[email protected]>
(cherry picked from commit 8196411)
Signed-off-by: Brian Goff <[email protected]>
@k8s-ci-robot

Copy link
Copy Markdown

Adding label do-not-merge/contains-merge-commits because PR contains merge commits, which are not allowed in this repository.
Use git rebase to reapply your commits on top of the target branch. Detailed instructions for doing so can be found here.

Details

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.

@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Jun 18, 2026
@dmcgowan
dmcgowan merged commit e53c7c1 into containerd:release/2.2 Jun 18, 2026
89 of 90 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Jun 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

8 participants