Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkg/api: Copy Unified map #134

Merged
merged 1 commit into from
Jan 30, 2025
Merged

pkg/api: Copy Unified map #134

merged 1 commit into from
Jan 30, 2025

Conversation

champtar
Copy link
Contributor

Both FromOCILinuxResources and FromCRILinuxResources were not copying the Unified map, so NRI plugins don't have access to Unified for both the pod or the container.

Both FromOCILinuxResources and FromCRILinuxResources were not
copying the Unified map, so NRI plugins don't have access
to Unified for both the pod or the container.

Signed-off-by: Etienne Champetier <[email protected]>
@klihub klihub self-requested a review January 21, 2025 08:42
Copy link
Member

@klihub klihub left a comment

Choose a reason for hiding this comment

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

Thank you, champtar ! LGTM.
Tested this with the K8s MemoryQoS feature gate enabled.

@klihub klihub requested a review from fuweid January 30, 2025 15:33
@fuweid fuweid merged commit 848b83a into containerd:main Jan 30, 2025
8 checks passed
@champtar champtar deleted the copy-unified branch January 30, 2025 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants