Skip to content

chore(deps): upgrade containerd to 2.3.2 - #85

Merged
muchzill4 merged 4 commits into
arm:mainfrom
muchzill4:containerd-upgrade
Jul 13, 2026
Merged

chore(deps): upgrade containerd to 2.3.2#85
muchzill4 merged 4 commits into
arm:mainfrom
muchzill4:containerd-upgrade

Conversation

@muchzill4

@muchzill4 muchzill4 commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Changes

Implements Dependabot PRs that upgrade Containerd:

A simple code change was required to make it work, hence a non-bot PR.

This PR makes the shim work with both Containerd 2.2.x and 2.3.x bootstrap protocols. Former uses cli flags and a bit of RPC, latter goes full RPC.

Our current testing strategy makes it rather convoluted to test against multiple Containerd versions, so this will be tackled separately. For now, shim passes in CI and in LimaVM (2.2.x, until 2.3.x upgrade lands in docker), which proves that nothing has been broken. I've also tested it manually in a VM by overriding Containerd used by docker.

Checklist

  • 🤖 This change is covered by tests as required.
  • 🤹 All required manual testing has been performed.
  • 📖 All documentation updates are complete.

@muchzill4
muchzill4 requested a review from a team as a code owner July 6, 2026 10:46
@muchzill4
muchzill4 marked this pull request as draft July 6, 2026 10:48
@muchzill4
muchzill4 force-pushed the containerd-upgrade branch 2 times, most recently from 5704497 to a300a4c Compare July 9, 2026 08:20
muchzill4 added 3 commits July 9, 2026 09:53
Signed-off-by: Bartek Mucha <bartosz.mucha@arm.com>
Signed-off-by: Bartek Mucha <bartosz.mucha@arm.com>
Signed-off-by: Bartek Mucha <bartosz.mucha@arm.com>
@muchzill4
muchzill4 force-pushed the containerd-upgrade branch from 58f072a to 998e1c7 Compare July 9, 2026 08:53
@muchzill4
muchzill4 marked this pull request as ready for review July 9, 2026 11:31
Comment thread cmd/containerd-shim-remoteproc-v1/start_compat.go
Comment thread cmd/containerd-shim-remoteproc-v1/start_compat.go
Comment thread cmd/containerd-shim-remoteproc-v1/start_compat.go Outdated
Signed-off-by: Bartek Mucha <bartosz.mucha@arm.com>

@yejseo01 yejseo01 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@muchzill4
muchzill4 merged commit 5c2e238 into arm:main Jul 13, 2026
4 of 5 checks passed
Comment thread docs/DEVELOPMENT.md
## Prerequisites

- Go 1.25 or higher
- Go 1.26 or higher

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

As I understand it, we actually have to use the same minimum version as the vendored containerd, which is

Suggested change
- Go 1.26 or higher
- Go 1.26.3 or higher

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.

3 participants