Skip to content

OCPBUGS-75931: [release-4.20] fix(cpo): Correct route labeling logic for HCP router infrastructure#7642

Open
csrwng wants to merge 1 commit intoopenshift:release-4.20from
csrwng:private_router_fix_420
Open

OCPBUGS-75931: [release-4.20] fix(cpo): Correct route labeling logic for HCP router infrastructure#7642
csrwng wants to merge 1 commit intoopenshift:release-4.20from
csrwng:private_router_fix_420

Conversation

@csrwng
Copy link
Contributor

@csrwng csrwng commented Feb 5, 2026

Manual backport of #7641

@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 Feb 5, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 5, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Feb 5, 2026

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.

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
  • Post copyable unit tests in a comment

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

@csrwng
Copy link
Contributor Author

csrwng commented Feb 5, 2026

/test verify
/test unit

@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 5, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 5, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng

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/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Feb 5, 2026
@csrwng
Copy link
Contributor Author

csrwng commented Feb 5, 2026

/jira cherry-pick OCPBUGS-75930

@openshift-ci-robot
Copy link

@csrwng: Jira Issue OCPBUGS-75930 has been cloned as Jira Issue OCPBUGS-75931. Will retitle bug to link to clone.
/retitle OCPBUGS-75931: [release-4.20] fix(cpo): Correct route labeling logic for HCP router infrastructure

Details

In response to this:

/jira cherry-pick OCPBUGS-75930

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.20] fix(cpo): Correct route labeling logic for HCP router infrastructure OCPBUGS-75931: [release-4.20] fix(cpo): Correct route labeling logic for HCP router infrastructure Feb 5, 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 5, 2026
@openshift-ci-robot
Copy link

@csrwng: This pull request references Jira Issue OCPBUGS-75931, which is invalid:

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

Manual backport of #7641

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 csrwng force-pushed the private_router_fix_420 branch from 6316ce8 to 14d91ca Compare February 5, 2026 19:43
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 5, 2026
@csrwng csrwng force-pushed the private_router_fix_420 branch from 14d91ca to 88f92ce Compare February 8, 2026 03:29
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 8, 2026
@csrwng
Copy link
Contributor Author

csrwng commented Feb 8, 2026

/make test
/make verify

@csrwng csrwng force-pushed the private_router_fix_420 branch 2 times, most recently from 26a80af to 5844d49 Compare February 10, 2026 18:28
@csrwng csrwng force-pushed the private_router_fix_420 branch from 5844d49 to 2ff9e18 Compare February 17, 2026 23:22
@csrwng csrwng marked this pull request as ready for review February 19, 2026 22:36
@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 Feb 19, 2026
@openshift-ci openshift-ci bot requested review from enxebre and hasueki February 19, 2026 22:37
@csrwng csrwng added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Feb 19, 2026
@csrwng csrwng force-pushed the private_router_fix_420 branch from 2ff9e18 to 0eb3400 Compare February 20, 2026 03:21
…ions

Fixed upgrade failures caused by unexpected router LoadBalancer creation. Previous logic incorrectly made
per-service route labeling decisions, creating router infrastructure even when routes should use the management
cluster router.

Changed route labeling to cluster-level decision based on KAS publishing strategy. Routes now use HCP router
only when: (1) cluster uses PrivateLink, OR (2) cluster is public with dedicated DNS for KAS.

Added LabelHCPRoutes() as single source of truth. Removed per-service DNS helper functions and IsPublicWithDNS()
functions that caused inconsistent labeling.

Signed-off-by: Cesar Wong <cewong@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
@csrwng csrwng force-pushed the private_router_fix_420 branch from 0eb3400 to 4d705c4 Compare February 20, 2026 16:21
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 20, 2026

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

@csrwng
Copy link
Contributor Author

csrwng commented Feb 27, 2026

/jira refresh

@openshift-ci-robot
Copy link

@csrwng: This pull request references Jira Issue OCPBUGS-75931, which is invalid:

  • expected dependent Jira Issue OCPBUGS-75930 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.

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.

@csrwng
Copy link
Contributor Author

csrwng commented Feb 27, 2026

/verified later @heliubj18

@openshift-ci-robot openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Feb 27, 2026
@openshift-ci-robot
Copy link

@csrwng: This PR has been marked to be verified later by @heliubj18.

Details

In response to this:

/verified later @heliubj18

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
Copy link
Member

enxebre commented Feb 27, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 27, 2026
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 area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria verified-later

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants