chore: Remove separate CRD crate

stackabletech · Feb 7, 2025 · 3a43ee6 · 3a43ee6
1 parent 0191244
commit 3a43ee6
Show file tree

Hide file tree

Showing 20 changed files with 67 additions and 94 deletions.
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,7 +9,7 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-stackable-kafka-crd = { path = "../crd" }
+indoc.workspace = true
 anyhow.workspace = true
 clap.workspace = true
 const_format.workspace = true
@@ -25,6 +25,7 @@ tracing.workspace = true
 
 [dev-dependencies]
 serde_yaml.workspace = true
+rstest.workspace = true
 
 [build-dependencies]
 built.workspace = true

diff --git a/rust/operator-binary/src/config/jvm.rs b/rust/operator-binary/src/config/jvm.rs
@@ -1,13 +1,14 @@
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_kafka_crd::{
-    KafkaConfig, KafkaConfigFragment, JVM_SECURITY_PROPERTIES_FILE, METRICS_PORT,
-    STACKABLE_CONFIG_DIR,
-};
 use stackable_operator::{
     memory::{BinaryMultiple, MemoryQuantity},
     role_utils::{self, GenericRoleConfig, JavaCommonConfig, JvmArgumentOverrides, Role},
 };
 
+use crate::crd::{
+    KafkaConfig, KafkaConfigFragment, JVM_SECURITY_PROPERTIES_FILE, METRICS_PORT,
+    STACKABLE_CONFIG_DIR,
+};
+
 const JAVA_HEAP_FACTOR: f32 = 0.8;
 
 #[derive(Snafu, Debug)]
@@ -97,9 +98,8 @@ fn is_heap_jvm_argument(jvm_argument: &str) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use stackable_kafka_crd::{KafkaCluster, KafkaRole};
-
     use super::*;
+    use crate::crd::{KafkaCluster, KafkaRole};
 
     #[test]
     fn test_construct_jvm_arguments_defaults() {

diff --git a/rust/crd/src/affinity.rs → rust/operator-binary/src/crd/affinity.rs b/rust/crd/src/affinity.rs → rust/operator-binary/src/crd/affinity.rs
@@ -3,7 +3,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::PodAntiAffinity,
 };
 
-use crate::{KafkaRole, APP_NAME};
+use crate::crd::{KafkaRole, APP_NAME};
 
 pub fn get_affinity(cluster_name: &str, role: &KafkaRole) -> StackableAffinityFragment {
     StackableAffinityFragment {

diff --git a/rust/crd/src/authentication.rs → ...operator-binary/src/crd/authentication.rs b/rust/crd/src/authentication.rs → ...operator-binary/src/crd/authentication.rs
@@ -6,7 +6,7 @@ use stackable_operator::{
     schemars::{self, JsonSchema},
 };
 
-use crate::ObjectRef;
+use crate::crd::ObjectRef;
 
 pub const SUPPORTED_AUTHENTICATION_CLASS_PROVIDERS: [&str; 2] = ["TLS", "Kerberos"];
 

diff --git a/rust/crd/src/authorization.rs → .../operator-binary/src/crd/authorization.rs b/rust/crd/src/authorization.rs → .../operator-binary/src/crd/authorization.rs
diff --git a/rust/crd/src/listener.rs → rust/operator-binary/src/crd/listener.rs b/rust/crd/src/listener.rs → rust/operator-binary/src/crd/listener.rs
@@ -7,7 +7,7 @@ use snafu::{OptionExt, Snafu};
 use stackable_operator::{kube::ResourceExt, utils::cluster_info::KubernetesClusterInfo};
 use strum::{EnumDiscriminants, EnumString};
 
-use crate::{security::KafkaTlsSecurity, KafkaCluster, STACKABLE_LISTENER_BROKER_DIR};
+use crate::crd::{security::KafkaTlsSecurity, KafkaCluster, STACKABLE_LISTENER_BROKER_DIR};
 
 const LISTENER_LOCAL_ADDRESS: &str = "0.0.0.0";
 
@@ -273,7 +273,7 @@ mod tests {
     };
 
     use super::*;
-    use crate::authentication::ResolvedAuthenticationClasses;
+    use crate::crd::authentication::ResolvedAuthenticationClasses;
 
     fn default_cluster_info() -> KubernetesClusterInfo {
         KubernetesClusterInfo {

diff --git a/rust/crd/src/lib.rs → rust/operator-binary/src/crd/mod.rs b/rust/crd/src/lib.rs → rust/operator-binary/src/crd/mod.rs
@@ -39,7 +39,7 @@ use stackable_operator::{
 };
 use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
 
-use crate::{authorization::KafkaAuthorization, tls::KafkaTls};
+use crate::crd::{authorization::KafkaAuthorization, tls::KafkaTls};
 
 pub const DOCKER_IMAGE_BASE_NAME: &str = "kafka";
 pub const APP_NAME: &str = "kafka";

diff --git a/rust/crd/src/security.rs → rust/operator-binary/src/crd/security.rs b/rust/crd/src/security.rs → rust/operator-binary/src/crd/security.rs
@@ -27,7 +27,7 @@ use stackable_operator::{
     utils::COMMON_BASH_TRAP_FUNCTIONS,
 };
 
-use crate::{
+use crate::crd::{
     authentication::{self, ResolvedAuthenticationClasses},
     listener::{self, node_address_cmd, KafkaListenerConfig},
     tls, KafkaCluster, KafkaRole, LISTENER_BOOTSTRAP_VOLUME_NAME, LISTENER_BROKER_VOLUME_NAME,

diff --git a/rust/crd/src/tls.rs → rust/operator-binary/src/crd/tls.rs b/rust/crd/src/tls.rs → rust/operator-binary/src/crd/tls.rs
diff --git a/rust/operator-binary/src/discovery.rs b/rust/operator-binary/src/discovery.rs
@@ -1,15 +1,18 @@
 use std::num::TryFromIntError;
 
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_kafka_crd::{security::KafkaTlsSecurity, KafkaCluster, KafkaRole};
 use stackable_operator::{
     builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
     commons::{listener::Listener, product_image_selection::ResolvedProductImage},
     k8s_openapi::api::core::v1::{ConfigMap, Service},
     kube::{runtime::reflector::ObjectRef, Resource, ResourceExt},
 };
 
-use crate::{kafka_controller::KAFKA_CONTROLLER_NAME, utils::build_recommended_labels};
+use crate::{
+    crd::{security::KafkaTlsSecurity, KafkaCluster, KafkaRole},
+    kafka_controller::KAFKA_CONTROLLER_NAME,
+    utils::build_recommended_labels,
+};
 
 #[derive(Snafu, Debug)]
 pub enum Error {

diff --git a/rust/operator-binary/src/kafka_controller.rs b/rust/operator-binary/src/kafka_controller.rs
@@ -12,16 +12,6 @@ use product_config::{
     ProductConfigManager,
 };
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_kafka_crd::{
-    listener::{get_kafka_listener_config, pod_fqdn, KafkaListenerError},
-    security::KafkaTlsSecurity,
-    Container, KafkaCluster, KafkaClusterStatus, KafkaConfig, KafkaRole, APP_NAME,
-    DOCKER_IMAGE_BASE_NAME, JVM_SECURITY_PROPERTIES_FILE, KAFKA_HEAP_OPTS,
-    LISTENER_BOOTSTRAP_VOLUME_NAME, LISTENER_BROKER_VOLUME_NAME, LOG_DIRS_VOLUME_NAME,
-    METRICS_PORT, METRICS_PORT_NAME, OPERATOR_NAME, SERVER_PROPERTIES_FILE, STACKABLE_CONFIG_DIR,
-    STACKABLE_DATA_DIR, STACKABLE_LISTENER_BOOTSTRAP_DIR, STACKABLE_LISTENER_BROKER_DIR,
-    STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR,
-};
 use stackable_operator::{
     builder::{
         self,
@@ -84,6 +74,16 @@ use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
     config::jvm::{construct_heap_jvm_args, construct_non_heap_jvm_args},
+    crd::{
+        listener::{get_kafka_listener_config, pod_fqdn, KafkaListenerError},
+        security::KafkaTlsSecurity,
+        Container, KafkaCluster, KafkaClusterStatus, KafkaConfig, KafkaRole, APP_NAME,
+        DOCKER_IMAGE_BASE_NAME, JVM_SECURITY_PROPERTIES_FILE, KAFKA_HEAP_OPTS,
+        LISTENER_BOOTSTRAP_VOLUME_NAME, LISTENER_BROKER_VOLUME_NAME, LOG_DIRS_VOLUME_NAME,
+        METRICS_PORT, METRICS_PORT_NAME, OPERATOR_NAME, SERVER_PROPERTIES_FILE,
+        STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR, STACKABLE_LISTENER_BOOTSTRAP_DIR,
+        STACKABLE_LISTENER_BROKER_DIR, STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR,
+    },
     discovery::{self, build_discovery_configmaps},
     kerberos::{self, add_kerberos_pod_config},
     operations::{
@@ -221,7 +221,7 @@ pub enum Error {
 
     #[snafu(display("invalid kafka listeners"))]
     InvalidKafkaListeners {
-        source: stackable_kafka_crd::listener::KafkaListenerError,
+        source: crate::crd::listener::KafkaListenerError,
     },
 
     #[snafu(display("failed to add listener volume"))]
@@ -241,17 +241,15 @@ pub enum Error {
     },
 
     #[snafu(display("failed to initialize security context"))]
-    FailedToInitializeSecurityContext {
-        source: stackable_kafka_crd::security::Error,
-    },
+    FailedToInitializeSecurityContext { source: crate::crd::security::Error },
 
     #[snafu(display("failed to create cluster resources"))]
     CreateClusterResources {
         source: stackable_operator::cluster_resources::Error,
     },
 
     #[snafu(display("failed to resolve and merge config for role and role group"))]
-    FailedToResolveConfig { source: stackable_kafka_crd::Error },
+    FailedToResolveConfig { source: crate::crd::Error },
 
     #[snafu(display("failed to resolve the Vector aggregator address"))]
     ResolveVectorAggregatorAddress {
@@ -285,7 +283,7 @@ pub enum Error {
     },
 
     #[snafu(display("internal operator failure"))]
-    InternalOperatorError { source: stackable_kafka_crd::Error },
+    InternalOperatorError { source: crate::crd::Error },
 
     #[snafu(display(
         "failed to serialize [{JVM_SECURITY_PROPERTIES_FILE}] for {}",
@@ -323,9 +321,7 @@ pub enum Error {
     },
 
     #[snafu(display("failed to add Secret Volumes and VolumeMounts"))]
-    AddVolumesAndVolumeMounts {
-        source: stackable_kafka_crd::security::Error,
-    },
+    AddVolumesAndVolumeMounts { source: crate::crd::security::Error },
 
     #[snafu(display("failed to resolve the fully-qualified pod name"))]
     ResolveNamespace { source: KafkaListenerError },
@@ -334,9 +330,7 @@ pub enum Error {
     AddKerberosConfig { source: kerberos::Error },
 
     #[snafu(display("failed to validate authentication method"))]
-    FailedToValidateAuthenticationMethod {
-        source: stackable_kafka_crd::security::Error,
-    },
+    FailedToValidateAuthenticationMethod { source: crate::crd::security::Error },
 
     #[snafu(display("failed to add needed volume"))]
     AddVolume { source: builder::pod::Error },

diff --git a/rust/operator-binary/src/kerberos.rs b/rust/operator-binary/src/kerberos.rs
@@ -1,8 +1,4 @@
 use snafu::{ResultExt, Snafu};
-use stackable_kafka_crd::{
-    security::KafkaTlsSecurity, KafkaRole, LISTENER_BOOTSTRAP_VOLUME_NAME,
-    LISTENER_BROKER_VOLUME_NAME, STACKABLE_KERBEROS_DIR, STACKABLE_KERBEROS_KRB5_PATH,
-};
 use stackable_operator::builder::{
     self,
     pod::{
@@ -15,6 +11,11 @@ use stackable_operator::builder::{
     },
 };
 
+use crate::crd::{
+    security::KafkaTlsSecurity, KafkaRole, LISTENER_BOOTSTRAP_VOLUME_NAME,
+    LISTENER_BROKER_VOLUME_NAME, STACKABLE_KERBEROS_DIR, STACKABLE_KERBEROS_KRB5_PATH,
+};
+
 #[derive(Snafu, Debug)]
 pub enum Error {
     #[snafu(display("failed to add Kerberos secret volume"))]

diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs
@@ -3,7 +3,6 @@ use std::sync::Arc;
 use clap::{crate_description, crate_version, Parser};
 use futures::StreamExt;
 use product_config::ProductConfigManager;
-use stackable_kafka_crd::{KafkaCluster, APP_NAME, OPERATOR_NAME};
 use stackable_operator::{
     cli::{Command, ProductOperatorRun},
     client::{self, Client},
@@ -25,9 +24,13 @@ use stackable_operator::{
     CustomResourceExt,
 };
 
-use crate::kafka_controller::KAFKA_FULL_CONTROLLER_NAME;
+use crate::{
+    crd::{KafkaCluster, APP_NAME, OPERATOR_NAME},
+    kafka_controller::KAFKA_FULL_CONTROLLER_NAME,
+};
 
 mod config;
+mod crd;
 mod discovery;
 mod kafka_controller;
 mod kerberos;

diff --git a/rust/operator-binary/src/operations/graceful_shutdown.rs b/rust/operator-binary/src/operations/graceful_shutdown.rs
@@ -1,9 +1,10 @@
 use std::collections::BTreeMap;
 
 use snafu::{ResultExt, Snafu};
-use stackable_kafka_crd::KafkaConfig;
 use stackable_operator::builder::pod::PodBuilder;
 
+use crate::crd::KafkaConfig;
+
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display("Failed to set terminationGracePeriod"))]

diff --git a/rust/operator-binary/src/operations/pdb.rs b/rust/operator-binary/src/operations/pdb.rs
@@ -1,11 +1,13 @@
 use snafu::{ResultExt, Snafu};
-use stackable_kafka_crd::{KafkaCluster, KafkaRole, APP_NAME, OPERATOR_NAME};
 use stackable_operator::{
     builder::pdb::PodDisruptionBudgetBuilder, client::Client, cluster_resources::ClusterResources,
     commons::pdb::PdbConfig, kube::ResourceExt,
 };
 
-use crate::kafka_controller::KAFKA_CONTROLLER_NAME;
+use crate::{
+    crd::{KafkaCluster, KafkaRole, APP_NAME, OPERATOR_NAME},
+    kafka_controller::KAFKA_CONTROLLER_NAME,
+};
 
 #[derive(Snafu, Debug)]
 pub enum Error {