From 2f9f39140f5cfd3346fcd67a2d581054d51bc909 Mon Sep 17 00:00:00 2001 From: Hongkai Liu Date: Tue, 31 Mar 2026 08:52:27 -0400 Subject: [PATCH] NO-JIRA: use scrape class which is more succinct 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]. https://github.com/openshift/cluster-monitoring-operator/pull/2492 --- .../0000_90_cluster-version-operator_02_servicemonitor.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/install/0000_90_cluster-version-operator_02_servicemonitor.yaml b/install/0000_90_cluster-version-operator_02_servicemonitor.yaml index 08db85a717..cac1ebaf8f 100644 --- a/install/0000_90_cluster-version-operator_02_servicemonitor.yaml +++ b/install/0000_90_cluster-version-operator_02_servicemonitor.yaml @@ -15,10 +15,8 @@ spec: port: metrics scheme: https tlsConfig: - caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt serverName: cluster-version-operator.openshift-cluster-version.svc - certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt - keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key + scrapeClass: tls-client-certificate-auth namespaceSelector: matchNames: - openshift-cluster-version