NO-JIRA: use scrape class which is more succinct

[hongkailiu]

This is suggested in [1]. "monitoring" has done it to their ServiceMonitors [2] with [3].

[1]. https://rhobs-handbook.netlify.app/products/openshiftmonitoring/collecting_metrics.md/#configuring-prometheus-to-scrape-metrics

[2]. https://github.com/openshift/cluster-monitoring-operator/blob/c6bac82b735ac3a5ee67a3899d1a24bf95ae7277/assets/prometheus-operator/service-monitor.yaml#L20

[3]. openshift/cluster-monitoring-operator#2492

[openshift-ci-robot]

@hongkailiu: This pull request explicitly references no jira issue.

Details

In response to this:

This is suggested in [1]. "monitoring" has done it to their ServiceMonitors [2] with [3].

[1]. https://rhobs-handbook.netlify.app/products/openshiftmonitoring/collecting_metrics.md/#configuring-prometheus-to-scrape-metrics

[2]. https://github.com/openshift/cluster-monitoring-operator/blob/c6bac82b735ac3a5ee67a3899d1a24bf95ae7277/assets/prometheus-operator/service-monitor.yaml#L20

[3]. openshift/cluster-monitoring-operator#2492

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]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 94b63a42-b575-4600-9608-dd76a4f0c44c

📥 Commits

Reviewing files that changed from the base of the PR and between bb70c3b and 2f9f391.

📒 Files selected for processing (1)

• install/0000_90_cluster-version-operator_02_servicemonitor.yaml

---

Walkthrough

A ServiceMonitor configuration file was updated to replace explicit TLS certificate file references (caFile, certFile, keyFile) with a declarative scrapeClass field for TLS client certificate authentication, reducing configuration verbosity.

Changes

Cohort / File(s)	Summary
ServiceMonitor TLS Configuration install/0000_90_cluster-version-operator_02_servicemonitor.yaml	Removed three tlsConfig file path fields and added scrapeClass: tls-client-certificate-auth for declarative TLS authentication management.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

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

[hongkailiu]

/retest

[hongkailiu]

/hold

I cannot verify it up to https://redhat.atlassian.net/browse/OCPBUGS-78579

[hongkailiu]

Then I tried it with a 4.21 job:

launch 4.21,openshift/cluster-version-operator#1365 aws,single-node

and

$ oc get servicemonitor -n openshift-cluster-version cluster-version-operator -o yaml | yq -y .spec
endpoints:
  - interval: 30s
    port: metrics
    scheme: https
    tlsConfig:
      serverName: cluster-version-operator.openshift-cluster-version.svc
namespaceSelector:
  matchNames:
    - openshift-cluster-version
scrapeClass: tls-client-certificate-auth
selector:
  matchLabels:
    k8s-app: cluster-version-operator

Checked one of CVO metrics:

/verified by @hongkailiu

[openshift-ci-robot]

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

Details

In response to this:

Then I tried it with a 4.21 job:

launch 4.21,openshift/cluster-version-operator#1365 aws,single-node

and

$ oc get servicemonitor -n openshift-cluster-version cluster-version-operator -o yaml | yq -y .spec
endpoints:
 - interval: 30s
   port: metrics
   scheme: https
   tlsConfig:
     serverName: cluster-version-operator.openshift-cluster-version.svc
namespaceSelector:
 matchNames:
   - openshift-cluster-version
scrapeClass: tls-client-certificate-auth
selector:
 matchLabels:
   k8s-app: cluster-version-operator

Checked one of CVO metrics:

/verified by @hongkailiu

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.

[hongkailiu]

/hold cancel

[hongkailiu]

/retest

[wking]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hongkailiu, wking

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 [hongkailiu,wking]

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

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD bb70c3b and 2 for PR HEAD 2f9f391 in total

[openshift-ci]

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