refactor: move rolegroup ConfigMap build into controller/build/config_map

adwk67 · claude · adwk67 · commit 58c9d03f9077 · 2026-06-03T15:50:43.000+02:00
Extracts build_rolegroup_config_map out of airflow_controller into a dedicated
controller/build/config_map module with its own error enum, matching the
controller/build/config_map.rs layout in hdfs- and trino-operator. The
controller now wraps it via a single BuildConfigMap error variant; the
ConfigMap-only error variants move into the new module.

No behaviour change.

Co-Authored-By: Claude Opus 4.8 &lt;noreply@anthropic.com&gt;
diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs
@@ -55,11 +55,7 @@ use stackable_operator::{
     },
     kvp::{Annotation, Label, LabelError, Labels, ObjectLabels},
     logging::controller::ReconcilerError,
-    product_logging::{
-        self,
-        framework::LoggingError,
-        spec::{ContainerLogConfig, Logging},
-    },
+    product_logging::{self, framework::LoggingError, spec::ContainerLogConfig},
     role_utils::RoleGroupRef,
     shared::time::Duration,
     status::condition::{
@@ -71,14 +67,14 @@ use stackable_operator::{
 use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
-    config,
+    controller::build::config_map,
     controller_commons::{self, CONFIG_VOLUME_NAME, LOG_CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
     crd::{
-        self, AIRFLOW_CONFIG_FILENAME, APP_NAME, AirflowClusterStatus, AirflowConfig,
-        AirflowExecutor, AirflowExecutorCommonConfiguration, AirflowRole, CONFIG_PATH, Container,
-        ExecutorConfig, HTTP_PORT, HTTP_PORT_NAME, LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME,
-        LOG_CONFIG_DIR, METRICS_PORT, METRICS_PORT_NAME, OPERATOR_NAME, STACKABLE_LOG_DIR,
-        TEMPLATE_LOCATION, TEMPLATE_NAME, TEMPLATE_VOLUME_NAME,
+        self, APP_NAME, AirflowClusterStatus, AirflowConfig, AirflowExecutor,
+        AirflowExecutorCommonConfiguration, AirflowRole, CONFIG_PATH, Container, ExecutorConfig,
+        HTTP_PORT, HTTP_PORT_NAME, LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME, LOG_CONFIG_DIR,
+        METRICS_PORT, METRICS_PORT_NAME, OPERATOR_NAME, STACKABLE_LOG_DIR, TEMPLATE_LOCATION,
+        TEMPLATE_NAME, TEMPLATE_VOLUME_NAME,
         authentication::{
             AirflowAuthenticationClassResolved, AirflowClientAuthenticationDetailsResolved,
         },
@@ -96,7 +92,6 @@ use crate::{
         },
         pdb::add_pdbs,
     },
-    product_logging::extend_config_map_with_log_config,
     service::{
         build_rolegroup_headless_service, build_rolegroup_metrics_service,
         stateful_set_service_name,
@@ -157,16 +152,9 @@ pub enum Error {
         source: stackable_operator::commons::rbac::Error,
     },
 
-    #[snafu(display("failed to build webserver config for {rolegroup}"))]
-    BuildWebserverConfig {
-        source: config::webserver_config::Error,
-        rolegroup: RoleGroupRef<v1alpha2::AirflowCluster>,
-    },
-
-    #[snafu(display("failed to build ConfigMap for {rolegroup}"))]
-    BuildRoleGroupConfig {
-        source: stackable_operator::builder::configmap::Error,
-        rolegroup: RoleGroupRef<v1alpha2::AirflowCluster>,
+    #[snafu(display("failed to build rolegroup ConfigMap"))]
+    BuildConfigMap {
+        source: crate::controller::build::config_map::Error,
     },
 
     #[snafu(display("failed to resolve and merge config for role and role group"))]
@@ -193,12 +181,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 update status"))]
     ApplyStatus {
         source: stackable_operator::client::Error,
@@ -558,7 +540,7 @@ pub async fn reconcile_airflow(
                     rolegroup: rolegroup.clone(),
                 })?;
 
-            let rg_configmap = build_rolegroup_config_map(
+            let rg_configmap = config_map::build_rolegroup_config_map(
                 airflow,
                 &validated.image,
                 &rolegroup,
@@ -567,7 +549,8 @@ pub async fn reconcile_airflow(
                 &validated.authorization_config,
                 &validated_rg_config.merged_config.logging,
                 &Container::Airflow,
-            )?;
+            )
+            .context(BuildConfigMapSnafu)?;
             cluster_resources
                 .add(client, rg_configmap)
                 .await
@@ -643,7 +626,7 @@ async fn build_executor_template(
         role_group: "kubernetes".into(),
     };
 
-    let rg_configmap = build_rolegroup_config_map(
+    let rg_configmap = config_map::build_rolegroup_config_map(
         airflow,
         resolved_product_image,
         &rolegroup,
@@ -652,7 +635,8 @@ async fn build_executor_template(
         authorization_config,
         &merged_executor_config.logging,
         &Container::Base,
-    )?;
+    )
+    .context(BuildConfigMapSnafu)?;
     cluster_resources
         .add(client, rg_configmap)
         .await
@@ -699,68 +683,6 @@ async fn build_executor_template(
     Ok(())
 }
 
-/// The rolegroup [`ConfigMap`] configures the rolegroup based on the configuration given by the administrator
-#[allow(clippy::too_many_arguments)]
-fn build_rolegroup_config_map(
-    airflow: &v1alpha2::AirflowCluster,
-    resolved_product_image: &ResolvedProductImage,
-    rolegroup: &RoleGroupRef<v1alpha2::AirflowCluster>,
-    config_file_overrides: &BTreeMap<String, String>,
-    authentication_config: &AirflowClientAuthenticationDetailsResolved,
-    authorization_config: &AirflowAuthorizationResolved,
-    logging: &Logging<Container>,
-    container: &Container,
-) -> Result<ConfigMap, Error> {
-    let config_file = config::webserver_config::build(
-        authentication_config,
-        authorization_config,
-        &resolved_product_image.product_version,
-        config_file_overrides,
-    )
-    .with_context(|_| BuildWebserverConfigSnafu {
-        rolegroup: rolegroup.clone(),
-    })?;
-
-    let mut cm_builder = ConfigMapBuilder::new();
-
-    cm_builder
-        .metadata(
-            ObjectMetaBuilder::new()
-                .name_and_namespace(airflow)
-                .name(rolegroup.object_name())
-                .ownerreference_from_resource(airflow, None, Some(true))
-                .context(ObjectMissingMetadataForOwnerRefSnafu)?
-                .with_recommended_labels(&build_recommended_labels(
-                    airflow,
-                    AIRFLOW_CONTROLLER_NAME,
-                    &resolved_product_image.app_version_label_value,
-                    &rolegroup.role,
-                    &rolegroup.role_group,
-                ))
-                .context(ObjectMetaSnafu)?
-                .build(),
-        )
-        .add_data(AIRFLOW_CONFIG_FILENAME, config_file);
-
-    extend_config_map_with_log_config(
-        rolegroup,
-        logging,
-        container,
-        &Container::Vector,
-        &mut cm_builder,
-        resolved_product_image,
-    )
-    .context(InvalidLoggingConfigSnafu {
-        cm_name: rolegroup.object_name(),
-    })?;
-
-    cm_builder
-        .build()
-        .with_context(|_| BuildRoleGroupConfigSnafu {
-            rolegroup: rolegroup.clone(),
-        })
-}
-
 fn build_rolegroup_metadata(
     airflow: &v1alpha2::AirflowCluster,
     resolved_product_image: &&ResolvedProductImage,
diff --git a/rust/operator-binary/src/controller/build/config_map.rs b/rust/operator-binary/src/controller/build/config_map.rs
@@ -0,0 +1,115 @@
+//! Builds the rolegroup [`ConfigMap`]: the rendered `webserver_config.py` plus the
+//! logging/vector configuration.
+
+use std::collections::BTreeMap;
+
+use snafu::{ResultExt, Snafu};
+use stackable_operator::{
+    builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
+    commons::product_image_selection::ResolvedProductImage,
+    k8s_openapi::api::core::v1::ConfigMap,
+    product_logging::spec::Logging,
+    role_utils::RoleGroupRef,
+};
+
+use crate::{
+    airflow_controller::AIRFLOW_CONTROLLER_NAME,
+    config::webserver_config,
+    crd::{
+        AIRFLOW_CONFIG_FILENAME, Container,
+        authentication::AirflowClientAuthenticationDetailsResolved,
+        authorization::AirflowAuthorizationResolved, build_recommended_labels, v1alpha2,
+    },
+    product_logging::extend_config_map_with_log_config,
+};
+
+#[derive(Snafu, Debug)]
+pub enum Error {
+    #[snafu(display("failed to build webserver config for {rolegroup}"))]
+    BuildWebserverConfig {
+        source: webserver_config::Error,
+        rolegroup: RoleGroupRef<v1alpha2::AirflowCluster>,
+    },
+
+    #[snafu(display("object is missing metadata to build owner reference"))]
+    ObjectMissingMetadataForOwnerRef {
+        source: stackable_operator::builder::meta::Error,
+    },
+
+    #[snafu(display("failed to build object meta"))]
+    ObjectMeta {
+        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 build ConfigMap for {rolegroup}"))]
+    BuildConfigMap {
+        source: stackable_operator::builder::configmap::Error,
+        rolegroup: RoleGroupRef<v1alpha2::AirflowCluster>,
+    },
+}
+
+/// The rolegroup [`ConfigMap`] configures the rolegroup based on the configuration given by the administrator
+#[allow(clippy::too_many_arguments)]
+pub fn build_rolegroup_config_map(
+    airflow: &v1alpha2::AirflowCluster,
+    resolved_product_image: &ResolvedProductImage,
+    rolegroup: &RoleGroupRef<v1alpha2::AirflowCluster>,
+    config_file_overrides: &BTreeMap<String, String>,
+    authentication_config: &AirflowClientAuthenticationDetailsResolved,
+    authorization_config: &AirflowAuthorizationResolved,
+    logging: &Logging<Container>,
+    container: &Container,
+) -> Result<ConfigMap, Error> {
+    let config_file = webserver_config::build(
+        authentication_config,
+        authorization_config,
+        &resolved_product_image.product_version,
+        config_file_overrides,
+    )
+    .with_context(|_| BuildWebserverConfigSnafu {
+        rolegroup: rolegroup.clone(),
+    })?;
+
+    let mut cm_builder = ConfigMapBuilder::new();
+
+    cm_builder
+        .metadata(
+            ObjectMetaBuilder::new()
+                .name_and_namespace(airflow)
+                .name(rolegroup.object_name())
+                .ownerreference_from_resource(airflow, None, Some(true))
+                .context(ObjectMissingMetadataForOwnerRefSnafu)?
+                .with_recommended_labels(&build_recommended_labels(
+                    airflow,
+                    AIRFLOW_CONTROLLER_NAME,
+                    &resolved_product_image.app_version_label_value,
+                    &rolegroup.role,
+                    &rolegroup.role_group,
+                ))
+                .context(ObjectMetaSnafu)?
+                .build(),
+        )
+        .add_data(AIRFLOW_CONFIG_FILENAME, config_file);
+
+    extend_config_map_with_log_config(
+        rolegroup,
+        logging,
+        container,
+        &Container::Vector,
+        &mut cm_builder,
+        resolved_product_image,
+    )
+    .context(InvalidLoggingConfigSnafu {
+        cm_name: rolegroup.object_name(),
+    })?;
+
+    cm_builder.build().with_context(|_| BuildConfigMapSnafu {
+        rolegroup: rolegroup.clone(),
+    })
+}
diff --git a/rust/operator-binary/src/controller/build/mod.rs b/rust/operator-binary/src/controller/build/mod.rs
@@ -0,0 +1,3 @@
+//! Builders that assemble Kubernetes resources from the validated cluster.
+
+pub mod config_map;
diff --git a/rust/operator-binary/src/controller/mod.rs b/rust/operator-binary/src/controller/mod.rs
@@ -1,2 +1,3 @@
+pub mod build;
 pub mod dereference;
 pub mod validate;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+//! Builders that assemble Kubernetes resources from the validated cluster.`
	`2`	`+`
	`3`	`+pub mod config_map;`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+pub mod build;`
`1`	`2`	`pub mod dereference;`
`2`	`3`	`pub mod validate;`