Skip to content

feat: bump containerd to 2.1.3 and update build process#5321

Merged
berkayoz merged 3 commits intomasterfrom
KU-4830/containerd-2
Dec 5, 2025
Merged

feat: bump containerd to 2.1.3 and update build process#5321
berkayoz merged 3 commits intomasterfrom
KU-4830/containerd-2

Conversation

@berkayoz
Copy link
Copy Markdown
Member

@berkayoz berkayoz commented Nov 28, 2025

Summary

This PR updates containerd to version 2.1.3 and bumps the respective runc version. The sideloading patch is updated to work with the v2 codebase.

Testing

Manual testing, checking containerd status and logs for any errors/warnings.
CI suite in this PR.

Possible Regressions

containerd.toml has a new and default format with version=3 which we are currently not utilizing. Older version=2 config files are still supported according to upstream.

Checklist

  • Read the contributions page.
  • Submitted the CLA form, if you are a first time contributor.
  • The introduced changes are covered by unit and/or integration tests.

Notes

@louiseschmidtgen louiseschmidtgen self-requested a review November 28, 2025 09:53
@berkayoz berkayoz marked this pull request as ready for review December 1, 2025 06:38
@berkayoz berkayoz force-pushed the KU-4830/containerd-2 branch from d552ea1 to ab73b57 Compare December 1, 2025 07:51
@berkayoz berkayoz force-pushed the KU-4830/containerd-2 branch from ab73b57 to c6bbf75 Compare December 1, 2025 11:35
@berkayoz berkayoz force-pushed the KU-4830/containerd-2 branch from 403419d to 19b9bba Compare December 3, 2025 09:36
Comment thread snap/snapcraft.yaml
Copy link
Copy Markdown
Contributor

@louiseschmidtgen louiseschmidtgen left a comment

Choose a reason for hiding this comment

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

LGTM, thanks a lot!

@berkayoz berkayoz merged commit 7322e60 into master Dec 5, 2025
23 checks passed
@berkayoz berkayoz deleted the KU-4830/containerd-2 branch December 5, 2025 14:51
HomayoonAlimohammadi pushed a commit that referenced this pull request Dec 18, 2025
* feat: bump containerd to 2.1.3 and update build process

* fix: move ctr flag before args in airgap test

* feat: add erofs-utils for containerd 2 requirement
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants