Skip to content

OCPBUGS-89231: [release-4.22] reconcile HCP when pull secret is unavailable#8743

Closed
bryan-cox wants to merge 1 commit into
openshift:release-4.22from
bryan-cox:OCPBUGS-89231
Closed

OCPBUGS-89231: [release-4.22] reconcile HCP when pull secret is unavailable#8743
bryan-cox wants to merge 1 commit into
openshift:release-4.22from
bryan-cox:OCPBUGS-89231

Conversation

@bryan-cox

Copy link
Copy Markdown
Member

Summary

Cherry-pick of #8352 to release-4.22.

When a pull secret is unavailable, the HostedCluster reconciler was exiting early without reconciling the HostedControlPlane. This meant changes like NodeSelector updates were silently dropped until the pull secret was restored.

The fix reconciles the HCP before returning the pull secret error, so pod placement changes propagate independently of pull secret state.

Bug: https://redhat.atlassian.net/browse/OCPBUGS-89231
Original fix: #8352 (OCPBUGS-77268)

Why backport?

  • The operator fix is needed on release-4.22 for day-2 resilience
  • TestPullSecretUnavailable (from hypershift-tests:latest built on main) permafails against release-4.22 operator without this fix
  • Cherry-pick applies cleanly with no conflicts

When the pull secret is missing or invalid, the HostedCluster reconciler
exits before reaching reconcileHostedControlPlane. This prevents
RequestServingNodeAdditionalSelector and other spec fields from being
propagated to the HCP, breaking HA scheduling for request-serving nodes.

Log the error and call reconcileHostedControlPlane before returning so
pod placement decisions continue during a pull secret outage. The error
is still returned to trigger a requeue for full reconciliation once the
pull secret is restored.

JIRA: OCPBUGS-77268
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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 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 Jun 16, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bryan-cox: This pull request references Jira Issue OCPBUGS-89231, which is invalid:

  • expected the bug to target the "4.22.0" version, but no target version was set
  • 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-89231 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

Cherry-pick of #8352 to release-4.22.

When a pull secret is unavailable, the HostedCluster reconciler was exiting early without reconciling the HostedControlPlane. This meant changes like NodeSelector updates were silently dropped until the pull secret was restored.

The fix reconciles the HCP before returning the pull secret error, so pod placement changes propagate independently of pull secret state.

Bug: https://redhat.atlassian.net/browse/OCPBUGS-89231
Original fix: #8352 (OCPBUGS-77268)

Why backport?

  • The operator fix is needed on release-4.22 for day-2 resilience
  • TestPullSecretUnavailable (from hypershift-tests:latest built on main) permafails against release-4.22 operator without this fix
  • Cherry-pick applies cleanly with no conflicts

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 Jun 16, 2026

Copy link
Copy Markdown
Contributor

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: 961796a9-446e-4531-ad31-d748e2976a89

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 devguyio and jparrill June 16, 2026 18:20
@openshift-ci openshift-ci Bot added the area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release label Jun 16, 2026
@openshift-ci

openshift-ci Bot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

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

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

@openshift-ci openshift-ci Bot added area/testing Indicates the PR includes changes for e2e testing approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Jun 16, 2026
@bryan-cox

Copy link
Copy Markdown
Member Author

Closing - the original fix (OCPBUGS-77268) targets 5.0 only with no backport planned. The right fix is to version-gate the test instead. See #8744.

@bryan-cox bryan-cox closed this Jun 16, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bryan-cox: This pull request references Jira Issue OCPBUGS-89231. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

Cherry-pick of #8352 to release-4.22.

When a pull secret is unavailable, the HostedCluster reconciler was exiting early without reconciling the HostedControlPlane. This meant changes like NodeSelector updates were silently dropped until the pull secret was restored.

The fix reconciles the HCP before returning the pull secret error, so pod placement changes propagate independently of pull secret state.

Bug: https://redhat.atlassian.net/browse/OCPBUGS-89231
Original fix: #8352 (OCPBUGS-77268)

Why backport?

  • The operator fix is needed on release-4.22 for day-2 resilience
  • TestPullSecretUnavailable (from hypershift-tests:latest built on main) permafails against release-4.22 operator without this fix
  • Cherry-pick applies cleanly with no conflicts

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/testing Indicates the PR includes changes for e2e testing 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

Development

Successfully merging this pull request may close these issues.

3 participants