]> git.feebdaed.xyz Git - 0xmirror/containerd.git/commit
cri: Use the runtimeHandler parameter in PullImage
authorFabiano Fidêncio <ffidencio@nvidia.com>
Fri, 19 Dec 2025 09:14:43 +0000 (10:14 +0100)
committerFabiano Fidêncio <ffidencio@nvidia.com>
Sat, 20 Dec 2025 00:27:55 +0000 (01:27 +0100)
commitb8ae0412ff3503d34a8b1aec6fb0faef1631b48d
tree35cb05a5fd0dc5621b7cbc332a20133da64a46e0
parent3d8c1cc1443df5bd85f48d3f60b0beb7aed442d6
cri: Use the runtimeHandler parameter in PullImage

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 <walmeida@microsoft.com>
Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
internal/cri/annotations/annotations.go
internal/cri/server/images/image_pull.go
internal/cri/server/images/image_pull_test.go