fix: consolidate configmap to resource folder, move controller commons to build

Author: maltesander

rust/operator-binary/src/airflow_controller.rs

@@ -32,17 +32,17 @@ use crate::{
     controller::{
         ValidatedCluster, ValidatedExecutorTemplate,
         build::{
-            config_map,
             resource::{
+                config_map,
                 executor::build_executor_template_config_map,
                 listener::build_group_listener,
                 pdb::build_pdb,
                 service::{build_rolegroup_headless_service, build_rolegroup_metrics_service},
                 statefulset::build_server_rolegroup_statefulset,
             },
+            volumes::LOG_VOLUME_NAME,
         },
     },
-    controller_commons::LOG_VOLUME_NAME,
     crd::{
         APP_NAME, AirflowClusterStatus, AirflowConfigOverrides, Container, OPERATOR_NAME,
         internal_secret::{
@@ -128,7 +128,7 @@ pub enum Error {
 
     #[snafu(display("failed to build rolegroup ConfigMap"))]
     BuildConfigMap {
-        source: crate::controller::build::config_map::Error,
+        source: crate::controller::build::resource::config_map::Error,
     },
 
     #[snafu(display("invalid git-sync specification"))]

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

@@ -1,6 +1,6 @@
 //! Builders that assemble Kubernetes resources from the validated cluster.
 
-pub mod config_map;
 pub mod graceful_shutdown;
 pub mod properties;
 pub mod resource;
+pub mod volumes;

…inary/src/controller/build/config_map.rs …/controller/build/resource/config_map.rsrust/operator-binary/src/controller/build/config_map.rs renamed to rust/operator-binary/src/controller/build/resource/config_map.rs rust/operator-binary/src/controller/build/config_map.rs renamed to rust/operator-binary/src/controller/build/resource/config_map.rs

@@ -32,9 +32,9 @@ use crate::{
                 add_authentication_volumes_and_volume_mounts, add_git_sync_resources,
                 build_logging_container,
             },
+            volumes::{self, CONFIG_VOLUME_NAME, LOG_CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
         },
     },
-    controller_commons::{self, CONFIG_VOLUME_NAME, LOG_CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
     crd::{CONFIG_PATH, Container, LOG_CONFIG_DIR, STACKABLE_LOG_DIR, TEMPLATE_NAME},
 };
 
@@ -149,7 +149,7 @@ pub fn build_executor_template_config_map(
     pb.add_container(airflow_container.build());
     pb.add_volumes(cluster.volumes().clone())
         .context(AddVolumeSnafu)?;
-    pb.add_volumes(controller_commons::create_volumes(
+    pb.add_volumes(volumes::create_volumes(
         cluster
             .resource_names(&executor_role_name(), &executor_role_group_name())
             .role_group_config_map()

rust/operator-binary/src/controller/build/resource/executor.rs

@@ -1,5 +1,6 @@
 //! Builders for individual Kubernetes resources (one module per resource type).
 
+pub mod config_map;
 pub mod executor;
 pub mod listener;
 pub mod pdb;

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

@@ -19,7 +19,7 @@ use stackable_operator::{
 };
 
 use crate::{
-    controller_commons::{CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
+    controller::build::volumes::{CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
     crd::authentication::{
         AirflowAuthenticationClassResolved, AirflowClientAuthenticationDetailsResolved,
     },

rust/operator-binary/src/controller/build/resource/pod.rs

@@ -41,9 +41,9 @@ use crate::{
                 },
                 service::stateful_set_service_name,
             },
+            volumes::{self, CONFIG_VOLUME_NAME, LOG_CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
         },
     },
-    controller_commons::{self, CONFIG_VOLUME_NAME, LOG_CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
     crd::{
         AirflowExecutor, AirflowRole, CONFIG_PATH, Container, HTTP_PORT_NAME, LISTENER_PVC_NAME,
         LISTENER_VOLUME_DIR, LOG_CONFIG_DIR, METRICS_CONTAINER_NAME, METRICS_PORT,
@@ -300,7 +300,7 @@ pub fn build_server_rolegroup_statefulset(
 
     pb.add_volumes(validated_cluster.volumes().clone())
         .context(AddVolumeSnafu)?;
-    pb.add_volumes(controller_commons::create_volumes(
+    pb.add_volumes(volumes::create_volumes(
         resource_names.role_group_config_map().as_ref(),
         &logging.product_container,
     ))

rust/operator-binary/src/controller/build/resource/statefulset.rs

@@ -40,7 +40,6 @@ use crate::{
 
 mod airflow_controller;
 mod controller;
-mod controller_commons;
 mod crd;
 mod util;
 mod webhooks;