[release-4.21] OCPBUGS-94179: fix registry override matching and propagation to init containers

[avollmer-redhat]

Summary

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

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

What this fixes

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

2. 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).

3. 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-94179, OCPBUGS-85585

/cc @muraee @sjenning @raelga

[openshift-merge-bot]

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-robot]

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

• expected Jira Issue OCPBUGS-94179 to depend on a bug targeting a version in 4.22.0 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.

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

Details

In response to this:

Summary\nCombined manual backport of #8509 and #8824 to release-4.21.\n\nThe cherry-pick bot could not create this backport automatically because the support/util/registryoverride/ package does not exist on release-4.21 (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-94179, 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]

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: 549df5ee-777b-4936-903f-e63534b93e5f

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[avollmer-redhat]

/label backport-risk-assessed

[openshift-ci]

@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]

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

[avollmer-redhat]

/jira refresh

[openshift-ci-robot]

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

• expected dependent Jira Issue OCPBUGS-94180 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead
• expected dependent Jira Issue OCPBUGS-94180 to target a version in 4.22.0, but it targets "4.20.0" 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.

[avollmer-redhat]

/jira refresh

[openshift-ci-robot]

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

• expected dependent Jira Issue OCPBUGS-94180 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
• expected dependent Jira Issue OCPBUGS-94180 to target a version in 4.22.0, but it targets "4.20.0" 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.

[avollmer-redhat]

/jira refresh

[openshift-ci-robot]

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

• expected Jira Issue OCPBUGS-94179 to depend on a bug targeting a version in 4.22.0 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]

/jira refresh

[openshift-ci-robot]

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

• expected dependent Jira Issue OCPBUGS-94170 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]

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

• expected dependent Jira Issue OCPBUGS-94170 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.21.

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

What this fixes

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

2. 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).

3. 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-94179, 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

[avollmer-redhat]

/retest-required

[avollmer-redhat]

/retest-required

[avollmer-redhat]

/retest ci/prow/e2e-aks

[avollmer-redhat]

/retest ci/prow/e2e-aks

[avollmer-redhat]

/test e2e-aks

[avollmer-redhat]

/jira refresh

@muraee Could you /approve this PR? It is the same code as #8877 (4.22 backport) which you already approved and merged today.

@CEWong Could you add the remaining labels? You added backport-risk-assessed on #8877 — this is the identical backport for 4.21:

/label backport-risk-assessed
/label verified

All CI has been green since Jul 14.

[openshift-ci-robot]

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

• expected dependent Jira Issue OCPBUGS-94170 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

@muraee Could you /approve this PR? It is the same code as #8877 (4.22 backport) which you already approved and merged today.

@CEWong Could you add the remaining labels? You added backport-risk-assessed on #8877 — this is the identical backport for 4.21:

/label backport-risk-assessed
/label verified

All CI has been green since Jul 14.

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]

@csrwng Could you also add the remaining labels needed to merge?

/label backport-risk-assessed
/label verified

[openshift-ci]

@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:

/jira refresh

@muraee Could you /approve this PR? It is the same code as #8877 (4.22 backport) which you already approved and merged today.

@CEWong Could you add the remaining labels? You added backport-risk-assessed on #8877 — this is the identical backport for 4.21:

/label backport-risk-assessed
/label verified

All CI has been green since Jul 14.

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.

[openshift-ci]

@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:

@csrwng Could you also add the remaining labels needed to merge?

/label backport-risk-assessed
/label verified

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.

[muraee]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: avollmer-redhat, muraee, raelga

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [muraee]

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

[avollmer-redhat]

/jira refresh

[openshift-ci-robot]

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

• expected dependent Jira Issue OCPBUGS-94170 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED 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.

[celebdor]

/jira refresh

[openshift-ci-robot]

@celebdor: This pull request references Jira Issue OCPBUGS-94179, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.21.z) matches configured target version for branch (4.21.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-94170 is in the state Release Pending (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-94170 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
• bug has dependents

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]

@csrwng @CEWong This PR is one label away from merging — all CI green, approved, lgtm, jira/valid-bug, verified are all set. Could one of you add the last required label?

/label backport-risk-assessed

This is the same code as #8877 (4.22 backport) which already merged with backport-risk-assessed. Thanks!

[openshift-ci]

@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:

@csrwng @CEWong This PR is one label away from merging — all CI green, approved, lgtm, jira/valid-bug, verified are all set. Could one of you add the last required label?

/label backport-risk-assessed

This is the same code as #8877 (4.22 backport) which already merged with backport-risk-assessed. Thanks!

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.

[openshift-merge-bot]

/retest-required

Remaining retests: 0 against base HEAD 81a0dd9 and 2 for PR HEAD 9c3c3ac in total

[openshift-ci]

@avollmer-redhat: all tests passed!

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]

@avollmer-redhat: Jira Issue Verification Checks: Jira Issue OCPBUGS-94179
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-94179 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Summary

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

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

What this fixes

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

2. 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).

3. 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-94179, 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.

[openshift-merge-robot]

Fix included in release 4.21.0-0.nightly-2026-08-06-114003