chore: regenerate und linters

Author: maltesander

Cargo.nix

@@ -798,23 +798,25 @@ spec:
                     properties:
                       hive-site.xml:
                         additionalProperties:
+                          nullable: true
                           type: string
+                        default: {}
                         description: |-
                           Flat key-value overrides for `*.properties`, Hadoop XML, etc.
 
                           This is backwards-compatible with the existing flat key-value YAML format
                           used by `HashMap<String, String>`.
-                        nullable: true
                         type: object
                       security.properties:
                         additionalProperties:
+                          nullable: true
                           type: string
+                        default: {}
                         description: |-
                           Flat key-value overrides for `*.properties`, Hadoop XML, etc.
 
                           This is backwards-compatible with the existing flat key-value YAML format
                           used by `HashMap<String, String>`.
-                        nullable: true
                         type: object
                     type: object
                   envOverrides:
@@ -1255,23 +1257,25 @@ spec:
                           properties:
                             hive-site.xml:
                               additionalProperties:
+                                nullable: true
                                 type: string
+                              default: {}
                               description: |-
                                 Flat key-value overrides for `*.properties`, Hadoop XML, etc.
 
                                 This is backwards-compatible with the existing flat key-value YAML format
                                 used by `HashMap<String, String>`.
-                              nullable: true
                               type: object
                             security.properties:
                               additionalProperties:
+                                nullable: true
                                 type: string
+                              default: {}
                               description: |-
                                 Flat key-value overrides for `*.properties`, Hadoop XML, etc.
 
                                 This is backwards-compatible with the existing flat key-value YAML format
                                 used by `HashMap<String, String>`.
-                              nullable: true
                               type: object
                           type: object
                         envOverrides:

crate-hashes.json

@@ -82,14 +82,14 @@ use crate::{
         jvm::{construct_hadoop_heapsize_env, construct_non_heap_jvm_args},
         opa::{HiveOpaConfig, OPA_TLS_VOLUME_NAME},
     },
+    controller::build::discovery,
     crd::{
         APP_NAME, Container, HIVE_PORT, HIVE_PORT_NAME, HiveClusterStatus, HiveRole, METRICS_PORT,
         METRICS_PORT_NAME, MetaStoreConfig, STACKABLE_CONFIG_DIR, STACKABLE_CONFIG_DIR_NAME,
         STACKABLE_CONFIG_MOUNT_DIR, STACKABLE_CONFIG_MOUNT_DIR_NAME,
         STACKABLE_LOG_CONFIG_MOUNT_DIR, STACKABLE_LOG_CONFIG_MOUNT_DIR_NAME, STACKABLE_LOG_DIR,
         STACKABLE_LOG_DIR_NAME, v1alpha1,
     },
-    discovery::{self},
     kerberos::{self, add_kerberos_pod_config, kerberos_container_start_commands},
     listener::{LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME, build_role_listener},
     operations::{graceful_shutdown::add_graceful_shutdown_config, pdb::add_pdbs},
@@ -189,12 +189,6 @@ pub enum Error {
     #[snafu(display("vector agent is enabled but vector aggregator ConfigMap is missing"))]
     VectorAggregatorConfigMapMissing,
 
-    #[snafu(display("failed to add the logging configuration to the ConfigMap [{cm_name}]"))]
-    InvalidLoggingConfig {
-        source: crate::product_logging::Error,
-        cm_name: String,
-    },
-
     #[snafu(display("failed to patch service account"))]
     ApplyServiceAccount {
         source: stackable_operator::cluster_resources::Error,

extra/crds.yaml

@@ -4,18 +4,23 @@ use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
     k8s_openapi::api::core::v1::ConfigMap,
+    product_logging::framework::VECTOR_CONFIG_FILE,
     role_utils::RoleGroupRef,
 };
 
 use crate::{
     controller::{
         ValidatedCluster,
-        build::properties::{core_site, hive_site, resolved_overrides, security_properties},
+        build::properties::{
+            core_site, hive_site, logging, resolved_overrides, security_properties,
+        },
         build_recommended_labels,
     },
-    crd::{CORE_SITE_XML, HIVE_SITE_XML, HiveRole, JVM_SECURITY_PROPERTIES_FILE, v1alpha1},
+    crd::{
+        CORE_SITE_XML, HIVE_METASTORE_LOG4J2_PROPERTIES, HIVE_SITE_XML, HiveRole,
+        JVM_SECURITY_PROPERTIES_FILE, v1alpha1,
+    },
     framework::writer::{to_hadoop_xml, to_java_properties_string},
-    product_logging::extend_role_group_config_map,
 };
 
 #[derive(Debug, Snafu)]
@@ -41,12 +46,6 @@ pub enum Error {
         source: stackable_operator::builder::meta::Error,
     },
 
-    #[snafu(display("failed to add the logging configuration to the ConfigMap {cm_name}"))]
-    InvalidLoggingConfig {
-        source: crate::product_logging::Error,
-        cm_name: String,
-    },
-
     #[snafu(display("failed to assemble ConfigMap for {rolegroup}"))]
     Assemble {
         source: stackable_operator::builder::configmap::Error,
@@ -114,11 +113,12 @@ pub fn build_metastore_rolegroup_config_map(
         cm_builder.add_data(CORE_SITE_XML, to_hadoop_xml(core_site_data.iter()));
     }
 
-    extend_role_group_config_map(rolegroup, &rg.config.logging, &mut cm_builder).context(
-        InvalidLoggingConfigSnafu {
-            cm_name: rolegroup.object_name(),
-        },
-    )?;
+    if let Some(log4j2_properties) = logging::build_log4j2(&rg.config.logging) {
+        cm_builder.add_data(HIVE_METASTORE_LOG4J2_PROPERTIES, log4j2_properties);
+    }
+    if let Some(vector_config) = logging::build_vector_config(rolegroup, &rg.config.logging) {
+        cm_builder.add_data(VECTOR_CONFIG_FILE, vector_config);
+    }
 
     cm_builder.build().with_context(|_| AssembleSnafu {
         rolegroup: rolegroup.clone(),

rust/operator-binary/src/controller.rs

@@ -1,4 +1,5 @@
 //! Builders that turn a `ValidatedCluster` into Kubernetes resources.
 
 pub mod config_map;
+pub mod discovery;
 pub mod properties;

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

@@ -0,0 +1,75 @@
+//! Renders the logging config files (`log4j2.properties` and the Vector agent
+//! config) assembled into the rolegroup `ConfigMap`.
+
+use stackable_operator::{
+    memory::BinaryMultiple,
+    product_logging::{
+        self,
+        spec::{
+            AutomaticContainerLogConfig, ContainerLogConfig, ContainerLogConfigChoice, Logging,
+        },
+    },
+    role_utils::RoleGroupRef,
+};
+
+use crate::{
+    controller::MAX_HIVE_LOG_FILES_SIZE,
+    crd::{Container, STACKABLE_LOG_DIR, v1alpha1},
+};
+
+const CONSOLE_CONVERSION_PATTERN: &str = "%d{ISO8601} %5p [%t] %c{2}: %m%n";
+const HIVE_LOG_FILE: &str = "hive.log4j2.xml";
+
+/// Renders `log4j2.properties` for the Hive metastore container.
+///
+/// Returns `None` when the Hive container does not use the operator's automatic logging
+/// configuration (e.g. a custom log ConfigMap is referenced instead), in which case no
+/// `log4j2.properties` should be added to the rolegroup `ConfigMap`.
+pub fn build_log4j2(logging: &Logging<Container>) -> Option<String> {
+    match logging.containers.get(&Container::Hive) {
+        Some(ContainerLogConfig {
+            choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
+        }) => Some(log4j2_config(log_config)),
+        _ => None,
+    }
+}
+
+/// Renders the Vector agent config (`vector.yaml`).
+///
+/// Returns `None` when the Vector agent is disabled for this role group.
+pub fn build_vector_config(
+    rolegroup: &RoleGroupRef<v1alpha1::HiveCluster>,
+    logging: &Logging<Container>,
+) -> Option<String> {
+    if !logging.enable_vector_agent {
+        return None;
+    }
+
+    let vector_log_config = match logging.containers.get(&Container::Vector) {
+        Some(ContainerLogConfig {
+            choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
+        }) => Some(log_config),
+        _ => None,
+    };
+
+    Some(product_logging::framework::create_vector_config(
+        rolegroup,
+        vector_log_config,
+    ))
+}
+
+fn log4j2_config(log_config: &AutomaticContainerLogConfig) -> String {
+    product_logging::framework::create_log4j2_config(
+        &format!(
+            "{STACKABLE_LOG_DIR}/{container}",
+            container = Container::Hive
+        ),
+        HIVE_LOG_FILE,
+        MAX_HIVE_LOG_FILES_SIZE
+            .scale_to(BinaryMultiple::Mebi)
+            .floor()
+            .value as u32,
+        CONSOLE_CONVERSION_PATTERN,
+        log_config,
+    )
+}

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

@@ -6,6 +6,7 @@ use stackable_operator::v2::config_overrides::KeyValueConfigOverrides;
 
 pub mod core_site;
 pub mod hive_site;
+pub mod logging;
 pub mod security_properties;
 
 /// Resolve user-provided key/value overrides into `(key, value)` pairs, dropping

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

@@ -41,12 +41,10 @@ mod command;
 mod config;
 mod controller;
 mod crd;
-mod discovery;
 mod framework;
 mod kerberos;
 mod listener;
 mod operations;
-mod product_logging;
 mod service;
 mod webhooks;