chore: Remove separate CRD crate

Techassi · Techassi · commit 14d6bf3711c0 · 2025-02-10T14:37:43.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["rust/crd", "rust/operator-binary"]
+members = ["rust/operator-binary"]
 resolver = "2"
 
 [workspace.package]
diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml
diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml
@@ -9,9 +9,8 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-stackable-spark-k8s-crd = { path = "../crd" }
-
 anyhow.workspace = true
+const_format.workspace = true
 product-config.workspace = true
 semver.workspace = true
 serde.workspace = true
@@ -26,5 +25,9 @@ clap.workspace = true
 futures.workspace = true
 tokio.workspace = true
 
+[dev-dependencies]
+indoc.workspace = true
+rstest.workspace = true
+
 [build-dependencies]
 built.workspace = true
diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs
@@ -3,7 +3,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::PodAntiAffinity,
 };
 
-use crate::constants::{APP_NAME, HISTORY_ROLE_NAME};
+use crate::crd::constants::{APP_NAME, HISTORY_ROLE_NAME};
 
 pub fn history_affinity(cluster_name: &str) -> StackableAffinityFragment {
     let affinity_between_role_pods =
@@ -36,7 +36,7 @@ mod test {
         role_utils::RoleGroupRef,
     };
 
-    use crate::{constants::HISTORY_ROLE_NAME, history::SparkHistoryServer};
+    use crate::crd::{constants::HISTORY_ROLE_NAME, history::SparkHistoryServer};
 
     #[test]
     pub fn test_history_affinity_defaults() {
diff --git a/rust/operator-binary/src/crd/constants.rs b/rust/operator-binary/src/crd/constants.rs
diff --git a/rust/operator-binary/src/crd/history.rs b/rust/operator-binary/src/crd/history.rs
@@ -30,7 +30,7 @@ use stackable_operator::{
 };
 use strum::{Display, EnumIter};
 
-use crate::{affinity::history_affinity, constants::*, logdir::ResolvedLogDir};
+use crate::crd::{affinity::history_affinity, constants::*, logdir::ResolvedLogDir};
 
 #[derive(Snafu, Debug)]
 pub enum Error {
@@ -484,7 +484,7 @@ mod test {
     };
 
     use super::*;
-    use crate::logdir::S3LogDir;
+    use crate::crd::logdir::S3LogDir;
 
     #[test]
     pub fn test_env_overrides() {
diff --git a/rust/operator-binary/src/crd/logdir.rs b/rust/operator-binary/src/crd/logdir.rs
@@ -15,7 +15,7 @@ use stackable_operator::{
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
 
-use crate::{
+use crate::crd::{
     constants::*,
     history::{
         LogFileDirectorySpec::{self, S3},
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
@@ -1,12 +1,5 @@
 //! This module provides all required CRD definitions and additional helper methods.
 
-pub mod affinity;
-pub mod constants;
-pub mod history;
-pub mod logdir;
-pub mod roles;
-pub mod tlscerts;
-
 use std::{
     cmp::max,
     collections::{BTreeMap, HashMap},
@@ -52,7 +45,17 @@ use stackable_operator::{
     utils::crds::raw_object_list_schema,
 };
 
-pub use crate::roles::*;
+use crate::crd::roles::{
+    RoleConfig, RoleConfigFragment, SparkApplicationRole, SparkContainer, SparkMode, SubmitConfig,
+    SubmitConfigFragment, VolumeMounts,
+};
+
+pub mod affinity;
+pub mod constants;
+pub mod history;
+pub mod logdir;
+pub mod roles;
+pub mod tlscerts;
 
 #[derive(Snafu, Debug)]
 pub enum Error {
@@ -1101,10 +1104,7 @@ mod tests {
     };
 
     use super::*;
-    use crate::{
-        cores_from_quantity, resources_to_driver_props, resources_to_executor_props, Quantity,
-        RoleConfig, SparkApplication, SparkStorageConfig,
-    };
+    use crate::crd::roles::SparkStorageConfig;
 
     #[test]
     fn test_default_resource_limits() {
diff --git a/rust/operator-binary/src/crd/roles.rs b/rust/operator-binary/src/crd/roles.rs
@@ -38,7 +38,7 @@ use stackable_operator::{
 };
 use strum::{Display, EnumIter};
 
-use crate::{ResolvedLogDir, SparkApplication};
+use crate::crd::{ResolvedLogDir, SparkApplication};
 
 #[derive(Clone, Debug, Deserialize, Display, Eq, PartialEq, Serialize, JsonSchema)]
 #[strum(serialize_all = "kebab-case")]
diff --git a/rust/operator-binary/src/crd/tlscerts.rs b/rust/operator-binary/src/crd/tlscerts.rs
@@ -3,7 +3,7 @@ use stackable_operator::commons::{
     tls_verification::{CaCert, Tls, TlsClientDetails, TlsServerVerification, TlsVerification},
 };
 
-use crate::{
+use crate::crd::{
     constants::{
         STACKABLE_MOUNT_PATH_TLS, STACKABLE_TLS_STORE_PASSWORD, STACKABLE_TRUST_STORE,
         SYSTEM_TRUST_STORE, SYSTEM_TRUST_STORE_PASSWORD,
diff --git a/rust/operator-binary/src/history/history_controller.rs b/rust/operator-binary/src/history/history_controller.rs
@@ -45,23 +45,23 @@ use stackable_operator::{
     role_utils::RoleGroupRef,
     time::Duration,
 };
-use stackable_spark_k8s_crd::{
-    constants::{
-        ACCESS_KEY_ID, APP_NAME, HISTORY_CONTROLLER_NAME, HISTORY_ROLE_NAME,
-        JVM_SECURITY_PROPERTIES_FILE, MAX_SPARK_LOG_FILES_SIZE, METRICS_PORT, OPERATOR_NAME,
-        SECRET_ACCESS_KEY, SPARK_CLUSTER_ROLE, SPARK_DEFAULTS_FILE_NAME, SPARK_ENV_SH_FILE_NAME,
-        SPARK_IMAGE_BASE_NAME, SPARK_UID, STACKABLE_TRUST_STORE, VOLUME_MOUNT_NAME_CONFIG,
-        VOLUME_MOUNT_NAME_LOG, VOLUME_MOUNT_NAME_LOG_CONFIG, VOLUME_MOUNT_PATH_CONFIG,
-        VOLUME_MOUNT_PATH_LOG, VOLUME_MOUNT_PATH_LOG_CONFIG,
-    },
-    history,
-    history::{HistoryConfig, SparkHistoryServer, SparkHistoryServerContainer},
-    logdir::ResolvedLogDir,
-    tlscerts, to_spark_env_sh_string,
-};
 use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
+    crd::{
+        constants::{
+            ACCESS_KEY_ID, APP_NAME, HISTORY_CONTROLLER_NAME, HISTORY_ROLE_NAME,
+            JVM_SECURITY_PROPERTIES_FILE, MAX_SPARK_LOG_FILES_SIZE, METRICS_PORT, OPERATOR_NAME,
+            SECRET_ACCESS_KEY, SPARK_CLUSTER_ROLE, SPARK_DEFAULTS_FILE_NAME,
+            SPARK_ENV_SH_FILE_NAME, SPARK_IMAGE_BASE_NAME, SPARK_UID, STACKABLE_TRUST_STORE,
+            VOLUME_MOUNT_NAME_CONFIG, VOLUME_MOUNT_NAME_LOG, VOLUME_MOUNT_NAME_LOG_CONFIG,
+            VOLUME_MOUNT_PATH_CONFIG, VOLUME_MOUNT_PATH_LOG, VOLUME_MOUNT_PATH_LOG_CONFIG,
+        },
+        history,
+        history::{HistoryConfig, SparkHistoryServer, SparkHistoryServerContainer},
+        logdir::ResolvedLogDir,
+        tlscerts, to_spark_env_sh_string,
+    },
     history::operations::pdb::add_pdbs,
     product_logging::{self, resolve_vector_aggregator_address},
     Ctx,
@@ -119,14 +119,10 @@ pub enum Error {
     },
 
     #[snafu(display("product config validation failed"))]
-    ProductConfigValidation {
-        source: stackable_spark_k8s_crd::history::Error,
-    },
+    ProductConfigValidation { source: crate::crd::history::Error },
 
     #[snafu(display("failed to resolve and merge config for role and role group"))]
-    FailedToResolveConfig {
-        source: stackable_spark_k8s_crd::history::Error,
-    },
+    FailedToResolveConfig { source: crate::crd::history::Error },
 
     #[snafu(display("number of cleaner rolegroups exceeds 1"))]
     TooManyCleanerRoleGroups,
@@ -135,9 +131,7 @@ pub enum Error {
     TooManyCleanerReplicas,
 
     #[snafu(display("failed to resolve the log dir configuration"))]
-    LogDir {
-        source: stackable_spark_k8s_crd::logdir::Error,
-    },
+    LogDir { source: crate::crd::logdir::Error },
 
     #[snafu(display("failed to create cluster resources"))]
     CreateClusterResources {
@@ -195,9 +189,7 @@ pub enum Error {
     },
 
     #[snafu(display("failed to create the log dir volumes specification"))]
-    CreateLogDirVolumesSpec {
-        source: stackable_spark_k8s_crd::logdir::Error,
-    },
+    CreateLogDirVolumesSpec { source: crate::crd::logdir::Error },
 
     #[snafu(display("failed to add needed volume"))]
     AddVolume { source: builder::pod::Error },
diff --git a/rust/operator-binary/src/history/operations/pdb.rs b/rust/operator-binary/src/history/operations/pdb.rs
@@ -3,7 +3,8 @@ use stackable_operator::{
     builder::pdb::PodDisruptionBudgetBuilder, client::Client, cluster_resources::ClusterResources,
     commons::pdb::PdbConfig, kube::ResourceExt,
 };
-use stackable_spark_k8s_crd::{
+
+use crate::crd::{
     constants::{APP_NAME, HISTORY_CONTROLLER_NAME, HISTORY_ROLE_NAME, OPERATOR_NAME},
     history::SparkHistoryServer,
 };
diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs
@@ -1,8 +1,3 @@
-mod history;
-mod pod_driver_controller;
-mod product_logging;
-mod spark_k8s_controller;
-
 use std::sync::Arc;
 
 use clap::{crate_description, crate_version, Parser};
@@ -25,16 +20,23 @@ use stackable_operator::{
     logging::controller::report_controller_reconciled,
     CustomResourceExt,
 };
-use stackable_spark_k8s_crd::{
+use tracing::info_span;
+use tracing_futures::Instrument;
+
+use crate::crd::{
     constants::{
         HISTORY_FULL_CONTROLLER_NAME, OPERATOR_NAME, POD_DRIVER_FULL_CONTROLLER_NAME,
         SPARK_CONTROLLER_NAME, SPARK_FULL_CONTROLLER_NAME,
     },
     history::SparkHistoryServer,
     SparkApplication,
 };
-use tracing::info_span;
-use tracing_futures::Instrument;
+
+mod crd;
+mod history;
+mod pod_driver_controller;
+mod product_logging;
+mod spark_k8s_controller;
 
 mod built_info {
     include!(concat!(env!("OUT_DIR"), "/built.rs"));
diff --git a/rust/operator-binary/src/pod_driver_controller.rs b/rust/operator-binary/src/pod_driver_controller.rs
@@ -11,11 +11,10 @@ use stackable_operator::{
     logging::controller::ReconcilerError,
     time::Duration,
 };
-use stackable_spark_k8s_crd::{
-    constants::POD_DRIVER_CONTROLLER_NAME, SparkApplication, SparkApplicationStatus,
-};
 use strum::{EnumDiscriminants, IntoStaticStr};
 
+use crate::crd::{constants::POD_DRIVER_CONTROLLER_NAME, SparkApplication, SparkApplicationStatus};
+
 const LABEL_NAME_INSTANCE: &str = "app.kubernetes.io/instance";
 
 #[derive(Snafu, Debug, EnumDiscriminants)]
@@ -24,22 +23,28 @@ const LABEL_NAME_INSTANCE: &str = "app.kubernetes.io/instance";
 pub enum Error {
     #[snafu(display("Label [{LABEL_NAME_INSTANCE}] not found for pod name [{pod_name}]"))]
     LabelInstanceNotFound { pod_name: String },
+
     #[snafu(display("Failed to update status for application [{name}]"))]
     ApplySparkApplicationStatus {
         source: stackable_operator::client::Error,
         name: String,
     },
+
     #[snafu(display("Pod name not found"))]
     PodNameNotFound,
+
     #[snafu(display("Namespace not found"))]
     NamespaceNotFound,
+
     #[snafu(display("Status phase not found for pod [{pod_name}]"))]
     PodStatusPhaseNotFound { pod_name: String },
+
     #[snafu(display("Spark application [{name}] not found"))]
     SparkApplicationNotFound {
         source: stackable_operator::client::Error,
         name: String,
     },
+
     #[snafu(display("Pod object is invalid"))]
     InvalidPod {
         source: error_boundary::InvalidObject,
diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs
diff --git a/rust/operator-binary/src/spark_k8s_controller.rs b/rust/operator-binary/src/spark_k8s_controller.rs
