refactor: move k8s resources

Author: maltesander

rust/operator-binary/src/controller.rs

@@ -42,11 +42,13 @@ use strum::EnumDiscriminants;
 use crate::{
     OPERATOR_NAME,
     controller::build::{
-        discovery,
-        listener::build_role_listener,
         opa::HiveOpaConfig,
-        pdb::add_pdbs,
-        service::{build_rolegroup_headless_service, build_rolegroup_metrics_service},
+        resource::{
+            discovery,
+            listener::build_role_listener,
+            pdb::add_pdbs,
+            service::{build_rolegroup_headless_service, build_rolegroup_metrics_service},
+        },
     },
     crd::{APP_NAME, HiveClusterStatus, HiveRole, MetaStoreConfig, v1alpha1},
 };
@@ -71,7 +73,7 @@ pub enum Error {
 
     #[snafu(display("failed to build ConfigMap for role group {role_group}"))]
     BuildRoleGroupConfigMap {
-        source: build::config_map::Error,
+        source: build::resource::config_map::Error,
         role_group: RoleGroupName,
     },
 
@@ -125,7 +127,7 @@ pub enum Error {
 
     #[snafu(display("failed to create PodDisruptionBudget"))]
     FailedToCreatePdb {
-        source: crate::controller::build::pdb::Error,
+        source: crate::controller::build::resource::pdb::Error,
     },
 
     #[snafu(display("failed to get required Labels"))]
@@ -154,7 +156,7 @@ pub enum Error {
 
     #[snafu(display("failed to build StatefulSet for role group {role_group}"))]
     BuildRoleGroupStatefulSet {
-        source: build::statefulset::Error,
+        source: build::resource::statefulset::Error,
         role_group: RoleGroupName,
     },
 }
@@ -478,7 +480,7 @@ pub async fn reconcile_hive(
             let rg_headless_service =
                 build_rolegroup_headless_service(&validated_cluster, role_group_name);
 
-            let rg_configmap = build::config_map::build_metastore_rolegroup_config_map(
+            let rg_configmap = build::resource::config_map::build_metastore_rolegroup_config_map(
                 &validated_cluster,
                 role_group_name,
                 rg,
@@ -488,17 +490,18 @@ pub async fn reconcile_hive(
                 role_group: role_group_name.clone(),
             })?;
 
-            let rg_statefulset = build::statefulset::build_metastore_rolegroup_statefulset(
-                hive,
-                hive_role,
-                &validated_cluster,
-                role_group_name,
-                rg,
-                &rbac_sa.name_any(),
-            )
-            .with_context(|_| BuildRoleGroupStatefulSetSnafu {
-                role_group: role_group_name.clone(),
-            })?;
+            let rg_statefulset =
+                build::resource::statefulset::build_metastore_rolegroup_statefulset(
+                    hive,
+                    hive_role,
+                    &validated_cluster,
+                    role_group_name,
+                    rg,
+                    &rbac_sa.name_any(),
+                )
+                .with_context(|_| BuildRoleGroupStatefulSetSnafu {
+                    role_group: role_group_name.clone(),
+                })?;
 
             cluster_resources
                 .add(client, rg_metrics_service)

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

@@ -1,6 +1,8 @@
 use stackable_operator::crd::s3;
 
-use super::{opa::HiveOpaConfig, properties::ConfigFileName, statefulset::HDFS_CONFIG_MOUNT_DIR};
+use super::{
+    opa::HiveOpaConfig, properties::ConfigFileName, resource::statefulset::HDFS_CONFIG_MOUNT_DIR,
+};
 use crate::crd::{
     STACKABLE_CONFIG_DIR, STACKABLE_CONFIG_MOUNT_DIR, STACKABLE_LOG_CONFIG_MOUNT_DIR,
     STACKABLE_TRUST_STORE, STACKABLE_TRUST_STORE_PASSWORD, v1alpha1,

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

@@ -17,14 +17,9 @@ stackable_operator::constant!(pub(crate) PLACEHOLDER_LISTENER_ROLE_GROUP: RoleGr
 stackable_operator::constant!(pub(crate) UNVERSIONED_PRODUCT_VERSION: ProductVersion = "none");
 
 pub mod command;
-pub mod config_map;
-pub mod discovery;
 pub mod graceful_shutdown;
 pub mod jvm;
 pub mod kerberos;
-pub mod listener;
 pub mod opa;
-pub mod pdb;
 pub mod properties;
-pub mod service;
-pub mod statefulset;
+pub mod resource;

…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

@@ -7,7 +7,9 @@ use stackable_operator::{
 use crate::{
     controller::{
         ValidatedCluster,
-        build::{PLACEHOLDER_DISCOVERY_ROLE_GROUP, listener::build_listener_connection_string},
+        build::{
+            PLACEHOLDER_DISCOVERY_ROLE_GROUP, resource::listener::build_listener_connection_string,
+        },
     },
     crd::{HiveRole, v1alpha1},
 };
@@ -22,7 +24,7 @@ pub enum Error {
 
     #[snafu(display("failed to configure listener discovery configmap"))]
     ListenerConfiguration {
-        source: crate::controller::build::listener::Error,
+        source: crate::controller::build::resource::listener::Error,
     },
 }
 

…binary/src/controller/build/discovery.rs …c/controller/build/resource/discovery.rsrust/operator-binary/src/controller/build/discovery.rs renamed to rust/operator-binary/src/controller/build/resource/discovery.rs rust/operator-binary/src/controller/build/discovery.rs renamed to rust/operator-binary/src/controller/build/resource/discovery.rs

@@ -0,0 +1,8 @@
+//! Builders that turn a `ValidatedCluster` into Kubernetes resources.
+
+pub mod config_map;
+pub mod discovery;
+pub mod listener;
+pub mod pdb;
+pub mod service;
+pub mod statefulset;

…-binary/src/controller/build/listener.rs …rc/controller/build/resource/listener.rsrust/operator-binary/src/controller/build/listener.rs renamed to rust/operator-binary/src/controller/build/resource/listener.rs rust/operator-binary/src/controller/build/listener.rs renamed to rust/operator-binary/src/controller/build/resource/listener.rs

@@ -135,7 +135,7 @@ pub const LISTENER_VOLUME_DIR: &str = "/stackable/listener";
 stackable_operator::constant!(HDFS_DISCOVERY_VOLUME_NAME: VolumeName = "hdfs-discovery");
 
 /// The directory the HDFS discovery ConfigMap volume is mounted at. Also consumed by
-/// [`build_container_command_args`](super::command::build_container_command_args) when copying the
+/// [`build_container_command_args`](super::super::command::build_container_command_args) when copying the
 /// mounted HDFS config into the writeable config directory.
 pub(crate) const HDFS_CONFIG_MOUNT_DIR: &str = "/stackable/mount/hdfs-config";