Repository navigation
fix(runtime): preserve config when drop-ins are disabled - #2124
Open
efegokdemir wants to merge 1 commit into
Open
efegokdemir wants to merge 1 commit into
efegokdemir wants to merge 1 commit into
Conversation
Signed-off-by: Efe Gökdemir <gokdemirefe1903@gmail.com>
efegokdemir
requested review from
cdesiniotis,
henry118 and
tariq1890
as code owners
October 7, 2026 05:39
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
Fixes #2123. When
--drop-in-configorRUNTIME_DROP_IN_CONFIGis empty, containerd and CRI-O now update the loaded configuration directly. Previously, both engines still created a drop-in-only destination while the CLI or installer wrote to the top-level config path, which could overwrite existing runtime settings or leave the NVIDIA runtime missing.CRI-O cleanup continues to use its explicitly loaded top-level destination when removing the NVIDIA runtime. Regression tests cover CLI configuration for both engines, installer setup for both engines, and CRI-O cleanup with distinct source and destination configs.
Checklist
make test)make lint) — the full-repository lint reports six existing SA4023 issues incmd/nvidia-cdi-hook/update-ldcache/update-ldcache.goandinternal/ldconfig/ldconfig.go; the same failures reproduce on pristinemain. All changed packages pass targeted lint.Testing
make build— passedmake test— passedgolangci-lint runon the five changed package paths — passed, 0 issuesmake lint— fails on the six unrelated SA4023 findings above; verified on pristine upstreama672e378make fmtandgit diff --check— passeda672e378for both runtimes. CRI-O lost its existingcrundefault, while containerd wrote a self-referential import and omitted the NVIDIA runtime. The same tests pass with this change.