Skip to content

Commit 11ca379

Browse files
committed
fix: user ListenerName type
1 parent 678f2ec commit 11ca379

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

rust/operator-binary/src/controller.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use stackable_operator::{
3838
kvp::label::{recommended_labels, role_group_selector},
3939
role_group_utils::ResourceNames,
4040
types::{
41-
kubernetes::{ConfigMapName, NamespaceName, Uid},
41+
kubernetes::{ConfigMapName, ListenerName, NamespaceName, Uid},
4242
operator::{ClusterName, ControllerName, OperatorName, ProductName, ProductVersion},
4343
},
4444
},
@@ -242,12 +242,13 @@ impl ValidatedCluster {
242242
&self,
243243
role: &KafkaRole,
244244
role_group_name: &RoleGroupName,
245-
) -> String {
246-
format!(
245+
) -> ListenerName {
246+
ListenerName::from_str(&format!(
247247
"{}-bootstrap",
248248
self.resource_names(role, role_group_name)
249249
.stateful_set_name()
250-
)
250+
))
251+
.expect("the bootstrap listener name is a valid Listener name")
251252
}
252253

253254
/// Recommended labels for a role-group resource, using the given product version.

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use stackable_operator::{
3838
STACKABLE_LOG_DIR, ValidatedContainerLogConfigChoice, vector_container,
3939
},
4040
role_group_utils::ResourceNames,
41-
types::kubernetes::{ContainerName, ListenerName, PersistentVolumeClaimName, VolumeName},
41+
types::kubernetes::{ContainerName, PersistentVolumeClaimName, VolumeName},
4242
},
4343
};
4444

@@ -185,10 +185,8 @@ pub fn build_broker_rolegroup_statefulset(
185185

186186
// bootstrap listener should be persistent,
187187
// main broker listener is an ephemeral PVC instead
188-
let bootstrap_listener_name = ListenerName::from_str(
189-
&validated_cluster.bootstrap_listener_name(kafka_role, role_group_name),
190-
)
191-
.expect("the bootstrap listener name is a valid Listener name");
188+
let bootstrap_listener_name =
189+
validated_cluster.bootstrap_listener_name(kafka_role, role_group_name);
192190
let bootstrap_pvc_name = PersistentVolumeClaimName::from_str(LISTENER_BOOTSTRAP_VOLUME_NAME)
193191
.expect("the bootstrap listener volume name is a valid PVC name");
194192
pvcs.push(listener_operator_volume_source_builder_build_pvc(

0 commit comments

Comments
 (0)