Skip to content

[release-26.7] Configure CDI annotation prefixes in toolkit container when CDI is enabled - #3118

Merged
rahulait merged 1 commit into
release-26.7from
backport-3088-to-release-26.7
Oct 23, 2026
Merged

rahulait merged 1 commit into
release-26.7from
backport-3088-to-release-26.7

Conversation

@github-actions

@github-actions github-actions Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

🤖 Automated backport of #3088 to release-26.7

✅ Cherry-pick completed successfully with no conflicts.

Original PR: #3088
Original Author: @cdesiniotis

Cherry-picked commits (1):

  • e616961 Configure CDI annotation prefixes in toolkit container when CDI is enabled

This backport was automatically created by the backport bot.


Devin Review

…abled

This aligns the transformToolkitCtrForCDI() method with the
transformDevicePluginCtrForCDI() to ensure the same prefixes are
configured with both components.

Without explicitly configuring the CDI annotation prefixes in the
toolkit container, the nvidia-ctk-installer was NOT adding these
annotation prefixes to containerd's (or crio's) container_annotations
allowlist. As a consequence, any container annotations set by the
k8s-device-plugin, in its AllocateResponse, were not making it
into the OCI runtime spec for the container.

Signed-off-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
(cherry picked from commit e616961)
@copy-pr-bot

copy-pr-bot Bot commented Oct 23, 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.

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no bugs or issues to report.

Devin Review

@rahulait

Copy link
Copy Markdown
Contributor

/ok to test 626e78e

@coveralls

Copy link
Copy Markdown

Coverage Status

coverage: 39.254% (+0.005%) from 39.249% — backport-3088-to-release-26.7 into release-26.7

@rahulait
rahulait merged commit f77eef8 into release-26.7 Oct 23, 2026
22 checks passed
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.

4 participants