Skip to content

[release/2.2] cri/nri: short-circuit nil adjustment.#12672

Merged
mikebrow merged 1 commit intocontainerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-12574-to-release/2.2
Dec 11, 2025
Merged

[release/2.2] cri/nri: short-circuit nil adjustment.#12672
mikebrow merged 1 commit intocontainerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-12574-to-release/2.2

Conversation

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #12574

/assign austinvazquez

Skip processing early if we get a nil adjustment from NRI.

Signed-off-by: Krisztian Litkey <[email protected]>
Copy link
Copy Markdown
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 d65025d into containerd:release/2.2 Dec 11, 2025
131 of 148 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

Labels

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

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

6 participants