Skip to content

Commit 35c8592

Browse files
committed
Test for metrics port, rename metrics svc name function
1 parent 99eeb92 commit 35c8592

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

rust/operator-binary/src/controller.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ use crate::{
9898
STACKABLE_LOG_DIR_NAME,
9999
v1alpha1::{self, HiveMetastoreRoleConfig},
100100
},
101-
discovery::{self, build_headless_listener_service_name},
101+
discovery::{self, build_headless_role_group_metrics_service_name},
102102
kerberos::{
103103
self, add_kerberos_pod_config, kerberos_config_properties,
104104
kerberos_container_start_commands,
@@ -769,7 +769,7 @@ fn build_rolegroup_service(
769769
Ok(Service {
770770
metadata: ObjectMetaBuilder::new()
771771
.name_and_namespace(hive)
772-
.name(build_headless_listener_service_name(
772+
.name(build_headless_role_group_metrics_service_name(
773773
rolegroup.object_name(),
774774
))
775775
.ownerreference_from_resource(hive, None, Some(true))
@@ -1145,7 +1145,7 @@ fn build_metastore_rolegroup_statefulset(
11451145
),
11461146
..LabelSelector::default()
11471147
},
1148-
service_name: Some(build_headless_listener_service_name(
1148+
service_name: Some(build_headless_role_group_metrics_service_name(
11491149
rolegroup_ref.object_name(),
11501150
)),
11511151
template: pod_template,

rust/operator-binary/src/discovery.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,6 @@ fn build_listener_connection_string(
146146
Ok(conn_str)
147147
}
148148

149-
pub fn build_headless_listener_service_name(name: String) -> String {
149+
pub fn build_headless_role_group_metrics_service_name(name: String) -> String {
150150
format!("{name}-metrics", name = name)
151151
}

tests/templates/kuttl/external-access/20-assert.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,10 @@ metadata:
3030
name: test-hive-metastore
3131
spec:
3232
type: ClusterIP # cluster-internal
33+
---
34+
apiVersion: v1
35+
kind: Service
36+
metadata:
37+
name: test-hive-metastore-default-metrics
38+
spec:
39+
type: ClusterIP # exposed metrics

0 commit comments

Comments
 (0)