shim: infer SandboxPlatform from OCI spec when not explicitly set#2620
Open
rzlink wants to merge 1 commit intomicrosoft:mainfrom
Open
shim: infer SandboxPlatform from OCI spec when not explicitly set#2620rzlink wants to merge 1 commit intomicrosoft:mainfrom
rzlink wants to merge 1 commit intomicrosoft:mainfrom
Conversation
When runtime options are non-empty (e.g., SandboxIsolation is set) but
SandboxPlatform is empty, infer the platform from the OCI spec rather
than failing validation. This matches the existing behavior when options
are entirely empty.
containerd's default config (config_windows.go) sets SandboxIsolation=1
for the runhcs-wcow-hypervisor runtime handler but omits SandboxPlatform,
making options non-empty with an empty platform string. This causes
platforms.Parse("") to fail with 'invalid runtime sandbox platform'.
The OCI spec already contains sufficient information to determine the
platform: spec.Linux != nil indicates LCOW, while spec.Windows != nil
with spec.Linux == nil indicates WCOW.
Fixes the interaction between containerd's default runtime config and
hcsshim's strict validation added in PR microsoft#2473.
Signed-off-by: Dawei Wei <wei.dawei.cn@gmail.com>
rzlink
force-pushed
the
fix-sandbox-platform-inference
branch
from
25e49d5 to
c53a9dc
Compare
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
3 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.
Summary
Fixes #2619
When containerd's default
runhcs-wcow-hypervisorruntime config setsSandboxIsolation=1withoutSandboxPlatform, the shim options are non-empty butSandboxPlatformis"". The platform validation added in PR #2473 unconditionally callsplatforms.Parse("")which fails, breaking all Hyper-V isolated containers on stock containerd v2.2.1+.Changes
In
createInternal(), when runtime options are non-empty butSandboxPlatformis empty, infer the platform from the OCI spec before validation:oci.IsLCOW(&spec)→"linux/" + runtime.GOARCHoci.IsWCOW(&spec)→"windows/" + runtime.GOARCHThis mirrors the existing behavior when options are entirely empty — the shim already correctly handles platform inference in that code path.
Root Cause
containerd's
config_windows.godefaults:This makes
emptyShimOpts = false(options are non-empty due toSandboxIsolation), butSandboxPlatformis"", causing the validation to fail.Testing
invalid runtime sandbox platform: ""error on every Hyper-V pod[Feature:WindowsHyperVContainers]tests pass with the patched shim