refactor: use v2 metrics helper

Author: maltesander

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

@@ -50,7 +50,12 @@ pub fn build_rolegroup_metrics_service(
     Service {
         metadata: ObjectMetaBuilder::new()
             .name_and_namespace(cluster)
-            .name(metrics_service_name(cluster, role_group_name))
+            .name(
+                cluster
+                    .resource_names(role_group_name)
+                    .metrics_service_name()
+                    .to_string(),
+            )
             .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
             .with_labels(cluster.recommended_labels(role_group_name))
             .with_labels(prometheus_labels())
@@ -69,21 +74,6 @@ pub fn build_rolegroup_metrics_service(
     }
 }
 
-/// The name of the rolegroup metrics [`Service`] (`<cluster>-<role>-<rolegroup>-metrics`).
-///
-/// [`ResourceNames`](stackable_operator::v2::role_group_utils::ResourceNames) has no metrics
-/// service name, so it is derived from the qualified role-group name (which equals the StatefulSet
-/// name) here, preserving the previous `RoleGroupRef::rolegroup_metrics_service_name` output.
-pub(crate) fn metrics_service_name(
-    cluster: &ValidatedCluster,
-    role_group_name: &RoleGroupName,
-) -> String {
-    format!(
-        "{qualified}-metrics",
-        qualified = cluster.resource_names(role_group_name).stateful_set_name()
-    )
-}
-
 fn headless_service_ports() -> Vec<ServicePort> {
     vec![ServicePort {
         name: Some(HTTPS_PORT_NAME.into()),

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

@@ -611,9 +611,10 @@ pub(crate) async fn build_node_rolegroup_statefulset(
                 &cluster.cluster_config.server_tls_secret_class,
                 KEYSTORE_VOLUME_NAME,
                 [
-                    crate::controller::build::resource::service::metrics_service_name(
-                        cluster, &rg.name,
-                    ),
+                    cluster
+                        .resource_names(&rg.name)
+                        .metrics_service_name()
+                        .to_string(),
                     build_reporting_task_service_name(&nifi_cluster_name),
                 ],
                 SecretFormat::TlsPkcs12,