OCPBUGS-74931: fix(hcco): gate image registry workaround to pre-4.20 releases

[bryan-cox]

What this PR does / why we need it:

Fixes constant updates to the openshift-controller-manager-config ConfigMap in OCP 4.20+, which was causing openshift-controller-manager pods to restart every minute.

The OCM config update logic (which disabled the serviceaccount-pull-secrets controller when image registry managementState was Removed) is no longer needed because CPOv2 manages this ConfigMap in 4.20+. This PR removes that logic entirely from HCCO, preventing the unnecessary updates that trigger pod restarts.

Which issue(s) this PR fixes:

Fixes OCPBUGS-74931

Special notes for your reviewer:

• The image registry reconciliation logic was extracted into a dedicated reconcileImageRegistry function to improve testability
• The capability check is now performed at the call site in Reconcile, matching the pattern used for ingress capability
• The TestReconcileOcmConfigChange test was updated to verify that OCM config remains unchanged for all platforms

Checklist:

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes docs.
• This change includes unit tests.

🤖 Generated with Claude Code

[openshift-ci-robot]

@bryan-cox: This pull request references Jira Issue OCPBUGS-74931, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (yli2@redhat.com), skipping review request.

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

Details

In response to this:

What this PR does / why we need it:

Fixes constant updates to the openshift-controller-manager-config ConfigMap in OCP 4.20+, which was causing openshift-controller-manager pods to restart every minute.

The OCM config update logic (which disables the serviceaccount-pull-secrets controller when image registry managementState is Removed) is only needed for releases < 4.20. CPOv2 manages this ConfigMap in 4.20+, so HCCO should not be modifying it.

This PR gates the OCM config update to only run on pre-4.20 releases, preventing the unnecessary updates that trigger pod restarts.

Which issue(s) this PR fixes:

Fixes OCPBUGS-74931

Special notes for your reviewer:

To enable unit testing of the image registry reconciliation logic, it was extracted from the main Reconcile method into a dedicated reconcileImageRegistry function. This refactoring does not change behavior - the capability check is now performed at the call site, matching the pattern used for ingress capability.

Checklist:

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes docs.
• This change includes unit tests.

🤖 Generated with Claude Code

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 limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)

• do-not-merge/work-in-progress

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.

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

• 🔍 Trigger a full review

✨ Finishing touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment

---

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

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[bryan-cox]

/test verify
/test unit

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox

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 [bryan-cox]

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

[bryan-cox]

/test all

[bryan-cox]

/retest

[bryan-cox]

/auto-cc

[openshift-ci-robot]

@bryan-cox: This pull request references Jira Issue OCPBUGS-74931, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (yli2@redhat.com), skipping review request.

Details

In response to this:

What this PR does / why we need it:

Fixes constant updates to the openshift-controller-manager-config ConfigMap in OCP 4.20+, which was causing openshift-controller-manager pods to restart every minute.

The OCM config update logic (which disabled the serviceaccount-pull-secrets controller when image registry managementState was Removed) is no longer needed because CPOv2 manages this ConfigMap in 4.20+. This PR removes that logic entirely from HCCO, preventing the unnecessary updates that trigger pod restarts.

Which issue(s) this PR fixes:

Fixes OCPBUGS-74931

Special notes for your reviewer:

• The image registry reconciliation logic was extracted into a dedicated reconcileImageRegistry function to improve testability
• The capability check is now performed at the call site in Reconcile, matching the pattern used for ingress capability
• The TestReconcileOcmConfigChange test was updated to verify that OCM config remains unchanged for all platforms

Checklist:

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes docs.
• This change includes unit tests.

🤖 Generated with Claude Code

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.

[bryan-cox]

/test verify
/test unit

[bryan-cox]

/test verify
/test unit

[muraee]

/lgtm

[openshift-ci-robot]

Scheduling required tests:
/test verify-deps

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

[bryan-cox]

/retest

[bryan-cox]

/verified later @YuLi517

[openshift-ci-robot]

@bryan-cox: This PR has been marked to be verified later by @YuLi517.

Details

In response to this:

/verified later @YuLi517

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]

@bryan-cox: The following test 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-4-21	6204f31	link	true	/test e2e-aks-4-21

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.

[bryan-cox]

/retest

[bryan-cox]

/jira backport release-4.21,release-4.20

[openshift-ci-robot]

@bryan-cox: The following backport issues have been created:

• OCPBUGS-76417 for branch release-4.21
• OCPBUGS-76418 for branch release-4.20

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.21
/cherrypick release-4.20

Details

In response to this:

/jira backport release-4.21,release-4.20

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

@openshift-ci-robot: #7634 failed to apply on top of branch "release-4.20":

Applying: fix(hcco): remove OCM config update for image registry managementState
Using index info to reconstruct a base tree...
M	control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
M	control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources_test.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources_test.go
CONFLICT (content): Merge conflict in control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources_test.go
Auto-merging control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 fix(hcco): remove OCM config update for image registry managementState

Details

In response to this:

@bryan-cox: The following backport issues have been created:

• OCPBUGS-76417 for branch release-4.21
• OCPBUGS-76418 for branch release-4.20

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.21
/cherrypick release-4.20

In response to this:

/jira backport release-4.21,release-4.20

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.

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

@openshift-ci-robot: new pull request created: #7684

Details

In response to this:

@bryan-cox: The following backport issues have been created:

• OCPBUGS-76417 for branch release-4.21
• OCPBUGS-76418 for branch release-4.20

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.21
/cherrypick release-4.20

In response to this:

/jira backport release-4.21,release-4.20

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.

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

Fix included in accepted release 4.22.0-0.nightly-2026-02-17-112443