refactor: Move logging constants out of crd into their consumers

These constants are no longer used in crd/mod.rs. Following hdfs-operator
(logging constants live in the logging builder) and trino-operator
(MAX_PREPARE_LOG_FILE_SIZE lives in the controller):

- LOGBACK_CONFIG_FILE, LOG4J_CONFIG_FILE, ZOOKEEPER_LOG_FILE and
  MAX_ZK_LOG_FILES_SIZE move to zk_controller/build/properties/logging.rs.
- MAX_PREPARE_LOG_FILE_SIZE (the prepare init container) moves to zk_controller.rs.
- config/jvm.rs keeps its own local log-config-file consts (as it already does for
  security.properties) to avoid coupling config to the controller build module.

No behavior change. Build, clippy, the 16 unit tests, and the generated CRD are
all unchanged.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: maltesander

rust/operator-binary/src/config/jvm.rs

@@ -5,8 +5,8 @@ use stackable_operator::{
 };
 
 use crate::crd::{
-    JMX_METRICS_PORT, LOG4J_CONFIG_FILE, LOGBACK_CONFIG_FILE, LoggingFramework,
-    STACKABLE_CONFIG_DIR, STACKABLE_LOG_CONFIG_DIR, ZookeeperServerRoleType,
+    JMX_METRICS_PORT, LoggingFramework, STACKABLE_CONFIG_DIR, STACKABLE_LOG_CONFIG_DIR,
+    ZookeeperServerRoleType,
     v1alpha1::{ZookeeperCluster, ZookeeperConfig},
 };
 
@@ -16,6 +16,11 @@ const JAVA_HEAP_FACTOR: f32 = 0.8;
 /// ConfigMap (see `zk_controller::build::properties::ConfigFileName`).
 const JVM_SECURITY_PROPERTIES_FILE: &str = "security.properties";
 
+/// The log config files the JVM is pointed at via system properties. These are
+/// written by `zk_controller::build::properties::logging`.
+const LOG4J_CONFIG_FILE: &str = "log4j.properties";
+const LOGBACK_CONFIG_FILE: &str = "logback.xml";
+
 #[derive(Snafu, Debug)]
 pub enum Error {
     #[snafu(display("invalid memory resource configuration - missing default or value in crd?"))]

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

@@ -23,7 +23,6 @@ use stackable_operator::{
         apimachinery::pkg::api::resource::Quantity,
     },
     kube::{CustomResource, ResourceExt, runtime::reflector::ObjectRef},
-    memory::{BinaryMultiple, MemoryQuantity},
     product_logging::{self, spec::Logging},
     role_utils::{GenericRoleConfig, JavaCommonConfig, Role, RoleGroup, RoleGroupRef},
     schemars::{self, JsonSchema},
@@ -67,20 +66,6 @@ pub const STACKABLE_LOG_CONFIG_DIR: &str = "/stackable/log_config";
 pub const STACKABLE_LOG_DIR: &str = "/stackable/log";
 pub const STACKABLE_RW_CONFIG_DIR: &str = "/stackable/rwconfig";
 
-pub const LOGBACK_CONFIG_FILE: &str = "logback.xml";
-pub const LOG4J_CONFIG_FILE: &str = "log4j.properties";
-
-pub const ZOOKEEPER_LOG_FILE: &str = "zookeeper.log4j.xml";
-
-pub const MAX_ZK_LOG_FILES_SIZE: MemoryQuantity = MemoryQuantity {
-    value: 10.0,
-    unit: BinaryMultiple::Mebi,
-};
-pub const MAX_PREPARE_LOG_FILE_SIZE: MemoryQuantity = MemoryQuantity {
-    value: 1.0,
-    unit: BinaryMultiple::Mebi,
-};
-
 pub const CONTAINER_IMAGE_BASE_NAME: &str = "zookeeper";
 
 const DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT: Duration = Duration::from_minutes_unchecked(2);

rust/operator-binary/src/zk_controller.rs

@@ -40,6 +40,7 @@ use stackable_operator::{
     },
     kvp::{LabelError, Labels},
     logging::controller::ReconcilerError,
+    memory::{BinaryMultiple, MemoryQuantity},
     product_logging::{
         self,
         framework::{
@@ -65,9 +66,8 @@ use crate::{
     command::create_init_container_command_args,
     config::jvm::{construct_non_heap_jvm_args, construct_zk_server_heap_env},
     crd::{
-        JMX_METRICS_PORT_NAME, MAX_PREPARE_LOG_FILE_SIZE, MAX_ZK_LOG_FILES_SIZE,
-        METRICS_PROVIDER_HTTP_PORT_NAME, STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR,
-        STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR, STACKABLE_RW_CONFIG_DIR,
+        JMX_METRICS_PORT_NAME, METRICS_PROVIDER_HTTP_PORT_NAME, STACKABLE_CONFIG_DIR,
+        STACKABLE_DATA_DIR, STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR, STACKABLE_RW_CONFIG_DIR,
         ZOOKEEPER_ELECTION_PORT, ZOOKEEPER_ELECTION_PORT_NAME, ZOOKEEPER_LEADER_PORT,
         ZOOKEEPER_LEADER_PORT_NAME, ZOOKEEPER_SERVER_PORT_NAME, ZookeeperRole,
         security::{self, ZookeeperSecurity},
@@ -90,6 +90,12 @@ pub const ZK_FULL_CONTROLLER_NAME: &str = concatcp!(ZK_CONTROLLER_NAME, '.', OPE
 pub const LISTENER_VOLUME_NAME: &str = "listener";
 pub const LISTENER_VOLUME_DIR: &str = "/stackable/listener";
 
+/// Maximum size of the `prepare` init container log file (before rotation).
+pub const MAX_PREPARE_LOG_FILE_SIZE: MemoryQuantity = MemoryQuantity {
+    value: 1.0,
+    unit: BinaryMultiple::Mebi,
+};
+
 pub struct Ctx {
     pub client: stackable_operator::client::Client,
     pub operator_environment: OperatorEnvironmentOptions,
@@ -763,7 +769,10 @@ fn build_server_rolegroup_statefulset(
         .add_empty_dir_volume(
             "log",
             Some(product_logging::framework::calculate_log_volume_size_limit(
-                &[MAX_ZK_LOG_FILES_SIZE, MAX_PREPARE_LOG_FILE_SIZE],
+                &[
+                    build::properties::logging::MAX_ZK_LOG_FILES_SIZE,
+                    MAX_PREPARE_LOG_FILE_SIZE,
+                ],
             )),
         )
         .context(AddVolumeSnafu)?

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

@@ -1,26 +1,32 @@
 //! Builders for the logging-related files in the rolegroup ConfigMap: the
 //! product log config (`logback.xml` / `log4j.properties`) and the Vector agent
 //! config (`vector.yaml`).
-//!
-//! Moved from the former top-level `product_logging` module so that all ConfigMap
-//! contributions live under `zk_controller/build` (mirrors trino-operator and
-//! hdfs-operator).
 
 use std::collections::BTreeMap;
 
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
-    memory::BinaryMultiple,
+    memory::{BinaryMultiple, MemoryQuantity},
     product_logging::{
         self,
         spec::{ContainerLogConfig, ContainerLogConfigChoice},
     },
     role_utils::RoleGroupRef,
 };
 
-use crate::crd::{
-    LOG4J_CONFIG_FILE, LOGBACK_CONFIG_FILE, LoggingFramework, MAX_ZK_LOG_FILES_SIZE,
-    STACKABLE_LOG_DIR, ZOOKEEPER_LOG_FILE, ZookeeperRole, v1alpha1,
+use crate::crd::{LoggingFramework, STACKABLE_LOG_DIR, ZookeeperRole, v1alpha1};
+
+/// The logback config file name (when the product uses the LOGBACK framework).
+pub const LOGBACK_CONFIG_FILE: &str = "logback.xml";
+/// The log4j config file name (when the product uses the LOG4J framework).
+pub const LOG4J_CONFIG_FILE: &str = "log4j.properties";
+/// The file the ZooKeeper server logs are written to.
+pub const ZOOKEEPER_LOG_FILE: &str = "zookeeper.log4j.xml";
+
+/// Maximum size of the ZooKeeper server log files (before rotation).
+pub const MAX_ZK_LOG_FILES_SIZE: MemoryQuantity = MemoryQuantity {
+    value: 10.0,
+    unit: BinaryMultiple::Mebi,
 };
 
 #[derive(Snafu, Debug)]

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

@@ -1,9 +1,7 @@
 //! Per-file builders for the ZooKeeper config files.
 //!
 //! Each submodule renders the key/value pairs (or file contents) for one file
-//! that ends up in the rolegroup ConfigMap. The shared
-//! [`writer`](crate::framework::writer) module serializes property maps to the
-//! Java-properties on-wire format.
+//! that ends up in the rolegroup ConfigMap.
 
 use std::collections::BTreeMap;