bring addition of log config config maps inline

Author: adwk67

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

@@ -7,16 +7,21 @@ use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
     k8s_openapi::api::core::v1::ConfigMap,
-    product_logging::spec::Logging,
+    product_logging::{
+        self,
+        spec::{ContainerLogConfig, ContainerLogConfigChoice, Logging},
+    },
     role_utils::RoleGroupRef,
 };
 
 use crate::{
     airflow_controller::AIRFLOW_CONTROLLER_NAME,
     config::webserver_config,
     controller::validate::ValidatedAirflowCluster,
-    crd::{AIRFLOW_CONFIG_FILENAME, Container, build_recommended_labels, v1alpha2},
-    product_logging::extend_config_map_with_log_config,
+    crd::{
+        AIRFLOW_CONFIG_FILENAME, Container, STACKABLE_LOG_DIR, build_recommended_labels, v1alpha2,
+    },
+    product_logging::{LOG_CONFIG_FILE, create_airflow_config},
 };
 
 #[derive(Snafu, Debug)]
@@ -91,14 +96,33 @@ pub fn build_rolegroup_config_map(
         )
         .add_data(AIRFLOW_CONFIG_FILENAME, config_file);
 
-    extend_config_map_with_log_config(
-        rolegroup,
-        logging,
-        container,
-        &Container::Vector,
-        &mut cm_builder,
-        &validated_cluster.image,
-    );
+    // Log config for the main container, when it uses an Automatic log config.
+    if let Some(ContainerLogConfig {
+        choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
+    }) = logging.containers.get(container)
+    {
+        let log_dir = format!("{STACKABLE_LOG_DIR}/{container}");
+        cm_builder.add_data(
+            LOG_CONFIG_FILE,
+            create_airflow_config(log_config, &log_dir, &validated_cluster.image),
+        );
+    }
+
+    // Vector agent config, when enabled.
+    if logging.enable_vector_agent {
+        let vector_log_config = if let Some(ContainerLogConfig {
+            choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
+        }) = logging.containers.get(&Container::Vector)
+        {
+            Some(log_config)
+        } else {
+            None
+        };
+        cm_builder.add_data(
+            product_logging::framework::VECTOR_CONFIG_FILE,
+            product_logging::framework::create_vector_config(rolegroup, vector_log_config),
+        );
+    }
 
     cm_builder.build().with_context(|_| BuildConfigMapSnafu {
         rolegroup: rolegroup.clone(),

rust/operator-binary/src/product_logging.rs

@@ -1,21 +1,11 @@
-use std::fmt::{Display, Write};
+use std::fmt::Write;
 
 use snafu::Snafu;
 use stackable_operator::{
-    builder::configmap::ConfigMapBuilder,
     commons::product_image_selection::ResolvedProductImage,
-    kube::Resource,
-    product_logging::{
-        self,
-        spec::{
-            AutomaticContainerLogConfig, ContainerLogConfig, ContainerLogConfigChoice, Logging,
-        },
-    },
-    role_utils::RoleGroupRef,
+    product_logging::spec::AutomaticContainerLogConfig,
 };
 
-use crate::crd::STACKABLE_LOG_DIR;
-
 #[derive(Snafu, Debug)]
 pub enum Error {
     #[snafu(display("failed to retrieve the ConfigMap [{cm_name}]"))]
@@ -32,50 +22,10 @@ pub enum Error {
     MissingVectorAggregatorAddress,
 }
 
-const LOG_CONFIG_FILE: &str = "log_config.py";
+pub const LOG_CONFIG_FILE: &str = "log_config.py";
 const LOG_FILE: &str = "airflow.py.json";
 
-/// Extend the ConfigMap with logging and Vector configurations
-pub fn extend_config_map_with_log_config<C, K>(
-    rolegroup: &RoleGroupRef<K>,
-    logging: &Logging<C>,
-    main_container: &C,
-    vector_container: &C,
-    cm_builder: &mut ConfigMapBuilder,
-    resolved_product_image: &ResolvedProductImage,
-) where
-    C: Clone + Ord + Display,
-    K: Resource,
-{
-    if let Some(ContainerLogConfig {
-        choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
-    }) = logging.containers.get(main_container)
-    {
-        let log_dir = format!("{STACKABLE_LOG_DIR}/{main_container}");
-        cm_builder.add_data(
-            LOG_CONFIG_FILE,
-            create_airflow_config(log_config, &log_dir, resolved_product_image),
-        );
-    }
-
-    let vector_log_config = if let Some(ContainerLogConfig {
-        choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
-    }) = logging.containers.get(vector_container)
-    {
-        Some(log_config)
-    } else {
-        None
-    };
-
-    if logging.enable_vector_agent {
-        cm_builder.add_data(
-            product_logging::framework::VECTOR_CONFIG_FILE,
-            product_logging::framework::create_vector_config(rolegroup, vector_log_config),
-        );
-    }
-}
-
-fn create_airflow_config(
+pub fn create_airflow_config(
     log_config: &AutomaticContainerLogConfig,
     log_dir: &str,
     resolved_product_image: &ResolvedProductImage,