Skip to content

[release/2.2] Use the specified runtime handler when pulling images#12721

Merged
fuweid merged 1 commit intocontainerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-12710-to-release/2.2
Dec 22, 2025
Merged

[release/2.2] Use the specified runtime handler when pulling images#12721
fuweid merged 1 commit intocontainerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-12710-to-release/2.2

Conversation

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

This is an automated cherry-pick of #12710

/assign mikebrow

The runtimeHandler parameter was added to PullImage() but never used.
Instead, the code relied on an experimental annotation
(io.containerd.cri.runtime-handler) passed in the pod sandbox config.

This annotation was a workaround because CRI's PullImageRequest didn't
include the runtime handler. However, since cri-api v0.29.0, the runtime
handler is available in the API and passed as a parameter to PullImage().

For backward compatibility with CRI clients that don't yet pass the
runtime handler parameter, we fall back to the annotation if the
parameter is empty. The annotation-based fallback is deprecated and
will be removed in containerd 2.5.

Signed-off-by: Wedson Almeida Filho <[email protected]>
Signed-off-by: Fabiano Fidêncio <[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 22, 2025
@fuweid fuweid merged commit 683ccda into containerd:release/2.2 Dec 22, 2025
90 of 92 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Dec 22, 2025
@samuelkarp samuelkarp changed the title [release/2.2] cri: Use the runtimeHandler parameter in PullImage [release/2.2] Use the specified runtime handler when pulling images Mar 9, 2026
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) impact/changelog size/M

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

7 participants