Skip to content

OCPBUGS-105434: [release-4.21] fix router component ordering to prevent missing HAProxy backends - #9263

Merged
openshift-merge-bot[bot] merged 6 commits into
openshift:release-4.21from
bennerv:cherry-pick-OCPBUGS-98213-to-release-4.21
Aug 11, 2026
Merged

OCPBUGS-105434: [release-4.21] fix router component ordering to prevent missing HAProxy backends#9263
openshift-merge-bot[bot] merged 6 commits into
openshift:release-4.21from
bennerv:cherry-pick-OCPBUGS-98213-to-release-4.21

Conversation

@bennerv

@bennerv bennerv commented Aug 7, 2026

Copy link
Copy Markdown
Member

Summary

Cherry-pick of PR #8971 to release-4.21 with manual conflict resolution and adaptation fixes.

  • Moves router component registration after all route-creating components (ignition-server) so the HAProxy config includes every route on the first reconcile pass
  • Adds router predicate on ARO-HCP to wait for expected routes before reconciling
  • Excludes ignition-server and ignition-server-proxy from implicit KAS dependency
  • Conditionally includes oauth-internal in ARO route predicate

Commits

  • 77e577f6c4: fix(control-plane-operator): ensure router component runs after route-creating components
  • c995ad02f6: fix(control-plane-operator): drop metrics-proxy from router WithDependencies
  • 2b9df60b2f: fix(control-plane-component): exclude ignition-server from implicit KAS dependency
  • 00e36f3406: fix(router): conditionally include oauth-internal in ARO route predicate
  • d565a6ed5b: fix(control-plane-component): exclude ignition-server-proxy from implicit KAS dependency

Fixes Applied

  • Resolved merge conflict in hostedcontrolplane_controller.go (router positioned after ignitionproxyv2; endpoint_resolver, metrics_proxy, kubestorageversionmigrator components do not exist on release-4.21)
  • Resolved merge conflict in hostedcontrolplane_controller_test.go (test functions present on main but not on release-4.21)
  • Removed endpointresolverv2 and metricsProxyRouteRequired (endpoint_resolver package and MetricsForwarding API do not exist on release-4.21)
  • Replaced azureutil.IsAroHCPByHCP with azureutil.IsAroHCP (ByHCP variant does not exist on release-4.21)
  • Removed AzureTopologyPrivate from test helper (type does not exist on release-4.21)
  • Added SwiftPodNetworkInstanceAnnotation and SetAsAroHCPTest to ARO test cases (IsPrivateHCP/IsAroHCP are env-var based on release-4.21)
  • Used FakeReleaseProvider instead of gomock-generated mock (mock file not generated on release-4.21)

References

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com

OpenShift CI Bot and others added 5 commits August 7, 2026 09:48
…-creating components

Add a predicate to the router component that ensures all expected HCP
router routes exist and are ready before reconciling on ARO-HCP clusters.
This includes kube-apiserver-internal, konnectivity-server, oauth-internal,
ignition-server, and conditionally metrics-proxy when metrics forwarding
is enabled.

The router also declares explicit WithDependencies on ignition-server and
metrics-proxy components to give the informer cache more time to sync
after those components create their routes via server-side apply.

Add a TODO for introducing live reloading (like shared proxy) so the
router config is updated when routes change after the initial reconcile.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…dencies

The metrics-proxy component is conditional (only created when
MetricsForwarding.Mode=Forward), so declaring it as a hard dependency
causes a deadlock on platforms where it is never instantiated (e.g. GKE).
The router predicate already ensures metrics-proxy routes exist before
reconciling, making the explicit dependency unnecessary.

Update all 5 router fixture YAML files to match the actual declared
dependency (ignition-server only).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…AS dependency

The ignition-server only needs the management cluster KAS (via its
service account token), not the hosted cluster KAS. Including it in
the implicit KAS dependency creates a deadlock on private clusters
with KMS encryption (e.g. Azure ARO-HCP with private Key Vault):

  Router → ignition-server → KAS → Router (for KMS connectivity)

By excluding ignition-server from the KAS dependency, its deployment
and route are created independently, unblocking the router, which in
turn provides the network path KAS needs to reach the KMS endpoint.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The oauth-internal route is only created by the infra reconciler when
OAuth is enabled (HCPOAuthEnabled). When OAuth is disabled (e.g. OIDC
authentication), the route is never created, causing the ARO router
predicate to wait forever — a deadlock.

Move oauth-internal from the unconditional base list to a conditional
append gated on HCPOAuthEnabled, matching how the infra reconciler
decides whether to create the route.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…icit KAS dependency

The ignition-server-proxy component does not need the hosted KAS —
it only proxies to the ignition-server, which is already excluded.
Including it in the implicit KAS dependency creates the same deadlock
as ignition-server on private clusters with KMS encryption: the router
waits for the ignition-server-proxy Service to exist, but ignition-
server-proxy waits for KAS, which waits for the router.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@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 Aug 7, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bennerv: This pull request references Jira Issue OCPBUGS-98213, which is invalid:

  • expected the bug to target either version "4.21." or "openshift-4.21.", but it targets "5.0.0" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
  • expected Jira Issue OCPBUGS-98213 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 PR #8971 to release-4.21 with manual conflict resolution and adaptation fixes.

  • Moves router component registration after all route-creating components (ignition-server) so the HAProxy config includes every route on the first reconcile pass
  • Adds router predicate on ARO-HCP to wait for expected routes before reconciling
  • Excludes ignition-server and ignition-server-proxy from implicit KAS dependency
  • Conditionally includes oauth-internal in ARO route predicate

Commits

  • 77e577f6c4: fix(control-plane-operator): ensure router component runs after route-creating components
  • c995ad02f6: fix(control-plane-operator): drop metrics-proxy from router WithDependencies
  • 2b9df60b2f: fix(control-plane-component): exclude ignition-server from implicit KAS dependency
  • 00e36f3406: fix(router): conditionally include oauth-internal in ARO route predicate
  • d565a6ed5b: fix(control-plane-component): exclude ignition-server-proxy from implicit KAS dependency

Fixes Applied

  • Resolved merge conflict in hostedcontrolplane_controller.go (router positioned after ignitionproxyv2; endpoint_resolver, metrics_proxy, kubestorageversionmigrator components do not exist on release-4.21)
  • Resolved merge conflict in hostedcontrolplane_controller_test.go (test functions present on main but not on release-4.21)
  • Removed endpointresolverv2 and metricsProxyRouteRequired (endpoint_resolver package and MetricsForwarding API do not exist on release-4.21)
  • Replaced azureutil.IsAroHCPByHCP with azureutil.IsAroHCP (ByHCP variant does not exist on release-4.21)
  • Removed AzureTopologyPrivate from test helper (type does not exist on release-4.21)
  • Added SwiftPodNetworkInstanceAnnotation and SetAsAroHCPTest to ARO test cases (IsPrivateHCP/IsAroHCP are env-var based on release-4.21)
  • Used FakeReleaseProvider instead of gomock-generated mock (mock file not generated on release-4.21)

References

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com

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 Aug 7, 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: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 13c57b98-a7d3-4751-92e7-8d4a73a91004

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

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

@bennerv

bennerv commented Aug 7, 2026

Copy link
Copy Markdown
Member Author

/jira cherrypick OCPBUGS-98213

@openshift-ci
openshift-ci Bot requested review from bryan-cox and enxebre August 7, 2026 16:02
@openshift-ci openshift-ci Bot added 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 and removed do-not-merge/needs-area labels Aug 7, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bennerv: Jira Issue OCPBUGS-98213 has been cloned as Jira Issue OCPBUGS-105434. Will retitle bug to link to clone.
/retitle OCPBUGS-105434: OCPBUGS-98213: [release-4.21] fix router component ordering to prevent missing HAProxy backends

Details

In response to this:

/jira cherrypick OCPBUGS-98213

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 OCPBUGS-98213: [release-4.21] fix router component ordering to prevent missing HAProxy backends OCPBUGS-105434: OCPBUGS-98213: [release-4.21] fix router component ordering to prevent missing HAProxy backends Aug 7, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bennerv: This pull request references Jira Issue OCPBUGS-105434, which is invalid:

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 PR #8971 to release-4.21 with manual conflict resolution and adaptation fixes.

  • Moves router component registration after all route-creating components (ignition-server) so the HAProxy config includes every route on the first reconcile pass
  • Adds router predicate on ARO-HCP to wait for expected routes before reconciling
  • Excludes ignition-server and ignition-server-proxy from implicit KAS dependency
  • Conditionally includes oauth-internal in ARO route predicate

Commits

  • 77e577f6c4: fix(control-plane-operator): ensure router component runs after route-creating components
  • c995ad02f6: fix(control-plane-operator): drop metrics-proxy from router WithDependencies
  • 2b9df60b2f: fix(control-plane-component): exclude ignition-server from implicit KAS dependency
  • 00e36f3406: fix(router): conditionally include oauth-internal in ARO route predicate
  • d565a6ed5b: fix(control-plane-component): exclude ignition-server-proxy from implicit KAS dependency

Fixes Applied

  • Resolved merge conflict in hostedcontrolplane_controller.go (router positioned after ignitionproxyv2; endpoint_resolver, metrics_proxy, kubestorageversionmigrator components do not exist on release-4.21)
  • Resolved merge conflict in hostedcontrolplane_controller_test.go (test functions present on main but not on release-4.21)
  • Removed endpointresolverv2 and metricsProxyRouteRequired (endpoint_resolver package and MetricsForwarding API do not exist on release-4.21)
  • Replaced azureutil.IsAroHCPByHCP with azureutil.IsAroHCP (ByHCP variant does not exist on release-4.21)
  • Removed AzureTopologyPrivate from test helper (type does not exist on release-4.21)
  • Added SwiftPodNetworkInstanceAnnotation and SetAsAroHCPTest to ARO test cases (IsPrivateHCP/IsAroHCP are env-var based on release-4.21)
  • Used FakeReleaseProvider instead of gomock-generated mock (mock file not generated on release-4.21)

References

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com

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.

@bennerv

bennerv commented Aug 7, 2026

Copy link
Copy Markdown
Member Author

/jira cherrypick OCPBUGS-101964

@openshift-ci-robot

Copy link
Copy Markdown

@bennerv: Jira Issue OCPBUGS-101964 has been cloned as Jira Issue OCPBUGS-105435. Will retitle bug to link to clone.
/retitle OCPBUGS-105435: OCPBUGS-105434: OCPBUGS-98213: [release-4.21] fix router component ordering to prevent missing HAProxy backends

Details

In response to this:

/jira cherrypick OCPBUGS-101964

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 OCPBUGS-105434: OCPBUGS-98213: [release-4.21] fix router component ordering to prevent missing HAProxy backends OCPBUGS-105435: OCPBUGS-105434: OCPBUGS-98213: [release-4.21] fix router component ordering to prevent missing HAProxy backends Aug 7, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bennerv: This pull request references Jira Issue OCPBUGS-105435, which is invalid:

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

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 PR #8971 to release-4.21 with manual conflict resolution and adaptation fixes.

  • Moves router component registration after all route-creating components (ignition-server) so the HAProxy config includes every route on the first reconcile pass
  • Adds router predicate on ARO-HCP to wait for expected routes before reconciling
  • Excludes ignition-server and ignition-server-proxy from implicit KAS dependency
  • Conditionally includes oauth-internal in ARO route predicate

Commits

  • 77e577f6c4: fix(control-plane-operator): ensure router component runs after route-creating components
  • c995ad02f6: fix(control-plane-operator): drop metrics-proxy from router WithDependencies
  • 2b9df60b2f: fix(control-plane-component): exclude ignition-server from implicit KAS dependency
  • 00e36f3406: fix(router): conditionally include oauth-internal in ARO route predicate
  • d565a6ed5b: fix(control-plane-component): exclude ignition-server-proxy from implicit KAS dependency

Fixes Applied

  • Resolved merge conflict in hostedcontrolplane_controller.go (router positioned after ignitionproxyv2; endpoint_resolver, metrics_proxy, kubestorageversionmigrator components do not exist on release-4.21)
  • Resolved merge conflict in hostedcontrolplane_controller_test.go (test functions present on main but not on release-4.21)
  • Removed endpointresolverv2 and metricsProxyRouteRequired (endpoint_resolver package and MetricsForwarding API do not exist on release-4.21)
  • Replaced azureutil.IsAroHCPByHCP with azureutil.IsAroHCP (ByHCP variant does not exist on release-4.21)
  • Removed AzureTopologyPrivate from test helper (type does not exist on release-4.21)
  • Added SwiftPodNetworkInstanceAnnotation and SetAsAroHCPTest to ARO test cases (IsPrivateHCP/IsAroHCP are env-var based on release-4.21)
  • Used FakeReleaseProvider instead of gomock-generated mock (mock file not generated on release-4.21)

References

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com

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.

@bennerv bennerv changed the title OCPBUGS-105435: OCPBUGS-105434: OCPBUGS-98213: [release-4.21] fix router component ordering to prevent missing HAProxy backends OCPBUGS-105434: OCPBUGS-98213: [release-4.21] fix router component ordering to prevent missing HAProxy backends Aug 7, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bennerv: This pull request references Jira Issue OCPBUGS-105434, which is invalid:

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:

Summary

Cherry-pick of PR #8971 to release-4.21 with manual conflict resolution and adaptation fixes.

  • Moves router component registration after all route-creating components (ignition-server) so the HAProxy config includes every route on the first reconcile pass
  • Adds router predicate on ARO-HCP to wait for expected routes before reconciling
  • Excludes ignition-server and ignition-server-proxy from implicit KAS dependency
  • Conditionally includes oauth-internal in ARO route predicate

Commits

  • 77e577f6c4: fix(control-plane-operator): ensure router component runs after route-creating components
  • c995ad02f6: fix(control-plane-operator): drop metrics-proxy from router WithDependencies
  • 2b9df60b2f: fix(control-plane-component): exclude ignition-server from implicit KAS dependency
  • 00e36f3406: fix(router): conditionally include oauth-internal in ARO route predicate
  • d565a6ed5b: fix(control-plane-component): exclude ignition-server-proxy from implicit KAS dependency

Fixes Applied

  • Resolved merge conflict in hostedcontrolplane_controller.go (router positioned after ignitionproxyv2; endpoint_resolver, metrics_proxy, kubestorageversionmigrator components do not exist on release-4.21)
  • Resolved merge conflict in hostedcontrolplane_controller_test.go (test functions present on main but not on release-4.21)
  • Removed endpointresolverv2 and metricsProxyRouteRequired (endpoint_resolver package and MetricsForwarding API do not exist on release-4.21)
  • Replaced azureutil.IsAroHCPByHCP with azureutil.IsAroHCP (ByHCP variant does not exist on release-4.21)
  • Removed AzureTopologyPrivate from test helper (type does not exist on release-4.21)
  • Added SwiftPodNetworkInstanceAnnotation and SetAsAroHCPTest to ARO test cases (IsPrivateHCP/IsAroHCP are env-var based on release-4.21)
  • Used FakeReleaseProvider instead of gomock-generated mock (mock file not generated on release-4.21)

References

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com

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.

- Remove endpoint_resolver and metrics_proxy references (packages do
  not exist on release-4.21)
- Remove metricsProxyRouteRequired and related tests (MetricsForwarding
  API does not exist on release-4.21)
- Replace azureutil.IsAroHCPByHCP with azureutil.IsAroHCP (ByHCP
  variant does not exist on release-4.21)
- Remove AzureTopologyPrivate from test helper (type does not exist on
  release-4.21)
- Add SwiftPodNetworkInstanceAnnotation to aroHCP test helper and
  SetAsAroHCPTest calls (IsPrivateHCP checks env var on release-4.21)
- Use FakeReleaseProvider instead of gomock-generated mock (mock file
  not generated on release-4.21)
- Only check ignitionserverv2.ComponentName in router ordering test
  (metricsproxyv2 does not exist on release-4.21)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@bennerv
bennerv force-pushed the cherry-pick-OCPBUGS-98213-to-release-4.21 branch from 7b97370 to cc36777 Compare August 7, 2026 16:51
@twolff-gh

Copy link
Copy Markdown
Contributor

/verified by @twolff-gh

Single rollout, complete HAProxy config from the first reconcile.

CPO override test cluster (4.21, cpo-override-2512) showed 1 configmap create, no subsequent CPO updates, single replicaset.

kubeAudit for router configmap:

8/7/2026, 8:05:37.084341 PM    create    router    system:serviceaccount:...:control-plane-operator       201
8/7/2026, 8:05:37.541385 PM    watch     router    system:node:aks-userswft1-19893488-vmss000002          200
8/7/2026, 8:05:37.834408 PM    watch     router    system:node:aks-userswft3-18449413-vmss000003          200
8/7/2026, 8:05:37.857532 PM    watch     router    system:node:aks-userswft2-12928830-vmss000002          200
8/7/2026, 8:22:27.60302 PM     get       router    system:serviceaccount:kube-system:generic-garbage-collector    200
8/7/2026, 8:22:27.623716 PM    delete    router    system:serviceaccount:kube-system:generic-garbage-collector    200

Prow e2e-parallel:
https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/Azure_ARO-HCP/6418/pull-ci-Azure-ARO-HCP-main-e2e-parallel/2085803575245541376

@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 Aug 10, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bryan-cox: This pull request references Jira Issue OCPBUGS-105434, 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 type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-101964 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-101964 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.

@celebdor

Copy link
Copy Markdown
Collaborator

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

@celebdor: This pull request references Jira Issue OCPBUGS-105434, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-101964 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-101964 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.

@celebdor

Copy link
Copy Markdown
Collaborator

/jira refresh

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

Copy link
Copy Markdown

@celebdor: This pull request references Jira Issue OCPBUGS-105434, which is invalid:

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 csrwng added approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Aug 11, 2026
@csrwng

csrwng commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

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

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.

@bryan-cox

Copy link
Copy Markdown
Member

/jira refresh

@openshift-ci-robot 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 Aug 11, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bryan-cox: This pull request references Jira Issue OCPBUGS-105434, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-101964 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-101964 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.

@bryan-cox bryan-cox left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm

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

openshift-ci Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bennerv, 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-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test verify-deps

@openshift-ci

openshift-ci Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@bennerv: 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-merge-bot
openshift-merge-bot Bot merged commit 9b020a0 into openshift:release-4.21 Aug 11, 2026
19 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@bennerv: Jira Issue Verification Checks: Jira Issue OCPBUGS-105434
✔️ 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-105434 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 PR #8971 to release-4.21 with manual conflict resolution and adaptation fixes.

  • Moves router component registration after all route-creating components (ignition-server) so the HAProxy config includes every route on the first reconcile pass
  • Adds router predicate on ARO-HCP to wait for expected routes before reconciling
  • Excludes ignition-server and ignition-server-proxy from implicit KAS dependency
  • Conditionally includes oauth-internal in ARO route predicate

Commits

  • 77e577f6c4: fix(control-plane-operator): ensure router component runs after route-creating components
  • c995ad02f6: fix(control-plane-operator): drop metrics-proxy from router WithDependencies
  • 2b9df60b2f: fix(control-plane-component): exclude ignition-server from implicit KAS dependency
  • 00e36f3406: fix(router): conditionally include oauth-internal in ARO route predicate
  • d565a6ed5b: fix(control-plane-component): exclude ignition-server-proxy from implicit KAS dependency

Fixes Applied

  • Resolved merge conflict in hostedcontrolplane_controller.go (router positioned after ignitionproxyv2; endpoint_resolver, metrics_proxy, kubestorageversionmigrator components do not exist on release-4.21)
  • Resolved merge conflict in hostedcontrolplane_controller_test.go (test functions present on main but not on release-4.21)
  • Removed endpointresolverv2 and metricsProxyRouteRequired (endpoint_resolver package and MetricsForwarding API do not exist on release-4.21)
  • Replaced azureutil.IsAroHCPByHCP with azureutil.IsAroHCP (ByHCP variant does not exist on release-4.21)
  • Removed AzureTopologyPrivate from test helper (type does not exist on release-4.21)
  • Added SwiftPodNetworkInstanceAnnotation and SetAsAroHCPTest to ARO test cases (IsPrivateHCP/IsAroHCP are env-var based on release-4.21)
  • Used FakeReleaseProvider instead of gomock-generated mock (mock file not generated on release-4.21)

References

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com

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 release 4.21.0-0.nightly-2026-08-11-211246

@bennerv

bennerv commented Aug 25, 2026

Copy link
Copy Markdown
Member Author

/cherry-pick release-4.20

@bennerv
bennerv deleted the cherry-pick-OCPBUGS-98213-to-release-4.21 branch August 25, 2026 19:31
@openshift-cherrypick-robot

Copy link
Copy Markdown

@bennerv: #9263 failed to apply on top of branch "release-4.20":

Applying: fix(control-plane-operator): ensure router component runs after route-creating components
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
M	control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
M	control-plane-operator/controllers/hostedcontrolplane/testdata/router/AROSwift/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yaml
A	control-plane-operator/controllers/hostedcontrolplane/testdata/router/GCP/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yaml
M	control-plane-operator/controllers/hostedcontrolplane/testdata/router/IBMCloud/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yaml
M	control-plane-operator/controllers/hostedcontrolplane/testdata/router/TechPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yaml
M	control-plane-operator/controllers/hostedcontrolplane/testdata/router/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yaml
M	control-plane-operator/controllers/hostedcontrolplane/v2/router/component_test.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/testdata/aws-cloud-controller-manager/AROSwift/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_controlplanecomponent.yaml
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/testdata/aws-cloud-controller-manager/AROSwift/zz_fixture_TestControlPlaneComponents_aws_cloud_controller_manager_controlplanecomponent.yaml
Auto-merging control-plane-operator/controllers/hostedcontrolplane/testdata/router/AROSwift/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yaml
Auto-merging control-plane-operator/controllers/hostedcontrolplane/testdata/router/IBMCloud/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yaml
Auto-merging control-plane-operator/controllers/hostedcontrolplane/testdata/router/TechPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yaml
Auto-merging control-plane-operator/controllers/hostedcontrolplane/testdata/router/zz_fixture_TestControlPlaneComponents_router_controlplanecomponent.yaml
Auto-merging control-plane-operator/controllers/hostedcontrolplane/v2/router/component_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 fix(control-plane-operator): ensure router component runs after route-creating components

Details

In response to this:

/cherry-pick release-4.20

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.

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/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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants