refactor: add framework module

Author: maltesander

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

@@ -71,7 +71,7 @@ pub fn build_rolegroup_config_map(
 
     let hbase_site_xml = hbase_site::build(
         role,
-        &rg.merged_config,
+        &rg.config,
         cluster_config
             .zookeeper_connection_information
             .as_hbase_settings(),
@@ -81,7 +81,7 @@ pub fn build_rolegroup_config_map(
     );
 
     let hbase_env_sh = hbase_env::build(
-        &rg.merged_config,
+        &rg.config,
         role,
         cluster_config.kerberos_enabled,
         rg.non_heap_jvm_args.clone(),
@@ -134,12 +134,10 @@ pub fn build_rolegroup_config_map(
         builder.add_data(ConfigFileName::SslClient.to_string(), ssl_client_xml);
     }
 
-    if let Some(log4j2_properties) = logging::build_log4j2(rg.merged_config.logging()) {
+    if let Some(log4j2_properties) = logging::build_log4j2(rg.config.logging()) {
         builder.add_data(ConfigFileName::Log4j2.to_string(), log4j2_properties);
     }
-    if let Some(vector_config) =
-        logging::build_vector_config(rolegroup_ref, rg.merged_config.logging())
-    {
+    if let Some(vector_config) = logging::build_vector_config(rolegroup_ref, rg.config.logging()) {
         builder.add_data(VECTOR_CONFIG_FILE, vector_config);
     }
 

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

@@ -150,13 +150,17 @@ pub struct ValidatedRoleConfig {
 /// Per-rolegroup configuration: the merged CRD config plus the merged
 /// (role <- role group) `configOverrides`, `envOverrides` and `podOverrides`.
 ///
-/// This carries every override channel so that the build step is a pure function of
-/// [`ValidatedCluster`] and never has to reach back into the raw `HbaseCluster`.
+/// The merge and validation is performed by
+/// [`with_validated_config`](crate::framework::role_utils::with_validated_config); the
+/// result is flattened into this struct and augmented with the pre-resolved
+/// `non_heap_jvm_args`. Carrying every override channel (and the JVM args) keeps the
+/// build step a pure function of [`ValidatedCluster`] that never has to reach back into
+/// the raw `HbaseCluster`.
 #[derive(Clone, Debug)]
 pub struct ValidatedRoleGroupConfig {
-    /// The desired number of replicas (`None` lets Kubernetes default to 1).
-    pub replicas: Option<u16>,
-    pub merged_config: AnyServiceConfig,
+    /// The desired number of replicas (defaulted to 1 during validation).
+    pub replicas: u16,
+    pub config: AnyServiceConfig,
     pub config_overrides: v1alpha1::HbaseConfigOverrides,
     pub env_overrides: EnvVarSet,
     /// Merged (role <- role group) pod template overrides.