Merge pull request #1930 from simonpasquier/use-scrape-class

NO-ISSUE: Use scrapeClass for service monitors

Author: openshift-merge-bot[bot]

manifests/0000_90_kube-apiserver-operator_03_servicemonitor.yaml

@@ -9,8 +9,7 @@ metadata:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
 spec:
   endpoints:
-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 30s
+  - interval: 30s
     metricRelabelings:
     - action: drop
       regex: etcd_(debugging|disk|request|server).*
@@ -19,14 +18,9 @@ spec:
     port: https
     scheme: https
     tlsConfig:
-      caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
       serverName: metrics.openshift-kube-apiserver-operator.svc
-      certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt
-      keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key
-  jobLabel: component
-  namespaceSelector:
-    matchNames:
-    - openshift-kube-apiserver-operator
+  jobLabel: app
+  scrapeClass: tls-client-certificate-auth
   selector:
     matchLabels:
       app: kube-apiserver-operator

manifests/0000_90_kube-apiserver-operator_04_servicemonitor-apiserver.yaml

@@ -48,8 +48,7 @@ metadata:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
 spec:
   endpoints:
-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 30s
+  - interval: 30s
     metricRelabelings:
     - action: drop
       regex: etcd_(debugging|disk|server).*
@@ -109,12 +108,11 @@ spec:
     tlsConfig:
       caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
       serverName: kubernetes
-      certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt
-      keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key
   jobLabel: component
   namespaceSelector:
     matchNames:
     - default
+  scrapeClass: tls-client-certificate-auth
   selector:
     matchLabels:
       component: apiserver