OCPBUGS-84939: [release-4.22] add CP pull-secret watches for in-place propagation

[enxebre]

Summary

• Backport of controller changes from OCPBUGS-84528: clarify pull secret in-place update behavior and add CP watches #8327 to release-4.22
• Adds CP namespace pull-secret watches to both the globalps and resources HCCO controllers
• Ensures in-place updates to HostedCluster.spec.pullSecret propagate promptly to the guest cluster (kube-system/original-pull-secret and openshift-config/pull-secret) without depending on incidental kube-system secret activity

Test plan

• Verify e2e-aks-4-22 passes (the in-place propagation test is skipped on CPO < 4.23 in the main branch, so this backport makes the behavior correct for 4.22 CPO)
• Verify no regressions in pull secret reconciliation

🤖 Generated with Claude Code

[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 YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 04fe08ff-2681-47ad-8e72-98b4decbd44c

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

@enxebre: This pull request references Jira Issue OCPBUGS-84528, which is invalid:

• expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "5.0" instead
• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
• expected Jira Issue OCPBUGS-84528 to depend on a bug targeting a version in 5.0.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, 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

• Backport of controller changes from OCPBUGS-84528: clarify pull secret in-place update behavior and add CP watches #8327 to release-4.22
• Adds CP namespace pull-secret watches to both the globalps and resources HCCO controllers
• Ensures in-place updates to HostedCluster.spec.pullSecret propagate promptly to the guest cluster (kube-system/original-pull-secret and openshift-config/pull-secret) without depending on incidental kube-system secret activity

Test plan

• Verify e2e-aks-4-22 passes (the in-place propagation test is skipped on CPO < 4.23 in the main branch, so this backport makes the behavior correct for 4.22 CPO)
• Verify no regressions in pull secret reconciliation

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

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre

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 [enxebre]
• api/OWNERS [enxebre]

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

[openshift-ci-robot]

@enxebre: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

Details

In response to this:

Summary

• Backport of controller changes from OCPBUGS-84528: clarify pull secret in-place update behavior and add CP watches #8327 to release-4.22
• Adds CP namespace pull-secret watches to both the globalps and resources HCCO controllers
• Ensures in-place updates to HostedCluster.spec.pullSecret propagate promptly to the guest cluster (kube-system/original-pull-secret and openshift-config/pull-secret) without depending on incidental kube-system secret activity

Test plan

• Verify e2e-aks-4-22 passes (the in-place propagation test is skipped on CPO < 4.23 in the main branch, so this backport makes the behavior correct for 4.22 CPO)
• Verify no regressions in pull secret reconciliation

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

[enxebre]

/jira cherry-pick OCPBUGS-84528

[openshift-ci-robot]

@enxebre: Jira Issue OCPBUGS-84528 has been cloned as Jira Issue OCPBUGS-84939. Will retitle bug to link to clone.
/retitle OCPBUGS-84939: [release-4.22] add CP pull-secret watches for in-place propagation

Details

In response to this:

/jira cherry-pick OCPBUGS-84528

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]

@enxebre: This pull request references Jira Issue OCPBUGS-84939, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
• expected dependent Jira Issue OCPBUGS-84528 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is POST instead
• expected dependent Jira Issue OCPBUGS-84528 to target a version in 5.0.0, but it targets "5.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.

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

Details

In response to this:

Summary

• Backport of controller changes from OCPBUGS-84528: clarify pull secret in-place update behavior and add CP watches #8327 to release-4.22
• Adds CP namespace pull-secret watches to both the globalps and resources HCCO controllers
• Ensures in-place updates to HostedCluster.spec.pullSecret propagate promptly to the guest cluster (kube-system/original-pull-secret and openshift-config/pull-secret) without depending on incidental kube-system secret activity

Test plan

• Verify e2e-aks-4-22 passes (the in-place propagation test is skipped on CPO < 4.23 in the main branch, so this backport makes the behavior correct for 4.22 CPO)
• Verify no regressions in pull secret reconciliation

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

[codecov]

Codecov Report

❌ Patch coverage is 50.00000% with 12 lines in your changes missing coverage. Please review.
✅ Project coverage is 34.79%. Comparing base (7c6d1fb) to head (98bfce0).
⚠️ Report is 12 commits behind head on release-4.22.

Files with missing lines	Patch %	Lines
...lusterconfigoperator/controllers/globalps/setup.go	53.33%	7 Missing ⚠️
...rconfigoperator/controllers/resources/resources.go	44.44%	5 Missing ⚠️

Additional details and impacted files

@@              Coverage Diff              @@
##           release-4.22    #8408   +/-   ##
=============================================
  Coverage         34.79%   34.79%           
=============================================
  Files               767      767           
  Lines             93445    93467   +22     
=============================================
+ Hits              32511    32523   +12     
- Misses            58255    58265   +10     
  Partials           2679     2679           

Files with missing lines	Coverage Δ
...rconfigoperator/controllers/resources/resources.go	50.50% <44.44%> (-0.02%)	⬇️
...lusterconfigoperator/controllers/globalps/setup.go	10.25% <53.33%> (+10.25%)	⬆️

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[cblecker]

/uncc

[enxebre]

/verified by @jiezhao16

[openshift-ci-robot]

@enxebre: This PR has been marked as verified by @jiezhao16.

Details

In response to this:

/verified by @jiezhao16

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-84939, which is invalid:

• expected dependent Jira Issue OCPBUGS-84528 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, 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.

[celebdor]

/jira refresh

[openshift-ci-robot]

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

7 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 New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-84528 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-84528 targets the "5.0.0" version, which is one of the valid target versions: 5.0.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.

[jparrill]

/lgtm

[openshift-ci]

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

@enxebre: Jira Issue Verification Checks: Jira Issue OCPBUGS-84939
✔️ 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-84939 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

• Backport of controller changes from OCPBUGS-84528: clarify pull secret in-place update behavior and add CP watches #8327 to release-4.22
• Adds CP namespace pull-secret watches to both the globalps and resources HCCO controllers
• Ensures in-place updates to HostedCluster.spec.pullSecret propagate promptly to the guest cluster (kube-system/original-pull-secret and openshift-config/pull-secret) without depending on incidental kube-system secret activity

Test plan

• Verify e2e-aks-4-22 passes (the in-place propagation test is skipped on CPO < 4.23 in the main branch, so this backport makes the behavior correct for 4.22 CPO)
• Verify no regressions in pull secret reconciliation

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

[openshift-merge-robot]

Fix included in release 4.22.0-0.nightly-2026-05-20-020825