Skip to content

[release/2.1] cri/nri: short-circuit nil adjustment. #12673

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.

Sign up for GitHub

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

Jump to bottom
Merged
mikebrow merged 1 commit into from
Dec 11, 2025
Merged

[release/2.1] cri/nri: short-circuit nil adjustment. #12673

mikebrow merged 1 commit into from
Dec 11, 2025

Conversation

@k8s-infra-cherrypick-robot
Copy link

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot commented Dec 11, 2025

This is an automated cherry-pick of #12574

/assign austinvazquez

@klihub
cri/nri: short-circuit nil adjustment.
2b8e11b 
Skip processing early if we get a nil adjustment from NRI.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Dec 11, 2025
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 11, 2025
Merged
@dosubot dosubot bot added area/cri Container Runtime Interface (CRI) area/nri Node Resource Interface (NRI) labels Dec 11, 2025
mikebrow
mikebrow approved these changes Dec 11, 2025
View reviewed changes
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Dec 11, 2025
@mikebrow mikebrow merged commit d033923 into containerd:release/2.1 Dec 11, 2025
84 of 90 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Dec 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

@mikebrow mikebrow mikebrow approved these changes

Assignees

@austinvazquez austinvazquez

Labels

area/cri Container Runtime Interface (CRI) area/nri Node Resource Interface (NRI) size/XS

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@k8s-infra-cherrypick-robot @estesp @mikebrow @k8s-ci-robot @austinvazquez @klihub