[release/2.0] Fix issue preventing some v2 shims from shutting down properly#11741
Merged
samuelkarp merged 1 commit intocontainerd:release/2.0from Apr 22, 2025
Merged
Conversation
Signed-off-by: yang yang <[email protected]> (cherry picked from commit 4b4e6f7) Signed-off-by: Samuel Karp <[email protected]>
|
Skipping CI for Draft Pull Request. |
dosubot
Bot
added
area/cri
samuelkarp
added
impact/changelog
do-not-merge/work-in-progress
and removed
area/runtime
mxpv
approved these changes
Apr 22, 2025
Member
|
Can you title this based on the fix? |
dmcgowan
approved these changes
Apr 22, 2025
github-project-automation
Bot
moved this from Needs Reviewers
to Review In Progress
in Pull Request Review
samuelkarp
changed the title
github-project-automation
Bot
moved this from Review In Progress
to Done
in Pull Request Review
This was referenced Apr 23, 2025
hugomoran159
added a commit
to hugomoran159/containerd
that referenced
this pull request
Mar 11, 2026
Don't set sandbox ID on containers when using the internal podsandbox sandboxer. gVisor's shim doesn't implement the Sandbox Manager API, so linking containers to it causes kubelet to detect SandboxChanged and restart pods every ~2 minutes. Cherry-picked from containerd PR containerd#11741 / Talos siderolabs/pkgs#1235. Co-Authored-By: Claude Opus 4.6 <[email protected]>
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
(cherry picked from commit 4b4e6f7)
This is a manual cherry-pick of #11735 since there were merge conflicts. Opening as a draft until #11735 is merged.