crio: use V2 registries.conf with unqualified-search-registries#22872
crio: use V2 registries.conf with unqualified-search-registries#22872zxuhan wants to merge 1 commit intokubernetes:masterfrom
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: zxuhan The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Hi @zxuhan. Thanks for your PR. I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
Can one of the admins verify this patch? |
Fixes #19396.
Problem
Newer CRI-O versions (v1.35+) only parse the V2 TOML format of
/etc/containers/registries.conf. The legacy V1 format ([registries.search]blocks) is silently ignored, leavingunqualified-search-registriesunset.As a result, deploying an image without a registry prefix fails:
Fix
Unify the registries.conf shipped to both the ISO and kicbase on the V2 format, with
docker.ioas the sole unqualified search registry (matches prior behavior intent).deploy/iso/minikube-iso/package/crio-bin/registries.conf— migrated V1 → V2. Installed into the ISO viacrio-bin.mkat/etc/containers/registries.conf.deploy/kicbase/registries.conf— new file, same V2 content.deploy/kicbase/Dockerfile—COPY registries.conf /etc/containers/registries.conf, so the kicbase image no longer relies on whatever thecri-oDebian package happens to ship (which, on v1.35, doesn't setunqualified-search-registries).Both paths now produce the same behavior:
Test plan
go build ./...passes.crio-bin.mkalready installs the ISO registries.conf to/etc/containers/registries.conf, no mk changes needed.