add config map data explicitly

Author: adwk67

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

@@ -18,7 +18,7 @@ use crate::{
         role::AnyConfig,
         v1alpha1,
     },
-    product_logging::extend_role_group_config_map,
+    product_logging::role_group_config_map_data,
     utils::build_recommended_labels,
 };
 
@@ -187,12 +187,16 @@ pub fn build_rolegroup_config_map(
     tracing::debug!(?kafka_config, "Applied kafka config");
     tracing::debug!(?jvm_sec_props, "Applied JVM config");
 
-    extend_role_group_config_map(
+    let config_data = role_group_config_map_data(
         &resolved_product_image.product_version,
         rolegroup,
         &validated_rg.merged_config,
-        &mut cm_builder,
     );
+    for (file_name, data) in config_data {
+        if let Some(data) = data {
+            cm_builder.add_data(file_name, data);
+        }
+    }
 
     cm_builder
         .build()

rust/operator-binary/src/product_logging.rs

@@ -1,7 +1,6 @@
-use std::{borrow::Cow, fmt::Display};
+use std::{borrow::Cow, collections::BTreeMap, fmt::Display};
 
 use stackable_operator::{
-    builder::configmap::ConfigMapBuilder,
     memory::{BinaryMultiple, MemoryQuantity},
     product_logging::{
         self,
@@ -45,36 +44,43 @@ pub fn kafka_log_opts_env_var() -> String {
     "KAFKA_LOG4J_OPTS".to_string()
 }
 
-/// Extend the role group ConfigMap with logging and Vector configurations
-pub fn extend_role_group_config_map(
+/// Get the role group ConfigMap data with logging and Vector configurations
+pub fn role_group_config_map_data(
     product_version: &str,
     rolegroup: &RoleGroupRef<v1alpha1::KafkaCluster>,
     merged_config: &AnyConfig,
-    cm_builder: &mut ConfigMapBuilder,
-) {
+) -> BTreeMap<String, Option<String>> {
     let container_name = match merged_config {
         AnyConfig::Broker(_) => BrokerContainer::Kafka.to_string(),
         AnyConfig::Controller(_) => ControllerContainer::Kafka.to_string(),
     };
 
+    let mut configs: BTreeMap<String, Option<String>> = BTreeMap::new();
+
     // Starting with Kafka 4.0, log4j2 is used instead of log4j.
     match product_version.starts_with("3.") {
-        true => add_log4j_config_if_automatic(
-            cm_builder,
-            Some(merged_config.kafka_logging()),
-            LOG4J_CONFIG_FILE,
-            container_name,
-            KAFKA_LOG4J_FILE,
-            MAX_KAFKA_LOG_FILES_SIZE,
-        ),
-        false => add_log4j2_config_if_automatic(
-            cm_builder,
-            Some(merged_config.kafka_logging()),
-            LOG4J2_CONFIG_FILE,
-            container_name,
-            KAFKA_LOG4J2_FILE,
-            MAX_KAFKA_LOG_FILES_SIZE,
-        ),
+        true => {
+            configs.insert(
+                LOG4J_CONFIG_FILE.to_string(),
+                log4j_config_if_automatic(
+                    Some(merged_config.kafka_logging()),
+                    container_name,
+                    KAFKA_LOG4J_FILE,
+                    MAX_KAFKA_LOG_FILES_SIZE,
+                ),
+            );
+        }
+        false => {
+            configs.insert(
+                LOG4J2_CONFIG_FILE.to_string(),
+                log4j2_config_if_automatic(
+                    Some(merged_config.kafka_logging()),
+                    container_name,
+                    KAFKA_LOG4J2_FILE,
+                    MAX_KAFKA_LOG_FILES_SIZE,
+                ),
+            );
+        }
     }
 
     let vector_log_config = merged_config.vector_logging();
@@ -88,65 +94,65 @@ pub fn extend_role_group_config_map(
     };
 
     if merged_config.vector_logging_enabled() {
-        cm_builder.add_data(
-            product_logging::framework::VECTOR_CONFIG_FILE,
-            product_logging::framework::create_vector_config(rolegroup, vector_log_config),
+        configs.insert(
+            product_logging::framework::VECTOR_CONFIG_FILE.to_string(),
+            Some(product_logging::framework::create_vector_config(
+                rolegroup,
+                vector_log_config,
+            )),
         );
     }
+    configs
 }
 
-fn add_log4j_config_if_automatic(
-    cm_builder: &mut ConfigMapBuilder,
+fn log4j_config_if_automatic(
     log_config: Option<Cow<ContainerLogConfig>>,
-    log_config_file: &str,
     container_name: impl Display,
     log_file: &str,
     max_log_file_size: MemoryQuantity,
-) {
-    if let Some(ContainerLogConfig {
+) -> Option<String> {
+    let config = if let Some(ContainerLogConfig {
         choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
     }) = log_config.as_deref()
     {
-        cm_builder.add_data(
-            log_config_file,
-            product_logging::framework::create_log4j_config(
-                &format!("{STACKABLE_LOG_DIR}/{container_name}"),
-                log_file,
-                max_log_file_size
-                    .scale_to(BinaryMultiple::Mebi)
-                    .floor()
-                    .value as u32,
-                CONSOLE_CONVERSION_PATTERN_LOG4J,
-                log_config,
-            ),
-        );
-    }
+        Some(product_logging::framework::create_log4j_config(
+            &format!("{STACKABLE_LOG_DIR}/{container_name}"),
+            log_file,
+            max_log_file_size
+                .scale_to(BinaryMultiple::Mebi)
+                .floor()
+                .value as u32,
+            CONSOLE_CONVERSION_PATTERN_LOG4J,
+            log_config,
+        ))
+    } else {
+        None
+    };
+    config
 }
 
-fn add_log4j2_config_if_automatic(
-    cm_builder: &mut ConfigMapBuilder,
+fn log4j2_config_if_automatic(
     log_config: Option<Cow<ContainerLogConfig>>,
-    log_config_file: &str,
     container_name: impl Display,
     log_file: &str,
     max_log_file_size: MemoryQuantity,
-) {
-    if let Some(ContainerLogConfig {
+) -> Option<String> {
+    let config = if let Some(ContainerLogConfig {
         choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
     }) = log_config.as_deref()
     {
-        cm_builder.add_data(
-            log_config_file,
-            product_logging::framework::create_log4j2_config(
-                &format!("{STACKABLE_LOG_DIR}/{container_name}",),
-                log_file,
-                max_log_file_size
-                    .scale_to(BinaryMultiple::Mebi)
-                    .floor()
-                    .value as u32,
-                CONSOLE_CONVERSION_PATTERN_LOG4J2,
-                log_config,
-            ),
-        );
-    }
+        Some(product_logging::framework::create_log4j2_config(
+            &format!("{STACKABLE_LOG_DIR}/{container_name}",),
+            log_file,
+            max_log_file_size
+                .scale_to(BinaryMultiple::Mebi)
+                .floor()
+                .value as u32,
+            CONSOLE_CONVERSION_PATTERN_LOG4J2,
+            log_config,
+        ))
+    } else {
+        None
+    };
+    config
 }