chore: swich to v2 prometheus annotations & scraping label

Author: maltesander

rust/operator-binary/src/controller/build/resource/service.rs

@@ -1,7 +1,9 @@
 use stackable_operator::{
     k8s_openapi::api::core::v1::{Service, ServicePort, ServiceSpec},
-    kvp::{Annotations, Labels},
-    v2::types::operator::RoleGroupName,
+    v2::{
+        builder::service::{Scheme, Scraping, prometheus_annotations, prometheus_labels},
+        types::operator::RoleGroupName,
+    },
 };
 
 use crate::{
@@ -63,8 +65,13 @@ pub fn build_rolegroup_metrics_service(
                 druid_role,
                 role_group_name,
             )
-            .with_labels(prometheus_labels())
-            .with_annotations(prometheus_annotations())
+            .with_labels(prometheus_labels(&Scraping::Enabled))
+            .with_annotations(prometheus_annotations(
+                &Scraping::Enabled,
+                &Scheme::Http,
+                "/metrics",
+                &METRICS_PORT,
+            ))
             .build(),
         spec: Some(ServiceSpec {
             // Internal communication does not need to be exposed
@@ -91,23 +98,3 @@ fn metrics_service_ports() -> Vec<ServicePort> {
         ..ServicePort::default()
     }]
 }
-
-/// The Prometheus scraping label added to the metrics [`Service`].
-fn prometheus_labels() -> Labels {
-    Labels::try_from([("prometheus.io/scrape", "true")]).expect("should be a valid label")
-}
-
-/// Common annotations for Prometheus
-///
-/// These annotations can be used in a ServiceMonitor.
-///
-/// see also <https://github.com/prometheus-community/helm-charts/blob/prometheus-27.32.0/charts/prometheus/values.yaml#L983-L1036>
-fn prometheus_annotations() -> Annotations {
-    Annotations::try_from([
-        ("prometheus.io/path".to_owned(), "/metrics".to_owned()),
-        ("prometheus.io/port".to_owned(), METRICS_PORT.to_string()),
-        ("prometheus.io/scheme".to_owned(), "http".to_owned()),
-        ("prometheus.io/scrape".to_owned(), "true".to_owned()),
-    ])
-    .expect("should be valid annotations")
-}