more consistent wording

Author: Maleware

rust/operator-binary/src/controller.rs

@@ -520,15 +520,14 @@ pub async fn reconcile_hive(
     let mut discovery_hash = FnvHasher::with_key(0);
 
     if let Some(HiveMetastoreRoleConfig { listener_class, .. }) = role_config {
-        let group_listener: Listener =
+        let role_listener: Listener =
             build_role_listener(hive, &resolved_product_image, &hive_role, listener_class)
                 .context(ListenerConfigurationSnafu)?;
-        let listener = cluster_resources
-            .add(client, group_listener)
-            .await
-            .context(ApplyGroupListenerSnafu {
+        let listener = cluster_resources.add(client, role_listener).await.context(
+            ApplyGroupListenerSnafu {
                 role: hive_role.to_string(),
-            })?;
+            },
+        )?;
 
         for discovery_cm in discovery::build_discovery_configmaps(
             hive,
@@ -961,7 +960,7 @@ fn build_metastore_rolegroup_statefulset(
         .build();
 
     let pvc = ListenerOperatorVolumeSourceBuilder::new(
-        &ListenerReference::ListenerName(hive.group_listener_name(hive_role)),
+        &ListenerReference::ListenerName(hive.role_listener_name(hive_role)),
         &unversioned_recommended_labels,
     )
     .context(BuildListenerVolumeSnafu)?

rust/operator-binary/src/crd/mod.rs

@@ -240,9 +240,9 @@ impl v1alpha1::HiveCluster {
         })
     }
 
-    /// The name of the group-listener provided for a specific role.
+    /// The name of the role-listener provided for a specific role.
     /// returns a name `<cluster>-<role>`
-    pub fn group_listener_name(&self, hive_role: &HiveRole) -> String {
+    pub fn role_listener_name(&self, hive_role: &HiveRole) -> String {
         format!("{name}-{role}", name = self.name_any(), role = hive_role)
     }
 

rust/operator-binary/src/listener.rs

@@ -77,7 +77,7 @@ pub fn build_role_listener(
 ) -> Result<Listener, Error> {
     let metadata = ObjectMetaBuilder::new()
         .name_and_namespace(hive)
-        .name(hive.group_listener_name(hive_role))
+        .name(hive.role_listener_name(hive_role))
         .ownerreference_from_resource(hive, None, Some(true))
         .context(ObjectMissingMetadataForOwnerRefSnafu)?
         .with_recommended_labels(build_recommended_labels(