Skip to content

OCPBUGS-81161: [release-4.19] fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled#8093

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.19from
arolika:raradi/cherry-pick-8014-to-release-4.19
Apr 2, 2026
Merged

OCPBUGS-81161: [release-4.19] fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled#8093
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.19from
arolika:raradi/cherry-pick-8014-to-release-4.19

Conversation

@arolika
Copy link
Copy Markdown

@arolika arolika commented Mar 27, 2026

What this PR does / why we need it:

This is a backport PR to release-4.19 branch. I'm opening this because the [cherrypick PR had merge conflicts.](#8083)
[Original PR can be found here.](#8001)

On IBM Cloud the servicePublishingStrategy: Route can't assume that the management cluster is an OCP cluster, because it still has vanilla k8s management clusters.
When running on vanilla Kubernetes on IBM Cloud (which doesn't have Route CRDs), the operator crashes during reconciliation when attempting to list Route resources.
HyperShift on IBM Cloud should work on both OpenShift and vanilla Kubernetes (IBM Cloud) management clusters, gracefully handling the absence of optional APIs like Route.

The fix is an extra check in the removeHCPIngressFromRoutes() function to return early if the management cluster has no Route capability.

Which issue(s) this PR fixes:

Fixes #OCPBUGS-78778

Special notes for your reviewer:

Checklist:

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

…s disabled

Prevents reconciliation failures on vanilla Kubernetes clusters on IBM Cloud by avoiding route listing operations when Route CRDs are not available.
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 27, 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 Mar 27, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@arolika: This pull request references Jira Issue OCPBUGS-80950, which is invalid:

  • expected the bug to target either version "4.19." or "openshift-4.19.", but it targets "4.20.z" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead
  • expected dependent Jira Issue OCPBUGS-78933 to target a version in 4.20.0, 4.20.z, but it targets "4.21.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.

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

Details

In response to this:

OCPBUGS-78778: fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled - 4.19 backport

What this PR does / why we need it:

This is a backport PR to release-4.19 branch. I'm opening this because the [cherrypick PR had merge conflicts.](#8083)
[Original PR can be found here.](#8001)

On IBM Cloud the servicePublishingStrategy: Route can't assume that the management cluster is an OCP cluster, because it still has vanilla k8s management clusters.
When running on vanilla Kubernetes on IBM Cloud (which doesn't have Route CRDs), the operator crashes during reconciliation when attempting to list Route resources.
HyperShift on IBM Cloud should work on both OpenShift and vanilla Kubernetes (IBM Cloud) management clusters, gracefully handling the absence of optional APIs like Route.

The fix is an extra check in the removeHCPIngressFromRoutes() function to return early if the management cluster has no Route capability.

Which issue(s) this PR fixes:

Fixes #OCPBUGS-78778

Special notes for your reviewer:

Checklist:

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

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
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Mar 27, 2026

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: 2fb02fc5-7a81-4ba0-ae45-7c51826db22d

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci openshift-ci Bot added do-not-merge/needs-area needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 27, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 27, 2026

Hi @arolika. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-ci openshift-ci Bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Mar 27, 2026
@arolika
Copy link
Copy Markdown
Author

arolika commented Mar 27, 2026

/retitle [release-4.19] fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 27, 2026

@arolika: Re-titling can only be requested by trusted users, like repository collaborators.

Details

In response to this:

/retitle [release-4.19] fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled

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.

@matlaj
Copy link
Copy Markdown
Contributor

matlaj commented Mar 27, 2026

/retitle [release-4.19] fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled

@openshift-ci openshift-ci Bot changed the title [release-4.19] OCPBUGS-80950: fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled [release-4.19] fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled Mar 27, 2026
@openshift-ci-robot openshift-ci-robot removed 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 Mar 27, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@arolika: 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:

What this PR does / why we need it:

This is a backport PR to release-4.19 branch. I'm opening this because the [cherrypick PR had merge conflicts.](#8083)
[Original PR can be found here.](#8001)

On IBM Cloud the servicePublishingStrategy: Route can't assume that the management cluster is an OCP cluster, because it still has vanilla k8s management clusters.
When running on vanilla Kubernetes on IBM Cloud (which doesn't have Route CRDs), the operator crashes during reconciliation when attempting to list Route resources.
HyperShift on IBM Cloud should work on both OpenShift and vanilla Kubernetes (IBM Cloud) management clusters, gracefully handling the absence of optional APIs like Route.

The fix is an extra check in the removeHCPIngressFromRoutes() function to return early if the management cluster has no Route capability.

Which issue(s) this PR fixes:

Fixes #OCPBUGS-78778

Special notes for your reviewer:

Checklist:

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

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.

@arolika
Copy link
Copy Markdown
Author

arolika commented Mar 27, 2026

/jira cherry-pick OCPBUGS-80950

@openshift-ci-robot
Copy link
Copy Markdown

@arolika: Jira Issue OCPBUGS-80950 has been cloned as Jira Issue OCPBUGS-81161. Will retitle bug to link to clone.
/retitle OCPBUGS-81161: [release-4.19] fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled

Details

In response to this:

/jira cherry-pick OCPBUGS-80950

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.19] fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled OCPBUGS-81161: [release-4.19] fix(cpo): Don't remove HCP Ingress from routes when CapabilityRoute is disabled Mar 27, 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 Mar 27, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@arolika: This pull request references Jira Issue OCPBUGS-81161, which is invalid:

  • expected dependent Jira Issue OCPBUGS-80950 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA 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:

What this PR does / why we need it:

This is a backport PR to release-4.19 branch. I'm opening this because the [cherrypick PR had merge conflicts.](#8083)
[Original PR can be found here.](#8001)

On IBM Cloud the servicePublishingStrategy: Route can't assume that the management cluster is an OCP cluster, because it still has vanilla k8s management clusters.
When running on vanilla Kubernetes on IBM Cloud (which doesn't have Route CRDs), the operator crashes during reconciliation when attempting to list Route resources.
HyperShift on IBM Cloud should work on both OpenShift and vanilla Kubernetes (IBM Cloud) management clusters, gracefully handling the absence of optional APIs like Route.

The fix is an extra check in the removeHCPIngressFromRoutes() function to return early if the management cluster has no Route capability.

Which issue(s) this PR fixes:

Fixes #OCPBUGS-78778

Special notes for your reviewer:

Checklist:

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

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.

@matlaj
Copy link
Copy Markdown
Contributor

matlaj commented Mar 27, 2026

/lgtm
/ok-to-test
/verified by TestRemoveHCPIngressFromRoutes,@arolika

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 27, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 27, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@matlaj: This PR has been marked as verified by TestRemoveHCPIngressFromRoutes,@arolika.

Details

In response to this:

/lgtm
/ok-to-test
/verified by TestRemoveHCPIngressFromRoutes,@arolika

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 added the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2026
@arolika
Copy link
Copy Markdown
Author

arolika commented Mar 27, 2026

As discussed privately with @matlaj, I verified this PR on IBM Cloud by deploying a version 4.19 hosted cluster with the changes. The fix functions as intended and I observed no regressions.

@matlaj
Copy link
Copy Markdown
Contributor

matlaj commented Mar 27, 2026

/retest

1 similar comment
@matlaj
Copy link
Copy Markdown
Contributor

matlaj commented Mar 28, 2026

/retest

@TwoDCube
Copy link
Copy Markdown
Member

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Mar 29, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@TwoDCube: This pull request references Jira Issue OCPBUGS-81161, 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.19.z) matches configured target version for branch (4.19.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-80950 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-80950 targets the "4.20.z" version, which is one of the valid target versions: 4.20.0, 4.20.z
  • 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.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Mar 29, 2026
@TwoDCube
Copy link
Copy Markdown
Member

/ok-to-test

@TwoDCube
Copy link
Copy Markdown
Member

/retest

Copy link
Copy Markdown
Contributor

@rtheis rtheis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@arolika arolika marked this pull request as ready for review March 30, 2026 11:18
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 30, 2026
@openshift-ci openshift-ci Bot requested review from hasueki and rtheis March 30, 2026 11:18
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 30, 2026

@arolika: 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
Copy link
Copy Markdown
Contributor

sjenning commented Apr 2, 2026

/approve

@sjenning sjenning added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 2, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 2, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arolika, rtheis, sjenning

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 2, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 5b151f0 into openshift:release-4.19 Apr 2, 2026
18 checks passed
@openshift-ci-robot
Copy link
Copy Markdown

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

What this PR does / why we need it:

This is a backport PR to release-4.19 branch. I'm opening this because the [cherrypick PR had merge conflicts.](#8083)
[Original PR can be found here.](#8001)

On IBM Cloud the servicePublishingStrategy: Route can't assume that the management cluster is an OCP cluster, because it still has vanilla k8s management clusters.
When running on vanilla Kubernetes on IBM Cloud (which doesn't have Route CRDs), the operator crashes during reconciliation when attempting to list Route resources.
HyperShift on IBM Cloud should work on both OpenShift and vanilla Kubernetes (IBM Cloud) management clusters, gracefully handling the absence of optional APIs like Route.

The fix is an extra check in the removeHCPIngressFromRoutes() function to return early if the management cluster has no Route capability.

Which issue(s) this PR fixes:

Fixes #OCPBUGS-78778

Special notes for your reviewer:

Checklist:

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

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
Copy link
Copy Markdown
Contributor

Fix included in accepted release 4.19.0-0.nightly-2026-04-07-220324

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/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants