shim: treat non-CRI init as sandbox#13278
Open
Haihan-Jiang wants to merge 1 commit into
Open
Conversation
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
1 participant
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.
Updates #12198.
Summary
Why
Direct containerd callers such as
ctr runand BuildKit do not setio.kubernetes.cri.container-type. The shim already treats missing annotations as sandbox-like in other setup paths, butnewInitonly setp.Sandboxfor an explicit CRI sandbox annotation. That caused non-CRI root containers to skip sandbox IO setup and contributed to non-TTY hangs/no output.Tests
git diff --checkbazel test //pkg/shim/v1/runsc:runsc_test --test_filter=TestNewInitSandboxDefault(fails locally before running tests:/usr/bin/x86_64-linux-gnu-gccis not present for//vdso:vdsoon this macOS host)go test ./pkg/shim/v1/runsc -run TestNewInitSandboxDefault(fails locally before compiling tests because this repo relies on Bazel-generated packages/build constraints under plain Go tooling)