fix: consolidate catalog naming

Author: maltesander

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

@@ -202,12 +202,7 @@ pub fn build_rolegroup_catalog_config_map(
     role_group_name: &str,
     recommended_labels: &Labels,
 ) -> Result<ConfigMap> {
-    let catalog_config_map_name = format!(
-        "{}-catalog",
-        cluster
-            .resource_names(role, role_group_name)
-            .role_group_config_map()
-    );
+    let catalog_config_map_name = cluster.role_group_catalog_config_map_name(role, role_group_name);
     ConfigMapBuilder::new()
         .metadata(
             cluster

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

@@ -409,7 +409,7 @@ pub fn build_rolegroup_statefulset(
         .add_volume(Volume {
             name: CATALOG_VOLUME_NAME.to_string(),
             config_map: Some(ConfigMapVolumeSource {
-                name: format!("{config_map_name}-catalog"),
+                name: cluster.role_group_catalog_config_map_name(trino_role, role_group_name),
                 ..ConfigMapVolumeSource::default()
             }),
             ..Volume::default()

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

@@ -198,6 +198,20 @@ impl ValidatedCluster {
         }
     }
 
+    /// Name of the rolegroup's catalog [`ConfigMap`], derived from the rolegroup config map name
+    /// by appending the `-catalog` suffix.
+    pub(crate) fn role_group_catalog_config_map_name(
+        &self,
+        role: &TrinoRole,
+        role_group_name: &str,
+    ) -> String {
+        format!(
+            "{}-catalog",
+            self.resource_names(role, role_group_name)
+                .role_group_config_map()
+        )
+    }
+
     /// Returns an [`ObjectMetaBuilder`] pre-filled with this cluster's namespace, an owner
     /// reference back to the cluster, the resource `name` and the given `recommended_labels`.
     ///