Skip to content

[release/2.2] Fix migrated CRI image config when using legacy registry mirrors#12987

Merged
samuelkarp merged 1 commit intocontainerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-12617-to-release/2.2
Mar 7, 2026
Merged

[release/2.2] Fix migrated CRI image config when using legacy registry mirrors#12987
samuelkarp merged 1 commit intocontainerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-12617-to-release/2.2

Conversation

@k8s-infra-cherrypick-robot

This is an automated cherry-pick of #12617

/assign samuelkarp

move setting the config_path from default image config to plugin init.
only set the default value when both mirrors and config_path are empty,
in all other cases retain the existing behaviour

Co-authored-by: Samuel Karp <[email protected]>
Signed-off-by: Akhil Mohan <[email protected]>
Signed-off-by: Samuel Karp <[email protected]>
@samuelkarp samuelkarp requested a review from chrishenzie March 6, 2026 23:32
@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Mar 6, 2026
@samuelkarp samuelkarp merged commit 5dc7bb2 into containerd:release/2.2 Mar 7, 2026
86 of 90 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Mar 7, 2026
@samuelkarp samuelkarp changed the title [release/2.2] fix migrated cri image config when using registry [release/2.2] Fix migrated CRI image config when using registry Mar 9, 2026
@samuelkarp samuelkarp changed the title [release/2.2] Fix migrated CRI image config when using registry [release/2.2] Fix migrated CRI image config when using legacy registry mirrors 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/S

Projects

Development

Successfully merging this pull request may close these issues.

5 participants