Skip to content

Commit 285edd2

Browse files
committed
refactor: switch to Listener type
1 parent b87b7ec commit 285edd2

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

rust/operator-binary/src/controller.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ use stackable_operator::{
3939
cluster_resources::cluster_resources_new,
4040
kvp::label::{recommended_labels, role_group_selector},
4141
role_group_utils::ResourceNames,
42-
types::operator::{ControllerName, OperatorName, ProductName, ProductVersion, RoleName},
42+
types::{
43+
kubernetes::ListenerName,
44+
operator::{ControllerName, OperatorName, ProductName, ProductVersion, RoleName},
45+
},
4346
},
4447
};
4548
use strum::EnumDiscriminants;
@@ -337,8 +340,13 @@ impl ValidatedCluster {
337340
///
338341
/// Must stay in sync with [`v1alpha1::HiveCluster::role_listener_name`], which derives the
339342
/// same name from the raw cluster (used e.g. by the StatefulSet listener-volume PVC).
340-
pub fn role_listener_name(&self, hive_role: &HiveRole) -> String {
341-
format!("{name}-{role}", name = self.name, role = hive_role)
343+
pub fn role_listener_name(&self, hive_role: &HiveRole) -> ListenerName {
344+
ListenerName::from_str(&format!(
345+
"{name}-{role}",
346+
name = self.name,
347+
role = hive_role
348+
))
349+
.expect("the role listener name is a valid Listener name")
342350
}
343351

344352
/// Returns an [`ObjectMetaBuilder`] pre-filled with the namespace, an owner reference back to

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use stackable_operator::{
4040
product_logging::framework::{
4141
STACKABLE_LOG_DIR, ValidatedContainerLogConfigChoice, vector_container,
4242
},
43-
types::kubernetes::{ContainerName, ListenerName, PersistentVolumeClaimName, VolumeName},
43+
types::kubernetes::{ContainerName, PersistentVolumeClaimName, VolumeName},
4444
},
4545
};
4646

@@ -336,8 +336,7 @@ pub(crate) fn build_metastore_rolegroup_statefulset(
336336
.with_labels(recommended_object_labels)
337337
.build();
338338

339-
let listener_name = ListenerName::from_str(&cluster.role_listener_name(hive_role))
340-
.expect("the role listener name is a valid Listener name");
339+
let listener_name = cluster.role_listener_name(hive_role);
341340
let pvc = listener_operator_volume_source_builder_build_pvc(
342341
&ListenerReference::Listener(listener_name),
343342
&unversioned_recommended_labels,

0 commit comments

Comments
 (0)