Updating according to feedback on hive

Author: Maleware

rust/operator-binary/src/service.rs

@@ -83,7 +83,7 @@ pub fn build_node_rolegroup_metrics_service(
     let metrics_service = Service {
         metadata: ObjectMetaBuilder::new()
             .name_and_namespace(superset)
-            .name(rolegroup_headless_metrics_service_name(rolegroup))
+            .name(rolegroup_metrics_service_name(rolegroup))
             .ownerreference_from_resource(superset, None, Some(true))
             .context(ObjectMissingMetadataForOwnerRefSnafu)?
             .with_recommended_labels(build_recommended_labels(
@@ -130,7 +130,7 @@ pub fn rolegroup_headless_service_name(
 
 /// Headless metrics service exposes Prometheus endpoint only
 // TODO: Move to operator-rs
-pub fn rolegroup_headless_metrics_service_name(
+pub fn rolegroup_metrics_service_name(
     rolegroup: &RoleGroupRef<v1alpha1::SupersetCluster>,
 ) -> String {
     format!("{name}-metrics", name = rolegroup.object_name())

rust/operator-binary/src/superset_controller.rs

@@ -87,8 +87,11 @@ use crate::{
     listener::{LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME, build_group_listener},
     operations::{graceful_shutdown::add_graceful_shutdown_config, pdb::add_pdbs},
     product_logging::{LOG_CONFIG_FILE, extend_config_map_with_log_config},
-    service::{build_node_rolegroup_headless_service, build_node_rolegroup_metrics_service},
-    util::{build_recommended_labels, rolegroup_metrics_service_name},
+    service::{
+        build_node_rolegroup_headless_service, build_node_rolegroup_metrics_service,
+        rolegroup_headless_service_name,
+    },
+    util::build_recommended_labels,
 };
 
 pub const SUPERSET_CONTROLLER_NAME: &str = "supersetcluster";
@@ -921,7 +924,7 @@ fn build_server_rolegroup_statefulset(
                 ),
                 ..LabelSelector::default()
             },
-            service_name: Some(rolegroup_metrics_service_name(&rolegroup_ref.object_name())),
+            service_name: Some(rolegroup_headless_service_name(rolegroup_ref)),
             template: pod_template,
             volume_claim_templates: pvcs,
             ..StatefulSetSpec::default()

rust/operator-binary/src/util.rs

@@ -48,7 +48,3 @@ pub fn build_recommended_labels<'a, T>(
         role_group,
     }
 }
-
-pub fn rolegroup_metrics_service_name(role_group_ref_object_name: &str) -> String {
-    format!("{role_group_ref_object_name}-metrics")
-}