Skip to content

Commit 74dbc46

Browse files
committed
refactor: use v2 metrics service helper
1 parent 5c9d391 commit 74dbc46

1 file changed

Lines changed: 6 additions & 23 deletions

File tree

  • rust/operator-binary/src/controller/build/resource

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

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ pub fn build_rolegroup_metrics_service(
5959
Service {
6060
metadata: ObjectMetaBuilder::new()
6161
.name_and_namespace(validated_cluster)
62-
.name(metrics_service_name(
63-
validated_cluster,
64-
role,
65-
role_group_name,
66-
))
62+
.name(
63+
validated_cluster
64+
.resource_names(role, role_group_name)
65+
.metrics_service_name()
66+
.to_string(),
67+
)
6768
.ownerreference(ownerreference_from_resource(
6869
validated_cluster,
6970
None,
@@ -90,24 +91,6 @@ pub fn build_rolegroup_metrics_service(
9091
}
9192
}
9293

93-
/// The metrics [`Service`] name, `<cluster>-<role>-<rolegroup>-metrics`.
94-
///
95-
/// [`ResourceNames`](stackable_operator::v2::role_group_utils::ResourceNames) has no metrics
96-
/// service helper, so the `-metrics` suffix is appended to the qualified role-group name (which is
97-
/// also the StatefulSet name).
98-
fn metrics_service_name(
99-
validated_cluster: &ValidatedCluster,
100-
role: &KafkaRole,
101-
role_group_name: &RoleGroupName,
102-
) -> String {
103-
format!(
104-
"{qualified}-metrics",
105-
qualified = validated_cluster
106-
.resource_names(role, role_group_name)
107-
.stateful_set_name()
108-
)
109-
}
110-
11194
fn metrics_ports() -> Vec<ServicePort> {
11295
vec![ServicePort {
11396
name: Some(METRICS_PORT_NAME.to_string()),

0 commit comments

Comments
 (0)