Skip to content

Remove dependency on github.com/opencontainers/runtime-tools - #305

Open
thaJeztah wants to merge 2 commits into
containerd:mainfrom
thaJeztah:rm_runtime_tools
Open

Remove dependency on github.com/opencontainers/runtime-tools#305
thaJeztah wants to merge 2 commits into
containerd:mainfrom
thaJeztah:rm_runtime_tools

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

This copies the implementation that was added in containerd@e01c004 as an internal package, so that we can remove the dependency on the (largely unmaintained) runtime-tools module, including its dependencies.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This copies the implementation that was added in [containerd/nri@e01c004]
as an internal package, so that we can remove the dependency on the
(largely unmaintained) runtime-tools module, including its dependencies.

[containerd/nri@e01c004]: containerd/containerd@e01c004

Co-authored-by: Tianon Gravi <tianon.gravi@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

This PR removes the dependency on github.com/opencontainers/runtime-tools by copying the required OCI spec generator functionality into an internal package, and updating tests and module dependencies accordingly.

Changes:

  • Added an internal OCI spec generator implementation (pkg/runtime-tools/internal/ocigen) that satisfies pkg/runtime-tools/generate.UnderlyingGenerator.
  • Updated the pkg/runtime-tools/generate test suite to use the new internal generator instead of runtime-tools/generate.
  • Removed github.com/opencontainers/runtime-tools (and now-unneeded transitive deps) from go.mod/go.sum.

Reviewed changes

Copilot reviewed 5 out of 6 changed files in this pull request and generated no comments.

Show a summary per file
File Description
pkg/runtime-tools/internal/ocigen/spec_generator.go New internal generator implementing the UnderlyingGenerator interface directly over *specs-go.Spec.
pkg/runtime-tools/generate/helpers_other.go Non-Linux stub signature adjusted while keeping behavior unchanged.
pkg/runtime-tools/generate/generate_suite_test.go Tests updated to use internal/ocigen instead of upstream runtime-tools/generate.
pkg/adaptation/plugin_other.go Non-Linux stub signature adjusted while keeping behavior unchanged.
go.mod Drops the github.com/opencontainers/runtime-tools requirement (and an indirect dep).
go.sum Removes checksums for now-unreferenced transitive dependencies.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@thaJeztah
thaJeztah marked this pull request as ready for review August 12, 2026 00:55
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