Skip to content

[release-1.20] fix: preserve Docker feature flags when enabling CDI - #2094

Merged
cdesiniotis merged 1 commit into
release-1.20from
backport-2049-to-release-1.20
Sep 14, 2026
Merged

cdesiniotis merged 1 commit into
release-1.20from
backport-2049-to-release-1.20

Conversation

@github-actions

Copy link
Copy Markdown

🤖 Automated backport of #2049 to release-1.20

✅ Cherry-pick completed successfully with no conflicts.

Original PR: #2049
Original Author: @git-jxj

Cherry-picked commits (1):

  • 205c389 fix: preserve Docker feature flags when enabling CDI

This backport was automatically created by the backport bot.

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>
(cherry picked from commit 205c389)
@copy-pr-bot

copy-pr-bot Bot commented Sep 14, 2026

Copy link
Copy Markdown

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@cdesiniotis
cdesiniotis merged commit 9207b79 into release-1.20 Sep 14, 2026
6 checks passed
@cdesiniotis
cdesiniotis deleted the backport-2049-to-release-1.20 branch September 14, 2026 18:03
@coveralls

Copy link
Copy Markdown

Coverage Report for CI Build 34875640523

Coverage increased (+0.3%) to 44.357%

Details

  • Coverage increased (+0.3%) from the base build.
  • Patch coverage: 2 of 2 lines across 1 file are fully covered (100%).
  • No coverage regressions found.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

No coverage regressions found.


Coverage Stats

Coverage Status
Relevant Lines: 13529
Covered Lines: 6001
Line Coverage: 44.36%
Coverage Strength: 0.44 hits per line

💛 - Coveralls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants