OCPBUGS-86477: [release-4.21] add CP pull-secret watches for in-place propagation by enxebre · Pull Request #8583 · openshift/hypershift

enxebre · 2026-05-25T14:35:51Z

Summary

Cherry-pick of #8408 (release-4.22 backport) to release-4.21.

Add CP pull-secret watches to both the resources and globalps HCCO controllers so in-place Secret updates propagate promptly to the guest cluster
Clarify HostedCluster.spec.pullSecret API godoc on in-place update behaviour
Include unit tests for predicate and mapper functions

Test plan

Verify HCCO starts cleanly with both new watches
Test in-place pull secret update: confirm openshift-config/pull-secret and kube-system/original-pull-secret update promptly without NodePool rollout

🤖 Generated with Claude Code

openshift-merge-bot · 2026-05-25T14:35:54Z

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 · 2026-05-25T14:35:58Z

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

expected the bug to target either version "4.21." or "openshift-4.21.", but it targets "4.22.z" instead
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
expected dependent Jira Issue OCPBUGS-84528 to target a version in 4.22.0, but it targets "5.0.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

Cherry-pick of #8408 (release-4.22 backport) to release-4.21.

Add CP pull-secret watches to both the resources and globalps HCCO controllers so in-place Secret updates propagate promptly to the guest cluster

Clarify HostedCluster.spec.pullSecret API godoc on in-place update behaviour

Include unit tests for predicate and mapper functions

Test plan

Verify HCCO starts cleanly with both new watches

Test in-place pull secret update: confirm openshift-config/pull-secret and kube-system/original-pull-secret update promptly without NodePool rollout

🤖 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 · 2026-05-25T14:35:59Z

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: a1de340e-81e1-44a3-8d1f-7cb361dc31ef

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 · 2026-05-25T14:36:15Z

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

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

enxebre · 2026-05-25T14:37:49Z

/jira cherry-pick OCPBUGS-84939

openshift-ci-robot · 2026-05-25T14:37:50Z

@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

Cherry-pick of #8408 (release-4.22 backport) to release-4.21.

Add CP pull-secret watches to both the resources and globalps HCCO controllers so in-place Secret updates propagate promptly to the guest cluster

Clarify HostedCluster.spec.pullSecret API godoc on in-place update behaviour

Include unit tests for predicate and mapper functions

Test plan

Verify HCCO starts cleanly with both new watches

Test in-place pull secret update: confirm openshift-config/pull-secret and kube-system/original-pull-secret update promptly without NodePool rollout

🤖 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-robot · 2026-05-25T14:37:54Z

@enxebre: An error was encountered cloning bug for cherrypick for bug OCPBUGS-84939 on the Jira server at https://redhat.atlassian.net. No known errors were detected, please see the full error message for details.

Full error message.


request failed. Please analyze the request body for more details. Status code: 400: {"errorMessages":[],"errors":{"customfield_10414":"Field does not support update 'customfield_10414'","customfield_10427":"Field does not support update 'customfield_10427'","customfield_10428":"Field does not support update 'customfield_10428'","customfield_10429":"Field does not support update 'customfield_10429'","comment":"Field does not support update 'comment'","issuelinks":"Field does not support update 'issuelinks'","worklog":"Field does not support update 'worklog'","customfield_10430":"Field does not support update 'customfield_10430'","customfield_10431":"Field does not support update 'customfield_10431'"}}

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

Details

In response to this:

/jira cherry-pick OCPBUGS-84939

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 · 2026-05-25T14:41:04Z

/jira cherry-pick OCPBUGS-84939

openshift-ci-robot · 2026-05-25T14:41:07Z

@enxebre: An error was encountered cloning bug for cherrypick for bug OCPBUGS-84939 on the Jira server at https://redhat.atlassian.net. No known errors were detected, please see the full error message for details.

Full error message.


request failed. Please analyze the request body for more details. Status code: 400: {"errorMessages":[],"errors":{"customfield_10414":"Field does not support update 'customfield_10414'","customfield_10427":"Field does not support update 'customfield_10427'","customfield_10428":"Field does not support update 'customfield_10428'","customfield_10429":"Field does not support update 'customfield_10429'","comment":"Field does not support update 'comment'","issuelinks":"Field does not support update 'issuelinks'","worklog":"Field does not support update 'worklog'","customfield_10430":"Field does not support update 'customfield_10430'","customfield_10431":"Field does not support update 'customfield_10431'"}}

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

Details

In response to this:

/jira cherry-pick OCPBUGS-84939

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 · 2026-05-25T14:41:31Z

/jira cherry-pick OCPBUGS-84528

openshift-ci-robot · 2026-05-25T14:41:36Z

@enxebre: An error was encountered cloning bug for cherrypick for bug OCPBUGS-84528 on the Jira server at https://redhat.atlassian.net. No known errors were detected, please see the full error message for details.

Full error message.


request failed. Please analyze the request body for more details. Status code: 400: {"errorMessages":[],"errors":{"customfield_10414":"Field does not support update 'customfield_10414'","customfield_10427":"Field does not support update 'customfield_10427'","customfield_10428":"Field does not support update 'customfield_10428'","customfield_10429":"Field does not support update 'customfield_10429'","comment":"Field does not support update 'comment'","issuelinks":"Field does not support update 'issuelinks'","worklog":"Field does not support update 'worklog'","customfield_10430":"Field does not support update 'customfield_10430'","customfield_10431":"Field does not support update 'customfield_10431'"}}

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

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 · 2026-05-25T14:56:32Z

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

expected Jira Issue OCPBUGS-86477 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

Cherry-pick of #8408 (release-4.22 backport) to release-4.21.

Add CP pull-secret watches to both the resources and globalps HCCO controllers so in-place Secret updates propagate promptly to the guest cluster

Clarify HostedCluster.spec.pullSecret API godoc on in-place update behaviour

Include unit tests for predicate and mapper functions

Test plan

Verify HCCO starts cleanly with both new watches

Test in-place pull secret update: confirm openshift-config/pull-secret and kube-system/original-pull-secret update promptly without NodePool rollout

🤖 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 · 2026-05-25T14:56:35Z

/jira refresh

openshift-ci-robot · 2026-05-25T14:56:38Z

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

expected Jira Issue OCPBUGS-86477 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.

enxebre · 2026-05-25T14:58:33Z

/jira refresh

openshift-ci-robot · 2026-05-25T14:58:37Z

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

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

enxebre · 2026-05-25T15:00:21Z

/jira refresh

openshift-ci-robot · 2026-05-25T15:00:26Z

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

expected dependent Jira Issue OCPBUGS-84939 to target a version in 4.22.0, but it targets "4.22.z" instead
expected dependent Jira Issue OCPBUGS-84528 to target a version in 4.22.0, but it targets "5.0.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.

enxebre · 2026-05-25T15:02:21Z

/jira refresh

openshift-ci-robot · 2026-05-25T15:02:27Z

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

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

enxebre · 2026-05-25T15:03:34Z

/jira refresh

openshift-ci-robot · 2026-05-25T15:03:42Z

@enxebre: This pull request references Jira Issue OCPBUGS-86477, 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.21.z) matches configured target version for branch (4.21.z)
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-84939 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-84939 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.

jparrill · 2026-05-26T08:39:41Z

Hey @enxebre there are some files generated from make verify that needs to be added to the PR, this is why verify test fails.

…or in-place propagation Add watches on the pull-secret in the control plane namespace so that changes are propagated in-place without requiring a rollout. This includes setting up a global pull-secret controller and ensuring resources are updated when the pull-secret changes.

jiezhao16 · 2026-05-27T00:00:10Z

/verified by @jiezhao16

openshift-ci-robot · 2026-05-27T00:00:25Z

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

csrwng · 2026-05-27T00:56:40Z

/lgtm

openshift-merge-bot · 2026-05-27T00:57:51Z

Scheduling required tests:
/test verify-deps

openshift-ci · 2026-05-27T10:58:45Z

@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 · 2026-05-27T11:03:42Z

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

Cherry-pick of #8408 (release-4.22 backport) to release-4.21.

Add CP pull-secret watches to both the resources and globalps HCCO controllers so in-place Secret updates propagate promptly to the guest cluster

Clarify HostedCluster.spec.pullSecret API godoc on in-place update behaviour

Include unit tests for predicate and mapper functions

Test plan

Verify HCCO starts cleanly with both new watches

Test in-place pull secret update: confirm openshift-config/pull-secret and kube-system/original-pull-secret update promptly without NodePool rollout

🤖 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-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 May 25, 2026

openshift-ci Bot added the do-not-merge/needs-area label May 25, 2026

openshift-ci Bot requested review from devguyio and jparrill May 25, 2026 14:36

openshift-ci Bot added the area/api Indicates the PR includes changes for the API label May 25, 2026

enxebre changed the title ~~OCPBUGS-84939: [release-4.21] add CP pull-secret watches for in-place propagation~~ [release-4.21] add CP pull-secret watches for in-place propagation May 25, 2026

openshift-ci-robot removed the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 25, 2026

openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label May 25, 2026

enxebre changed the title ~~[release-4.21] add CP pull-secret watches for in-place propagation~~ OCPBUGS-86477: [release-4.21] add CP pull-secret watches for in-place propagation May 25, 2026

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 May 25, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 25, 2026

enxebre force-pushed the enxebre/backport-pull-secret-watches-4.21 branch from ebf66b3 to 67a5e3e Compare May 26, 2026 08:45

enxebre force-pushed the enxebre/backport-pull-secret-watches-4.21 branch from 67a5e3e to 7c7481c Compare May 26, 2026 09:50

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 27, 2026

openshift-ci Bot assigned csrwng May 27, 2026

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

enxebre added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 27, 2026

openshift-merge-bot Bot merged commit dc24440 into openshift:release-4.21 May 27, 2026
18 checks passed

enxebre mentioned this pull request May 27, 2026

OCPBUGS-86573: [release-4.20] add CP pull-secret watches for in-place propagation #8596

Merged

2 tasks

Conversation

enxebre commented May 25, 2026

Summary

Test plan

Uh oh!

openshift-merge-bot Bot commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Summary

Test plan

Uh oh!

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

Uh oh!

Review skipped

Uh oh!

openshift-ci Bot commented May 25, 2026

Uh oh!

enxebre commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Summary

Test plan

Uh oh!

openshift-ci-robot commented May 25, 2026

Uh oh!

enxebre commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Uh oh!

enxebre commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Summary

Test plan

Uh oh!

enxebre commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Uh oh!

enxebre commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Uh oh!

enxebre commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Uh oh!

enxebre commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Uh oh!

enxebre commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Uh oh!

jparrill commented May 26, 2026

Uh oh!

jiezhao16 commented May 27, 2026

Uh oh!

openshift-ci-robot commented May 27, 2026

Uh oh!

csrwng commented May 27, 2026

Uh oh!

openshift-merge-bot Bot commented May 27, 2026

Uh oh!

openshift-ci Bot commented May 27, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented May 27, 2026

Summary

Test plan

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

coderabbitai Bot commented May 25, 2026 •

edited

Loading