[pull] main from containerd:main#250
Merged
pull[bot] merged 15 commits intomeonBot:mainfrom Feb 21, 2026
Merged
Conversation
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
It's more common for directory-paths to not have a trailing slash; strip
it so that we don't have some double slashes.
Before:
make protos
...
+ protos
(cd api && buf dep update)
(cd api && PATH="/go/src/github.com/containerd/containerd//bin:$PATH" buf generate)
After:
make protos
...
+ protos
(cd api && buf dep update)
(cd api && PATH="/go/src/github.com/containerd/containerd/bin:$PATH" buf generate)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The `go list` command is vendor-aware, and doesn't include the vendor dir;
go list ./... | grep 'vendor'
# (no output)
For the API module, there's no need to grep for `integration` as it does
not have that sub-directory.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Fix some mixed tabs/spaces and indentation level. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
go1.20 and up has a `-C` flag to change to a directory before running commands (see https://go.dev/cl/421436). Documentation is a bit hard to find, and doesn't mention `go mod` subcommands, but can be found in the `go build` help; go help build ... The build flags are shared by the build, clean, get, install, list, run, and test commands: -C dir Change to dir before running the command. Any files named on the command line are interpreted after changing directories. If used, this flag must be the first one in the command line. Update the Makefile to use this option where applicable, so that we can skip some `cd` and sub-shells. Also switch some assignments to use `:=` to evaluate them once. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Michael Zappa <michael.zappa@gmail.com>
Remove image service dependency from podsandbox controller
When users configure a snapshotter in the runtime config (e.g., `plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata.snapshotter`), the CRI image service was not aware of this configuration. This caused images to be pulled with the default snapshotter instead of the runtime-specific one, because the image service's runtimePlatforms map was not populated with these runtime-to-snapshotter mappings. Let's make sure that during the CRI plugin init, we iterate over all the configured runtimes, and propagate any snapshotter configuration to the image service. The issue was found while working on #12835. Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
Make linter for release branches happy
Makefile: assorted cleanups
…pecific-snapshotters-to-image-service cri: propagate runtime-specific snapshotters to image service
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )