fix: move product logging to build step

Author: maltesander

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

@@ -10,11 +10,11 @@ use stackable_operator::{
 use crate::{
     config::writer::PropertiesWriterError,
     controller::build::properties::{
-        ConfigFileName, hbase_env, hbase_site, security_properties, ssl_client, ssl_server,
+        ConfigFileName, hbase_env, hbase_site, logging::extend_role_group_config_map,
+        security_properties, ssl_client, ssl_server,
     },
     crd::{HbaseRole, v1alpha1},
     hbase_controller::{ValidatedCluster, build_recommended_labels},
-    product_logging::extend_role_group_config_map,
 };
 
 #[derive(Snafu, Debug)]

…t/operator-binary/src/product_logging.rs …c/controller/build/properties/logging.rsrust/operator-binary/src/product_logging.rs renamed to rust/operator-binary/src/controller/build/properties/logging.rs rust/operator-binary/src/product_logging.rs renamed to rust/operator-binary/src/controller/build/properties/logging.rs

@@ -11,16 +11,13 @@ use stackable_operator::{
 };
 
 use crate::{
+    controller::build::properties::ConfigFileName,
     crd::{Container, v1alpha1},
-    hbase_controller::MAX_HBASE_LOG_FILES_SIZE,
+    hbase_controller::{MAX_HBASE_LOG_FILES_SIZE, STACKABLE_LOG_DIR},
 };
 
 const CONSOLE_CONVERSION_PATTERN: &str = "%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n";
 const HBASE_LOG4J2_FILE: &str = "hbase.log4j2.xml";
-pub const LOG4J2_CONFIG_FILE: &str = "log4j2.properties";
-pub const STACKABLE_LOG_DIR: &str = "/stackable/log";
-pub static CONTAINERDEBUG_LOG_DIRECTORY: std::sync::LazyLock<String> =
-    std::sync::LazyLock::new(|| format!("{STACKABLE_LOG_DIR}/containerdebug"));
 
 /// Extend the role group ConfigMap with logging and Vector configurations
 pub fn extend_role_group_config_map(
@@ -32,7 +29,7 @@ pub fn extend_role_group_config_map(
         choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
     }) = logging.containers.get(&Container::Hbase)
     {
-        cm_builder.add_data(LOG4J2_CONFIG_FILE, log4j_config(log_config));
+        cm_builder.add_data(ConfigFileName::Log4j2.to_string(), log4j_config(log_config));
     }
 
     let vector_log_config = if let Some(ContainerLogConfig {

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

@@ -9,6 +9,7 @@ use stackable_operator::v2::config_overrides::KeyValueConfigOverrides;
 
 pub mod hbase_env;
 pub mod hbase_site;
+pub mod logging;
 pub mod security_properties;
 pub mod ssl_client;
 pub mod ssl_server;
@@ -43,6 +44,8 @@ pub enum ConfigFileName {
     SslClient,
     #[strum(serialize = "security.properties")]
     Security,
+    #[strum(serialize = "log4j2.properties")]
+    Log4j2,
 }
 
 #[cfg(test)]
@@ -56,6 +59,7 @@ mod tests {
         assert_eq!(ConfigFileName::SslServer.to_string(), "ssl-server.xml");
         assert_eq!(ConfigFileName::SslClient.to_string(), "ssl-client.xml");
         assert_eq!(ConfigFileName::Security.to_string(), "security.properties");
+        assert_eq!(ConfigFileName::Log4j2.to_string(), "log4j2.properties");
     }
 }
 

rust/operator-binary/src/hbase_controller.rs

@@ -63,7 +63,6 @@ use crate::{
     },
     kerberos::{self, add_kerberos_pod_config},
     operations::{graceful_shutdown::add_graceful_shutdown_config, pdb::add_pdbs},
-    product_logging::{CONTAINERDEBUG_LOG_DIRECTORY, STACKABLE_LOG_DIR},
     security::opa::HbaseOpaConfig,
     zookeeper::ZookeeperConnectionInformation,
 };
@@ -75,6 +74,10 @@ pub const MAX_HBASE_LOG_FILES_SIZE: MemoryQuantity = MemoryQuantity {
     unit: BinaryMultiple::Mebi,
 };
 
+pub const STACKABLE_LOG_DIR: &str = "/stackable/log";
+pub static CONTAINERDEBUG_LOG_DIRECTORY: std::sync::LazyLock<String> =
+    std::sync::LazyLock::new(|| format!("{STACKABLE_LOG_DIR}/containerdebug"));
+
 // These constants are hard coded in hbase-entrypoint.sh
 // You need to change them there too.
 const HDFS_DISCOVERY_TMP_DIR: &str = "/stackable/tmp/hdfs";

rust/operator-binary/src/main.rs

@@ -43,7 +43,6 @@ mod crd;
 mod hbase_controller;
 mod kerberos;
 mod operations;
-mod product_logging;
 mod security;
 mod webhooks;
 mod zookeeper;