fix: preserve Docker feature flags when enabling CDI - #2049
cdesiniotis merged 1 commit into
Conversation
1f25bcd to
e3184b6
Compare
|
/ok to test e3184b6 |
|
The GitHub Actions runs for current head |
545b7d3 to
b0ee6cd
Compare
|
Signed the previously unsigned commit with my SSH key and pushed it as b0ee6cde. GitHub now reports it as Verified. The code tree, parent commit, author and commit message are unchanged; The new head still needs CI validation through the repository's vetting/approval process. Could you authorize |
|
@git-jxj could you squash your commits to make a more readable git history? Thanks. |
b0ee6cd to
54f6ad1
Compare
|
Squashed the two commits into 54f6ad1f. The PR now contains one SSH-signed commit, which GitHub reports as Verified, with both DCO sign-offs preserved. The code tree is unchanged, including the explanation of the repeated load/enable/save test cycle.
|
|
/ok to test 54f6ad1 |
Coverage Report for CI Build 34665054753Warning Build has drifted: This PR's base is out of sync with its target branch, so coverage data may include unrelated changes. Coverage increased (+0.3%) to 44.322%Details
Uncovered ChangesNo uncovered changes found. Coverage RegressionsNo coverage regressions found. Coverage Stats
💛 - Coveralls |
Use the decoded map type when enabling CDI so existing Docker feature flags survive. Cover file-based configuration updates and repeated load/enable/save cycles to verify idempotency. Signed-off-by: xinjun.jiang <xinjun.jiang@daocloud.io> Signed-off-by: git-jxj <65210887+git-jxj@users.noreply.github.com> Co-authored-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
54f6ad1 to
205c389
Compare
|
/ok to test 205c389 |
|
/cherry-pick release-1.20 |
|
🤖 Backport PR created for |
4 participants
Description
Running
nvidia-ctk runtime configure --runtime=docker --enable-cdiagainst a daemon.json with existing feature flags replaces them with onlycdi: true. For example,containerd-snapshotter: trueandbuildkit: falsedisappear.Docker configuration is decoded into
map[string]any, butEnableCDIasserts the features entry asmap[string]bool. Use the decoded map type so existing settings survive while CDI is enabled.Add file-based tests for missing/empty features, existing true and false flags, CDI already enabled or disabled, and repeated load/update/save operations.
Checklist
make test) — the full suite has the baseline failures described below.make lint)Testing
go test -race ./pkg/config/... ./cmd/nvidia-ctk/runtime/... -count=1passed.make lint: 0 issues.make testhas the same four failing packages and nine failing subtests on unmodified upstream and this branch: installer, installer/toolkit, modifier, and nvcdi. These involve missing test driver libraries and CSV hook expectation differences; the full suite is not reported as passing.