move rolegroup_metrics_service_name out of cluster impl

Author: maltesander

rust/operator-binary/src/controller.rs

@@ -88,7 +88,7 @@ use crate::{
         authentication::resolve_authentication_classes,
         catalog,
         discovery::{TrinoDiscovery, TrinoDiscoveryProtocol, TrinoPodRef},
-        v1alpha1,
+        rolegroup_metrics_service_name, v1alpha1,
     },
     listener::{
         LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME, build_group_listener, build_group_listener_pvc,
@@ -1193,7 +1193,7 @@ fn build_rolegroup_statefulset(
                 ),
                 ..LabelSelector::default()
             },
-            service_name: Some(v1alpha1::TrinoCluster::rolegroup_metrics_service_name(
+            service_name: Some(rolegroup_metrics_service_name(
                 &role_group_ref.object_name(),
             )),
             template: pod_template,
@@ -1215,7 +1215,7 @@ fn build_rolegroup_service(
     Ok(Service {
         metadata: ObjectMetaBuilder::new()
             .name_and_namespace(trino)
-            .name(v1alpha1::TrinoCluster::rolegroup_metrics_service_name(
+            .name(rolegroup_metrics_service_name(
                 &role_group_ref.object_name(),
             ))
             .ownerreference_from_resource(trino, None, Some(true))

rust/operator-binary/src/crd/mod.rs

@@ -837,7 +837,7 @@ impl v1alpha1::TrinoCluster {
                 let ns = ns.clone();
                 (0..rolegroup.replicas.unwrap_or(0)).map(move |i| TrinoPodRef {
                     namespace: ns.clone(),
-                    role_group_service_name: Self::rolegroup_metrics_service_name(
+                    role_group_service_name: rolegroup_metrics_service_name(
                         &role_group_ref.object_name(),
                     ),
                     pod_name: format!(
@@ -848,11 +848,6 @@ impl v1alpha1::TrinoCluster {
             }))
     }
 
-    /// Returns the metrics rolegroup service name `simple-trino-coordinator-default-<METRICS_SERVICE_SUFFIX>`.
-    pub fn rolegroup_metrics_service_name(role_group_ref_object_name: &str) -> String {
-        format!("{role_group_ref_object_name}-{METRICS_SERVICE_SUFFIX}")
-    }
-
     /// Returns user provided authentication settings
     pub fn get_authentication(&self) -> &Vec<core::v1alpha1::ClientAuthenticationDetails> {
         &self.spec.cluster_config.authentication
@@ -945,6 +940,11 @@ impl v1alpha1::TrinoCluster {
     }
 }
 
+/// Returns the metrics rolegroup service name `<cluster>-<role->-<rolegroup>-<METRICS_SERVICE_SUFFIX>`.
+pub fn rolegroup_metrics_service_name(role_group_ref_object_name: &str) -> String {
+    format!("{role_group_ref_object_name}-{METRICS_SERVICE_SUFFIX}")
+}
+
 fn extract_role_from_coordinator_config(
     fragment: Role<TrinoConfigFragment, TrinoCoordinatorRoleConfig, JavaCommonConfig>,
 ) -> Role<TrinoConfigFragment, GenericRoleConfig, JavaCommonConfig> {