[release-4.20] OCPBUGS-105211: Apply MetricsSet relabel configs to KAS ServiceMonitor by redhat-chai-bot · Pull Request #9235 · openshift/hypershift

redhat-chai-bot · 2026-08-06T05:35:48Z

Cherry-pick of #8715 to release-4.20.

Backport of the fix for OCPBUGS-105211 / OCPBUGS-91997.

The KAS (kube-apiserver) ServiceMonitor was not applying MetricsSet relabel configs. This cherry-pick brings the fix to the 4.20 release branch.

Conflict resolution: The GCP testdata fixture (testdata/kube-apiserver/GCP/zz_fixture_TestControlPlaneComponents_kube_apiserver_servicemonitor.yaml) was deleted during cherry-pick because it does not exist on release-4.20 (the broader GCP fixture set was added in main-only commits). All other fixtures applied cleanly. Build and test verification passed.

/jira-link OCPBUGS-105211

AI-generated. Review for accuracy.

@wanghaoran1988 requested in Slack thread

openshift-merge-bot · 2026-08-06T05:35:50Z

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 · 2026-08-06T05:35:54Z

@redhat-chai-bot: This pull request references Jira Issue OCPBUGS-105211, which is invalid:

expected the bug to target the "4.20.z" 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-105211 to depend on a bug targeting a version in 4.21.0, 4.21.z 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:

Cherry-pick of #8715 to release-4.20.

Backport of the fix for OCPBUGS-105211 / OCPBUGS-91997.

The KAS (kube-apiserver) ServiceMonitor was not applying MetricsSet relabel configs. This cherry-pick brings the fix to the 4.20 release branch.

Conflict resolution: The GCP testdata fixture (testdata/kube-apiserver/GCP/zz_fixture_TestControlPlaneComponents_kube_apiserver_servicemonitor.yaml) was deleted during cherry-pick because it does not exist on release-4.20 (the broader GCP fixture set was added in main-only commits). All other fixtures applied cleanly. Build and test verification passed.

/jira-link OCPBUGS-105211

AI-generated. Review for accuracy.

@wanghaoran1988 requested in Slack thread

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 · 2026-08-06T05:35:57Z

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: Pro Plus

Run ID: 3a31b894-728c-427c-bf34-27da0d1df54d

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

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.}

wanghaoran1988 · 2026-08-06T05:41:19Z

/jira refresh

openshift-ci-robot · 2026-08-06T05:41:25Z

@wanghaoran1988: This pull request references Jira Issue OCPBUGS-105211, which is invalid:

expected Jira Issue OCPBUGS-105211 to depend on a bug targeting a version in 4.21.0, 4.21.z 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:

/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.

…onitor The KAS adaptServiceMonitor() function was missing the line that applies MetricRelabelConfigs from the configured MetricsSet (Telemetry/SRE/All). Every other component (etcd, KCM, CVO, scheduler, OAPI, OCM, routecm, NTO, OLM, catalog-operator) correctly calls its corresponding metrics.XxxRelabelConfigs(cpContext.MetricsSet), but KAS did not. This caused the KAS ServiceMonitor to always use the hardcoded Telemetry default from the YAML asset (3 metrics: apiserver_storage_objects, apiserver_request_total, apiserver_current_inflight_requests), ignoring the sre-metric-set ConfigMap entirely when METRICS_SET=SRE. The fix adds the missing call to metrics.KASRelabelConfigs() and a unit test matching the pattern used by KCM (kcm/servicemonitor_test.go). (cherry picked from commit 707e294)

redhat-chai-bot · 2026-08-06T09:18:53Z

/retest

AI-generated. Review for accuracy.

redhat-chai-bot · 2026-08-06T12:08:43Z

/test e2e-azure-aks-external-oidc

AI-generated. Review for accuracy.

mehabhalodiya

/lgtm

openshift-merge-bot · 2026-08-10T15:52:51Z

Pipeline controller notification

No second-stage tests were triggered for this PR.

This can happen when:

The changed files don't match any pipeline_run_if_changed patterns
All files match pipeline_skip_if_only_changed patterns
No pipeline-controlled jobs are defined for the release-4.20 branch

Use /test ? to see all available tests.

mehabhalodiya · 2026-08-10T15:54:40Z

/cc @bryan-cox

csrwng · 2026-08-11T10:33:28Z

/verified by @csrwng
Test plan and execution log: https://gist.github.com/csrwng/feb37fbf084e6a0e294c886b6a0ff8a4

openshift-ci-robot · 2026-08-11T10:33:40Z

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

Details

In response to this:

/verified by @csrwng
Test plan and execution log: https://gist.github.com/csrwng/feb37fbf084e6a0e294c886b6a0ff8a4

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.

wanghaoran1988 · 2026-08-11T10:55:27Z

/jira refresh

openshift-ci-robot · 2026-08-11T10:55:33Z

@wanghaoran1988: This pull request references Jira Issue OCPBUGS-105211, which is invalid:

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

muraee · 2026-08-11T11:05:55Z

/approve

openshift-ci · 2026-08-11T11:06:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mehabhalodiya, muraee, redhat-chai-bot

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:

~~OWNERS~~ [muraee]

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

wanghaoran1988 · 2026-08-13T09:50:03Z

/jira refresh

openshift-ci-robot · 2026-08-13T09:50:09Z

@wanghaoran1988: This pull request references Jira Issue OCPBUGS-105211, 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.20.z) matches configured target version for branch (4.20.z)
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-96712 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-96712 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.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.

redhat-chai-bot · 2026-08-13T11:32:53Z

/retest-required

AI-generated. Review for accuracy.

redhat-chai-bot · 2026-08-13T12:52:58Z

/test e2e-kubevirt-aws-ovn-reduced

AI-generated. Review for accuracy.

redhat-chai-bot · 2026-08-13T13:43:34Z

/test e2e-aws

AI-generated. Review for accuracy.

openshift-merge-bot · 2026-08-13T15:31:10Z

/retest-required

Remaining retests: 0 against base HEAD 09b4108 and 2 for PR HEAD 70ac5d7 in total

redhat-chai-bot · 2026-08-13T16:07:40Z

/test e2e-aws

AI-generated. Review for accuracy.

redhat-chai-bot · 2026-08-13T18:19:47Z

/test e2e-kubevirt-aws-ovn-reduced

AI-generated. Review for accuracy.

redhat-chai-bot · 2026-08-13T19:06:14Z

/test e2e-aws

AI-generated. Review for accuracy.

redhat-chai-bot · 2026-08-13T20:08:11Z

/test e2e-kubevirt-aws-ovn-reduced

AI-generated. Review for accuracy.

redhat-chai-bot · 2026-08-13T21:12:28Z

/test e2e-kubevirt-aws-ovn-reduced

AI-generated. Review for accuracy.

openshift-ci · 2026-08-14T00:25:51Z

@redhat-chai-bot: 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-ci-robot · 2026-08-14T00:30:22Z

@redhat-chai-bot: Jira Issue Verification Checks: Jira Issue OCPBUGS-105211
✔️ 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-105211 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:

Cherry-pick of #8715 to release-4.20.

Backport of the fix for OCPBUGS-105211 / OCPBUGS-91997.

The KAS (kube-apiserver) ServiceMonitor was not applying MetricsSet relabel configs. This cherry-pick brings the fix to the 4.20 release branch.

Conflict resolution: The GCP testdata fixture (testdata/kube-apiserver/GCP/zz_fixture_TestControlPlaneComponents_kube_apiserver_servicemonitor.yaml) was deleted during cherry-pick because it does not exist on release-4.20 (the broader GCP fixture set was added in main-only commits). All other fixtures applied cleanly. Build and test verification passed.

/jira-link OCPBUGS-105211

AI-generated. Review for accuracy.

@wanghaoran1988 requested in Slack thread

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 · 2026-08-14T20:59:03Z

Fix included in release 4.20.0-0.nightly-2026-08-14-105317

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 6, 2026

openshift-ci Bot added the do-not-merge/needs-area label Aug 6, 2026

openshift-ci Bot requested review from enxebre and sjenning August 6, 2026 05:36

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 Aug 6, 2026

redhat-chai-bot force-pushed the cherry-pick-8715-ocpbugs-105211 branch from 575b7f4 to 70ac5d7 Compare August 6, 2026 09:18

mehabhalodiya approved these changes Aug 10, 2026

View reviewed changes

openshift-ci Bot assigned mehabhalodiya Aug 10, 2026

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

openshift-ci Bot requested a review from bryan-cox August 10, 2026 15:54

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

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 11, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 11, 2026

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 13, 2026

openshift-merge-bot Bot merged commit 3ddd15f into openshift:release-4.20 Aug 14, 2026
18 checks passed

Uh oh!

Conversation

redhat-chai-bot commented Aug 6, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 6, 2026

Uh oh!

openshift-ci-robot commented Aug 6, 2026

Uh oh!

coderabbitai Bot commented Aug 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

wanghaoran1988 commented Aug 6, 2026

Uh oh!

openshift-ci-robot commented Aug 6, 2026

Uh oh!

redhat-chai-bot commented Aug 6, 2026

Uh oh!

redhat-chai-bot commented Aug 6, 2026

Uh oh!

mehabhalodiya left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-merge-bot Bot commented Aug 10, 2026

Uh oh!

mehabhalodiya commented Aug 10, 2026

Uh oh!

csrwng commented Aug 11, 2026

Uh oh!

openshift-ci-robot commented Aug 11, 2026

Uh oh!

wanghaoran1988 commented Aug 11, 2026

Uh oh!

openshift-ci-robot commented Aug 11, 2026

Uh oh!

muraee commented Aug 11, 2026

Uh oh!

openshift-ci Bot commented Aug 11, 2026

Uh oh!

wanghaoran1988 commented Aug 13, 2026

Uh oh!

openshift-ci-robot commented Aug 13, 2026

Uh oh!

redhat-chai-bot commented Aug 13, 2026

Uh oh!

redhat-chai-bot commented Aug 13, 2026

Uh oh!

redhat-chai-bot commented Aug 13, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 13, 2026

Uh oh!

redhat-chai-bot commented Aug 13, 2026

Uh oh!

redhat-chai-bot commented Aug 13, 2026

Uh oh!

redhat-chai-bot commented Aug 13, 2026

Uh oh!

redhat-chai-bot commented Aug 13, 2026

Uh oh!

redhat-chai-bot commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 14, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Aug 14, 2026

Uh oh!

openshift-merge-robot commented Aug 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

coderabbitai Bot commented Aug 6, 2026 •

edited

Loading