Skip to content

[release-4.22] OCPBUGS-87364: Gate Route watch on management cluster capability - #8692

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-8484-to-release-4.22
Jun 29, 2026
Merged

[release-4.22] OCPBUGS-87364: Gate Route watch on management cluster capability#8692
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-8484-to-release-4.22

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #8484

/assign smrtrfszm

The hosted-cluster-config-operator unconditionally watches
route.openshift.io/v1 Routes against the management cluster to react
to hostname changes on the metrics-proxy Route. On management clusters
that do not expose the Routes API (e.g. non-OpenShift management
clusters) this watch fails during controller setup and prevents HCCO
from starting.

Detect the management cluster Route capability using the existing
capabilities.DetectManagementClusterCapabilities helper and only
register the watch when route.openshift.io is registered. This mirrors
the pattern already used in other parts of the code.
@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

@coderabbitai

coderabbitai Bot commented Jun 6, 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: 62efc1f9-ca62-45af-aef7-95322bb745e8

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 cblecker and sjenning June 6, 2026 16:10
@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 Jun 6, 2026
@smrtrfszm

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue OCPBUGS-86008 has been cloned as Jira Issue OCPBUGS-87364. Will retitle bug to link to clone.
/retitle [release-4.22] OCPBUGS-87364: Gate Route watch on management cluster capability

Details

In response to this:

This is an automated cherry-pick of #8484

/assign smrtrfszm

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.22] OCPBUGS-86008: Gate Route watch on management cluster capability [release-4.22] OCPBUGS-87364: Gate Route watch on management cluster capability Jun 6, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 6, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jun 6, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-87364, 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.22.0) matches configured target version for branch (4.22.0)
  • 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-86008 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-86008 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents

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

Details

In response to this:

This is an automated cherry-pick of #8484

/assign smrtrfszm

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.

@codecov

codecov Bot commented Jun 6, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 38 lines in your changes missing coverage. Please review.
✅ Project coverage is 35.33%. Comparing base (814faf3) to head (fc75cca).
⚠️ Report is 13 commits behind head on release-4.22.

Files with missing lines Patch % Lines
...-plane-operator/hostedclusterconfigoperator/cmd.go 0.00% 34 Missing ⚠️
...rconfigoperator/controllers/resources/resources.go 0.00% 4 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-4.22    #8692      +/-   ##
================================================
- Coverage         35.34%   35.33%   -0.01%     
================================================
  Files               767      767              
  Lines             93682    93696      +14     
================================================
  Hits              33111    33111              
- Misses            57867    57881      +14     
  Partials           2704     2704              
Files with missing lines Coverage Δ
...tor/hostedclusterconfigoperator/operator/config.go 0.00% <ø> (ø)
...rconfigoperator/controllers/resources/resources.go 50.48% <0.00%> (-0.02%) ⬇️
...-plane-operator/hostedclusterconfigoperator/cmd.go 0.00% <0.00%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@TwoDCube

TwoDCube commented Jun 7, 2026

Copy link
Copy Markdown
Member

/retest

1 similar comment
@TwoDCube

TwoDCube commented Jun 8, 2026

Copy link
Copy Markdown
Member

/retest

@cblecker

cblecker commented Jun 9, 2026

Copy link
Copy Markdown
Member

/uncc

@TwoDCube

Copy link
Copy Markdown
Member

/retest

5 similar comments
@smrtrfszm

Copy link
Copy Markdown
Contributor

/retest

@TwoDCube

Copy link
Copy Markdown
Member

/retest

@TwoDCube

Copy link
Copy Markdown
Member

/retest

@TwoDCube

Copy link
Copy Markdown
Member

/retest

@TwoDCube

Copy link
Copy Markdown
Member

/retest

@matlaj

matlaj commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

/retest

@csrwng csrwng added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 25, 2026
@csrwng

csrwng commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

/override "ci/prow/e2e-aws-upgrade-hypershift-operator"

This PR has no impact on the hypershift operator, only the CPO

@csrwng

csrwng commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

/override codecov/patch
/override codecov/project

This is a backport. If needed, we can introduce new unit tests in main.

@openshift-ci

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

@csrwng: Overrode contexts on behalf of csrwng: ci/prow/e2e-aws-upgrade-hypershift-operator

Details

In response to this:

/override "ci/prow/e2e-aws-upgrade-hypershift-operator"

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.

@csrwng

csrwng commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

/verified later @smrtrfszm

@openshift-ci-robot openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Jun 25, 2026
@openshift-ci-robot

Copy link
Copy Markdown

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

Details

In response to this:

/verified later @smrtrfszm

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 commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

@csrwng: Overrode contexts on behalf of csrwng: codecov/patch, codecov/project

Details

In response to this:

/override codecov/patch
/override codecov/project

This is a backport. If needed, we can introduce new unit tests in main.

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.

@smrtrfszm

Copy link
Copy Markdown
Contributor

/verified by @smrtrfszm

Before this change on a vanilla kubernetes, HCCO was in a crash loop with error message:

Error: failed to wait for resources caches to sync: timed out waiting for cache to be synced for Kind *v1.Route

After this change on a vanilla kubernetes, HCCO is 1/1 ready:

oc get pod -n master-roks1 -l hypershift.openshift.io/control-plane-component=hosted-cluster-config-operator
NAME                                             READY   STATUS    RESTARTS   AGE
hosted-cluster-config-operator-7fbcccd69-vbv7b   1/1     Running   0          32m

@openshift-ci-robot

Copy link
Copy Markdown

@smrtrfszm: This PR has been marked as verified by @smrtrfszm.

Details

In response to this:

/verified by @smrtrfszm

Before this change on a vanilla kubernetes, HCCO was in a crash loop with error message:

Error: failed to wait for resources caches to sync: timed out waiting for cache to be synced for Kind *v1.Route

After this change on a vanilla kubernetes, HCCO is 1/1 ready:

oc get pod -n master-roks1 -l hypershift.openshift.io/control-plane-component=hosted-cluster-config-operator
NAME                                             READY   STATUS    RESTARTS   AGE
hosted-cluster-config-operator-7fbcccd69-vbv7b   1/1     Running   0          32m

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2026
@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-cherrypick-robot

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 commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: 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 491d5ec into openshift:release-4.22 Jun 29, 2026
24 of 26 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-87364
✔️ 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-87364 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:

This is an automated cherry-pick of #8484

/assign smrtrfszm

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.22.0-0.nightly-2026-06-30-192322

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants