Repository navigation
Conversation
Signed-off-by: xinjun.jiang <xinjun.jiang@daocloud.io>
git-jxj
requested review from
cdesiniotis,
henry118 and
tariq1890
as code owners
October 11, 2026 04:10
Contributor
Author
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
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.
Description
Preserve a shared containerd drop-in import when other matching files remain after removing the NVIDIA runtime. File-loaded installer cleanup currently deletes a top-level config containing only
versionand that glob, so containerd silently stops loading unrelated drop-ins that are still present on disk.Inspect the local drop-in directory before removing the import, including when host and container paths differ. Keep the import when the directory cannot be inspected or the output is stdout. NVIDIA-only cleanup still removes the empty configuration; other import patterns and top-level settings retain their existing behavior.
Closes #2134.
Checklist
make test, throughmake coveragein the CPU environment described below)make lint)Testing
make build,make fmt,make lint,make coverage,make check-vendor,make -C deployments/devel check-modules, andmake check-third-party-notices;go test -race ./pkg/config/engine/containerd -count=1. Go 1.27.1; golangci-lint built from v2.13.1 with the same Go version.container.Options.Unconfigureagainst isolated files and containerd 2.2.1's realconfig dumpparser for versions 2/3 × NVIDIA-only/shared glob/multiple imports/additional settings. Shared settings remain loaded, unrelated drop-in bytes remain identical, and NVIDIA-only cleanup still removes the files.The full unit suite ran in a private child mount namespace with NVML unavailable, matching a CPU CI environment. On this GPU host, the original main branch also fails four unrelated fixture-dependent packages because it discovers the installed driver. The host's NVML library and parent mount namespace were unchanged after testing. Configuration replay used the actual parser without restarting a containerd daemon; GPU workloads were not exercised.