[release-4.20] OCPBUGS-94180: fix registry override matching and propagation to init containers by avollmer-redhat · Pull Request #8880 · openshift/hypershift

avollmer-redhat · 2026-06-30T16:37:10Z

Summary

Combined manual backport of #8509 and #8824 to release-4.20.

The cherry-pick bot could not create this backport automatically because the support/util/registryoverride/ package does not exist on release-4.20 (it was introduced on main by #8509), causing merge conflicts.

What this fixes

Registry override substring matching bug (OCPBUGS-85585: tighten registry override matching to strict longest-prefix across release-image consumers #8509): RegistryMirrorProviderDecorator.Lookup() used strings.Replace which could match substrings inside hostnames (e.g. quay.io inside quay.io.example.com). Replaced with strict longest-prefix matching via new registryoverride.Replace() helper.
Digest/tag separator handling (OCPBUGS-92034: fix registry override matching for digest and tag separators #8824): The strict matching from OCPBUGS-85585: tighten registry override matching to strict longest-prefix across release-image consumers #8509 only accepted / as a valid separator. Repository-level overrides failed to match digest-based references (repo@sha256:...). Fixed matchesPrefix() to also accept @ (digest) and : (tag, when source contains a path component).
Init container image override propagation (OCPBUGS-85585: tighten registry override matching to strict longest-prefix across release-image consumers #8509): CPO-managed init containers (e.g. availability-prober) were not getting registry overrides applied because imageprovider.New() populated component images without running them through override logic. Added NewWithRegistryOverrides() and wired it into the HCP controller.

Root cause

Without these fixes, ValidatingAdmissionPolicies in Deny mode block HCP creation because CPO init containers still reference original registries (e.g. quay.io/redhat-user-workloads/...) instead of the configured mirror/ACR.

Changes

New: support/util/registryoverride/ package with Replace() and comprehensive tests (18 test cases)
Modified: support/releaseinfo/registry_mirror_provider.go — use registryoverride.Replace() instead of strings.Replace
Modified: control-plane-operator/.../imageprovider/imageprovider.go — add NewWithRegistryOverrides()
Modified: control-plane-operator/.../hostedcontrolplane_controller.go — wire NewWithRegistryOverrides with registry overrides from the release provider

Test plan

18 unit tests for registryoverride.Replace covering boundary matching, longest-prefix, digest/tag separators, false-positive rejection, mutation safety
All existing releaseinfo tests pass
All existing imageprovider tests pass (compilation verified)

Summary\nCombined manual backport of #8509 and #8824 to release-4.20.\n\nThe cherry-pick bot could not create this backport automatically because the support/util/registryoverride/ package does not exist on release-4.20 (it was introduced on main by #8509), causing merge conflicts.\n\n## What this fixes\n\n1. Registry override substring matching bug (#8509): RegistryMirrorProviderDecorator.Lookup() used strings.Replace which could match substrings inside hostnames (e.g. quay.io inside quay.io.example.com). Replaced with strict longest-prefix matching via new registryoverride.Replace() helper.\n\n2. Digest/tag separator handling (#8824): The strict matching from #8509 only accepted / as a valid separator. Repository-level overrides failed to match digest-based references (repo@sha256:...). Fixed matchesPrefix() to also accept @ (digest) and : (tag, when source contains a path component).\n\n3. Init container image override propagation (#8509): CPO-managed init containers (e.g. availability-prober) were not getting registry overrides applied because imageprovider.New() populated component images without running them through override logic. Added NewWithRegistryOverrides() and wired it into the HCP controller.\n\n## Root cause\nWithout these fixes, ValidatingAdmissionPolicies in Deny mode block HCP creation because CPO init containers still reference original registries (e.g. quay.io/redhat-user-workloads/...) instead of the configured mirror/ACR.\n\n## Changes\n- New: support/util/registryoverride/ package with Replace() and comprehensive tests (18 test cases)\n- Modified: support/releaseinfo/registry_mirror_provider.go — use registryoverride.Replace() instead of strings.Replace\n- Modified: control-plane-operator/.../imageprovider/imageprovider.go — add NewWithRegistryOverrides()\n- Modified: control-plane-operator/.../hostedcontrolplane_controller.go — wire NewWithRegistryOverrides with registry overrides from the release provider\n\n## Test plan\n- [x] 18 unit tests for registryoverride.Replace covering boundary matching, longest-prefix, digest/tag separators, false-positive rejection, mutation safety\n- [x] All existing releaseinfo tests pass\n- [x] All existing imageprovider tests pass (compilation verified)\n\n## Related\n- Upstream PRs: #8509, #8824\n- 4.22 backport: #8877\n- Jira: OCPBUGS-94180, OCPBUGS-85585\n\n/cc @muraee @sjenning @raelga

Instructions 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 openshift-eng/jira-lifecycle-plugin repository.

coderabbitai · 2026-06-30T16:37:20Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: b7392809-fb1f-4017-9eb1-77e725017dd6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

avollmer-redhat · 2026-06-30T16:37:22Z

/label backport-risk-assessed

openshift-merge-bot · 2026-06-30T16:37:23Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

openshift-ci · 2026-06-30T16:38:20Z

@avollmer-redhat: The label(s) backport-risk-assessed cannot be applied or removed, because you are not in one of the allowed teams and are not an allowed user. Must be a member of one of these teams: openshift-patch-managers, openshift-staff-engineers, openshift-release-oversight, openshift-sustaining-engineers

Details

In response to this:

/label backport-risk-assessed

Instructions 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.

avollmer-redhat · 2026-06-30T16:44:26Z

/area control-plane-operator
/area hypershift-operator

avollmer-redhat · 2026-06-30T16:45:07Z

/jira refresh

openshift-ci-robot · 2026-06-30T16:45:11Z

@avollmer-redhat: This pull request references Jira Issue OCPBUGS-94180, which is invalid:

expected Jira Issue OCPBUGS-94180 to depend on a bug targeting a version in 4.21.0, 4.21.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions 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 openshift-eng/jira-lifecycle-plugin repository.

avollmer-redhat · 2026-07-01T13:54:39Z

/jira refresh

openshift-ci-robot · 2026-07-01T13:54:44Z

@avollmer-redhat: This pull request references Jira Issue OCPBUGS-94180, which is invalid:

expected Jira Issue OCPBUGS-94180 to depend on a bug targeting a version in 4.21.0, 4.21.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions 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 openshift-eng/jira-lifecycle-plugin repository.

avollmer-redhat · 2026-07-01T16:39:50Z

/jira refresh

openshift-ci-robot · 2026-07-01T16:39:55Z

@avollmer-redhat: This pull request references Jira Issue OCPBUGS-94180, which is invalid:

expected Jira Issue OCPBUGS-94180 to depend on a bug targeting a version in 4.21.0, 4.21.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions 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 openshift-eng/jira-lifecycle-plugin repository.

…t containers Combined manual backport of openshift#8509 and openshift#8824 to release-4.20. Introduces strict longest-prefix registry override matching and wires overrides into CPO init container image resolution.

avollmer-redhat · 2026-07-01T16:45:34Z

/jira refresh

openshift-ci-robot · 2026-07-01T16:45:41Z

@avollmer-redhat: This pull request references Jira Issue OCPBUGS-94180, which is invalid:

expected dependent Jira Issue OCPBUGS-94179 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions 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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2026-07-02T14:39:18Z

@avollmer-redhat: This pull request references Jira Issue OCPBUGS-94180, which is invalid:

expected dependent Jira Issue OCPBUGS-94179 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

Combined manual backport of #8509 and #8824 to release-4.20.

The cherry-pick bot could not create this backport automatically because the support/util/registryoverride/ package does not exist on release-4.20 (it was introduced on main by #8509), causing merge conflicts.

What this fixes

Registry override substring matching bug (OCPBUGS-85585: tighten registry override matching to strict longest-prefix across release-image consumers #8509): RegistryMirrorProviderDecorator.Lookup() used strings.Replace which could match substrings inside hostnames (e.g. quay.io inside quay.io.example.com). Replaced with strict longest-prefix matching via new registryoverride.Replace() helper.

Digest/tag separator handling (OCPBUGS-92034: fix registry override matching for digest and tag separators #8824): The strict matching from OCPBUGS-85585: tighten registry override matching to strict longest-prefix across release-image consumers #8509 only accepted / as a valid separator. Repository-level overrides failed to match digest-based references (repo@sha256:...). Fixed matchesPrefix() to also accept @ (digest) and : (tag, when source contains a path component).

Init container image override propagation (OCPBUGS-85585: tighten registry override matching to strict longest-prefix across release-image consumers #8509): CPO-managed init containers (e.g. availability-prober) were not getting registry overrides applied because imageprovider.New() populated component images without running them through override logic. Added NewWithRegistryOverrides() and wired it into the HCP controller.

Root cause

Without these fixes, ValidatingAdmissionPolicies in Deny mode block HCP creation because CPO init containers still reference original registries (e.g. quay.io/redhat-user-workloads/...) instead of the configured mirror/ACR.

Changes

New: support/util/registryoverride/ package with Replace() and comprehensive tests (18 test cases)

Modified: support/releaseinfo/registry_mirror_provider.go — use registryoverride.Replace() instead of strings.Replace

Modified: control-plane-operator/.../imageprovider/imageprovider.go — add NewWithRegistryOverrides()

Modified: control-plane-operator/.../hostedcontrolplane_controller.go — wire NewWithRegistryOverrides with registry overrides from the release provider

Test plan

18 unit tests for registryoverride.Replace covering boundary matching, longest-prefix, digest/tag separators, false-positive rejection, mutation safety

All existing releaseinfo tests pass

All existing imageprovider tests pass (compilation verified)

Related

Upstream PRs: OCPBUGS-85585: tighten registry override matching to strict longest-prefix across release-image consumers #8509, OCPBUGS-92034: fix registry override matching for digest and tag separators #8824

4.22 backport: OCPBUGS-94170: fix registry override matching and propagation to init containers #8877

Jira: OCPBUGS-94180, OCPBUGS-85585

/cc @muraee @sjenning @raelga

Instructions 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 openshift-eng/jira-lifecycle-plugin repository.

raelga

Cherry picks two already tested and shiped changes.

/lgtm

raelga · 2026-07-02T14:41:08Z

/retest

openshift-merge-bot · 2026-07-02T14:42:11Z

Pipeline controller notification

No second-stage tests were triggered for this PR.

This can happen when:

The changed files don't match any pipeline_run_if_changed patterns
All files match pipeline_skip_if_only_changed patterns
No pipeline-controlled jobs are defined for the release-4.20 branch

Use /test ? to see all available tests.

openshift-ci · 2026-07-02T14:42:23Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: avollmer-redhat, raelga
Once this PR has been reviewed and has the lgtm label, please assign sjenning for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2026-07-02T16:37:40Z

@avollmer-redhat: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aks	`25519be`	link	true	`/test e2e-aks`
ci/prow/e2e-aws	`25519be`	link	true	`/test e2e-aws`
ci/prow/e2e-aws-upgrade-hypershift-operator	`25519be`	link	true	`/test e2e-aws-upgrade-hypershift-operator`

Full PR test history. Your PR dashboard.

Details

Instructions 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. I understand the commands that are listed here.

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 30, 2026

openshift-ci Bot added the do-not-merge/needs-area label Jun 30, 2026

openshift-ci Bot requested review from csrwng and hasueki June 30, 2026 16:38

avollmer-redhat force-pushed the fix/OCPBUGS-94180-combined-backport-4.20 branch from c441228 to aca100a Compare June 30, 2026 21:58

avollmer-redhat force-pushed the fix/OCPBUGS-94180-combined-backport-4.20 branch from aca100a to f1d2c49 Compare July 1, 2026 15:23

avollmer-redhat force-pushed the fix/OCPBUGS-94180-combined-backport-4.20 branch from f1d2c49 to 25519be Compare July 1, 2026 16:41

avollmer-redhat mentioned this pull request Jul 1, 2026

[release-4.22] OCPBUGS-94170: tighten registry override matching to strict longest-prefix across release-image consumers #8873

Closed

avollmer-redhat changed the title ~~OCPBUGS-94180: fix registry override matching and propagation to init containers~~ [release-4.20] OCPBUGS-94180: fix registry override matching and propagation to init containers Jul 2, 2026

raelga approved these changes Jul 2, 2026

View reviewed changes

openshift-ci Bot assigned raelga Jul 2, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 2, 2026

Uh oh!

Conversation

avollmer-redhat commented Jun 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

What this fixes

Root cause

Changes

Test plan

Related

Uh oh!

openshift-ci-robot commented Jun 30, 2026

Uh oh!

coderabbitai Bot commented Jun 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

avollmer-redhat commented Jun 30, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 30, 2026

Uh oh!

openshift-ci Bot commented Jun 30, 2026

Uh oh!

avollmer-redhat commented Jun 30, 2026

Uh oh!

avollmer-redhat commented Jun 30, 2026

Uh oh!

openshift-ci-robot commented Jun 30, 2026

Uh oh!

avollmer-redhat commented Jul 1, 2026

Uh oh!

openshift-ci-robot commented Jul 1, 2026

Uh oh!

avollmer-redhat commented Jul 1, 2026

Uh oh!

openshift-ci-robot commented Jul 1, 2026

Uh oh!

avollmer-redhat commented Jul 1, 2026

Uh oh!

openshift-ci-robot commented Jul 1, 2026

Uh oh!

openshift-ci-robot commented Jul 2, 2026

Summary

What this fixes

Root cause

Changes

Test plan

Related

Uh oh!

raelga left a comment

Choose a reason for hiding this comment

Uh oh!

raelga commented Jul 2, 2026

Uh oh!

openshift-merge-bot Bot commented Jul 2, 2026

Uh oh!

openshift-ci Bot commented Jul 2, 2026

Uh oh!

openshift-ci Bot commented Jul 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

avollmer-redhat commented Jun 30, 2026 •

edited

Loading

coderabbitai Bot commented Jun 30, 2026 •

edited

Loading