Skip to content

[release-4.21] OCPBUGS-76417: fix(hcco): gate image registry workaround to pre-4.20 releases - #7684

Closed
openshift-cherrypick-robot wants to merge 1 commit into
openshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-7634-to-release-4.21
Closed

[release-4.21] OCPBUGS-76417: fix(hcco): gate image registry workaround to pre-4.20 releases#7684
openshift-cherrypick-robot wants to merge 1 commit into
openshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-7634-to-release-4.21

Conversation

@openshift-cherrypick-robot

@openshift-cherrypick-robot openshift-cherrypick-robot commented Feb 9, 2026

Copy link
Copy Markdown

This is an automated cherry-pick of #7634

/assign openshift-ci-robot

@bryan-cox @claude openshift-cherrypick-robot
fix(hcco): remove OCM config update for image registry managementState
145cc29 
Remove the OCM config update logic that disabled the
serviceaccount-pull-secrets controller when image registry
managementState was Removed. This logic caused constant updates to
the openshift-controller-manager-config ConfigMap, triggering
unnecessary OCM pod restarts every minute.

CPOv2 manages this ConfigMap in 4.20+, so HCCO should not modify it.

Changes:
- Remove OCM config update logic from image registry reconciliation
- Extract image registry reconciliation into dedicated function for testability
- Add unit tests for image registry reconciliation scenarios
- Update TestReconcileOcmConfigChange to verify OCM config is unchanged

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 9, 2026
Merged
4 tasks
@openshift-ci-robot

openshift-ci-robot commented Feb 9, 2026

Copy link
Copy Markdown

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-74931 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.21] OCPBUGS-76417: fix(hcco): gate image registry workaround to pre-4.20 releases

Details

In response to this:

This is an automated cherry-pick of #7634

/assign openshift-ci-robot

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 openshift-ci Bot changed the title [release-4.21] OCPBUGS-74931: fix(hcco): gate image registry workaround to pre-4.20 releases [release-4.21] OCPBUGS-76417: fix(hcco): gate image registry workaround to pre-4.20 releases Feb 9, 2026
@openshift-ci-robot 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 Feb 9, 2026
@openshift-ci-robot

openshift-ci-robot commented Feb 9, 2026

Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-76417, which is invalid:

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

This is an automated cherry-pick of #7634

/assign openshift-ci-robot

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

coderabbitai Bot commented Feb 9, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

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.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 7981e93a-2663-452c-8bb6-bfd94e51e0f3

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

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

@openshift-ci
openshift-ci Bot requested review from csrwng and devguyio February 9, 2026 17:43
@openshift-ci openshift-ci Bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Feb 9, 2026
@openshift-ci

openshift-ci Bot commented Feb 9, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign csrwng 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:

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

@zhfeng

zhfeng commented Mar 13, 2026

Copy link
Copy Markdown
Contributor

/retest

@openshift-ci

openshift-ci Bot commented Mar 13, 2026

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: 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.

@sjenning

sjenning commented Mar 25, 2026

Copy link
Copy Markdown
Contributor

/hold

This removes a in-use feature

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 25, 2026
@sjenning sjenning closed this Mar 27, 2026
@openshift-ci-robot

openshift-ci-robot commented Mar 27, 2026

Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-76417. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state.

Details

In response to this:

This is an automated cherry-pick of #7634

/assign openshift-ci-robot

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@csrwng csrwng Awaiting requested review from csrwng
@devguyio devguyio Awaiting requested review from devguyio

Assignees

@openshift-ci-robot openshift-ci-robot

Labels

area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@openshift-cherrypick-robot @openshift-ci-robot @zhfeng @sjenning @bryan-cox