chore: Remove separate CRD crate

Techassi · Techassi · commit dbff005b2fc1 · 2025-02-04T15:16:35.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,8 +9,6 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-stackable-hbase-crd = { path = "../crd" }
-
 anyhow.workspace = true
 clap.workspace = true
 const_format.workspace = true
@@ -19,6 +17,7 @@ futures.workspace = true
 indoc.workspace = true
 product-config.workspace = true
 serde.workspace = true
+serde_json.workspace = true
 snafu.workspace = true
 stackable-operator.workspace = true
 strum.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_hbase_crd::{
-    HbaseConfig, HbaseConfigFragment, HbaseRole, CONFIG_DIR_NAME, JVM_SECURITY_PROPERTIES_FILE,
-    METRICS_PORT,
-};
 use stackable_operator::{
     memory::{BinaryMultiple, MemoryQuantity},
     role_utils::{self, GenericRoleConfig, JavaCommonConfig, JvmArgumentOverrides, Role},
 };
 
+use crate::crd::{
+    HbaseConfig, HbaseConfigFragment, HbaseRole, CONFIG_DIR_NAME, JVM_SECURITY_PROPERTIES_FILE,
+    METRICS_PORT,
+};
+
 const JAVA_HEAP_FACTOR: f32 = 0.8;
 
 #[derive(Snafu, Debug)]
@@ -128,9 +129,8 @@ fn is_heap_jvm_argument(jvm_argument: &str) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use stackable_hbase_crd::{HbaseCluster, HbaseRole};
-
     use super::*;
+    use crate::crd::{HbaseCluster, HbaseRole};
 
     #[test]
     fn test_construct_jvm_arguments_defaults() {
diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs
@@ -5,7 +5,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::{PodAffinity, PodAntiAffinity},
 };
 
-use crate::{HbaseRole, APP_NAME};
+use crate::crd::{HbaseRole, APP_NAME};
 
 pub fn get_affinity(
     cluster_name: &str,
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
@@ -28,7 +28,7 @@ use stackable_operator::{
 };
 use strum::{Display, EnumIter, EnumString};
 
-use crate::{affinity::get_affinity, security::AuthorizationConfig};
+use crate::crd::{affinity::get_affinity, security::AuthorizationConfig};
 
 pub mod affinity;
 pub mod security;
@@ -708,7 +708,7 @@ mod tests {
         transform_all_roles_to_config, validate_all_roles_and_groups_config,
     };
 
-    use crate::{merged_env, HbaseCluster, HbaseRole};
+    use crate::crd::{merged_env, HbaseCluster, HbaseRole};
 
     #[test]
     pub fn test_env_overrides() {
diff --git a/rust/operator-binary/src/crd/security.rs b/rust/operator-binary/src/crd/security.rs
diff --git a/rust/operator-binary/src/discovery.rs b/rust/operator-binary/src/discovery.rs
@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 
 use product_config::writer::to_hadoop_xml;
 use snafu::{ResultExt, Snafu};
-use stackable_hbase_crd::{HbaseCluster, HbaseRole, HBASE_SITE_XML};
 use stackable_operator::{
     builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
     commons::product_image_selection::ResolvedProductImage,
@@ -12,6 +11,7 @@ use stackable_operator::{
 };
 
 use crate::{
+    crd::{HbaseCluster, HbaseRole, HBASE_SITE_XML},
     hbase_controller::build_recommended_labels,
     kerberos::{self, kerberos_discovery_config_properties},
     zookeeper::ZookeeperConnectionInformation,
diff --git a/rust/operator-binary/src/hbase_controller.rs b/rust/operator-binary/src/hbase_controller.rs
@@ -14,12 +14,6 @@ use product_config::{
     ProductConfigManager,
 };
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_hbase_crd::{
-    merged_env, Container, HbaseCluster, HbaseClusterStatus, HbaseConfig, HbaseConfigFragment,
-    HbaseRole, APP_NAME, CONFIG_DIR_NAME, HBASE_ENV_SH, HBASE_REST_PORT_NAME_HTTP,
-    HBASE_REST_PORT_NAME_HTTPS, HBASE_SITE_XML, JVM_SECURITY_PROPERTIES_FILE, SSL_CLIENT_XML,
-    SSL_SERVER_XML,
-};
 use stackable_operator::{
     builder::{
         self,
@@ -77,6 +71,12 @@ use crate::{
         construct_global_jvm_args, construct_hbase_heapsize_env,
         construct_role_specific_non_heap_jvm_args,
     },
+    crd::{
+        merged_env, Container, HbaseCluster, HbaseClusterStatus, HbaseConfig, HbaseConfigFragment,
+        HbaseRole, APP_NAME, CONFIG_DIR_NAME, HBASE_ENV_SH, HBASE_REST_PORT_NAME_HTTP,
+        HBASE_REST_PORT_NAME_HTTPS, HBASE_SITE_XML, JVM_SECURITY_PROPERTIES_FILE, SSL_CLIENT_XML,
+        SSL_SERVER_XML,
+    },
     discovery::build_discovery_configmap,
     kerberos::{
         self, add_kerberos_pod_config, kerberos_config_properties,
@@ -88,8 +88,7 @@ use crate::{
         extend_role_group_config_map, log4j_properties_file_name,
         resolve_vector_aggregator_address, STACKABLE_LOG_DIR,
     },
-    security,
-    security::opa::HbaseOpaConfig,
+    security::{self, opa::HbaseOpaConfig},
     zookeeper::{self, ZookeeperConnectionInformation},
     OPERATOR_NAME,
 };
@@ -232,10 +231,10 @@ pub enum Error {
     },
 
     #[snafu(display("failed to retrieve Hbase role group: {source}"))]
-    UnidentifiedHbaseRoleGroup { source: stackable_hbase_crd::Error },
+    UnidentifiedHbaseRoleGroup { source: crate::crd::Error },
 
     #[snafu(display("failed to resolve and merge config for role and role group"))]
-    FailedToResolveConfig { source: stackable_hbase_crd::Error },
+    FailedToResolveConfig { source: crate::crd::Error },
 
     #[snafu(display("failed to resolve the Vector aggregator address"))]
     ResolveVectorAggregatorAddress {
diff --git a/rust/operator-binary/src/kerberos.rs b/rust/operator-binary/src/kerberos.rs
@@ -2,9 +2,6 @@ use std::collections::BTreeMap;
 
 use indoc::formatdoc;
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_hbase_crd::{
-    HbaseCluster, HbaseRole, TLS_STORE_DIR, TLS_STORE_PASSWORD, TLS_STORE_VOLUME_NAME,
-};
 use stackable_operator::{
     builder::{
         self,
@@ -19,6 +16,10 @@ use stackable_operator::{
     utils::cluster_info::KubernetesClusterInfo,
 };
 
+use crate::crd::{
+    HbaseCluster, HbaseRole, TLS_STORE_DIR, TLS_STORE_PASSWORD, TLS_STORE_VOLUME_NAME,
+};
+
 #[derive(Snafu, Debug)]
 pub enum Error {
     #[snafu(display("object {hbase} is missing namespace"))]
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::Parser;
 use futures::StreamExt;
 use hbase_controller::FULL_HBASE_CONTROLLER_NAME;
-use stackable_hbase_crd::{HbaseCluster, APP_NAME};
 use stackable_operator::{
     cli::{Command, ProductOperatorRun},
     k8s_openapi::api::{apps::v1::StatefulSet, core::v1::Service},
@@ -18,7 +17,10 @@ use stackable_operator::{
     CustomResourceExt,
 };
 
+use crate::crd::{HbaseCluster, APP_NAME};
+
 mod config;
+mod crd;
 mod discovery;
 mod hbase_controller;
 mod kerberos;
diff --git a/rust/operator-binary/src/operations/graceful_shutdown.rs b/rust/operator-binary/src/operations/graceful_shutdown.rs
@@ -1,7 +1,8 @@
 use snafu::{ResultExt, Snafu};
-use stackable_hbase_crd::HbaseConfig;
 use stackable_operator::builder::pod::PodBuilder;
 
+use crate::crd::HbaseConfig;
+
 #[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,14 @@
 use snafu::{ResultExt, Snafu};
-use stackable_hbase_crd::{HbaseCluster, HbaseRole, APP_NAME};
 use stackable_operator::{
     builder::pdb::PodDisruptionBudgetBuilder, client::Client, cluster_resources::ClusterResources,
     commons::pdb::PdbConfig, kube::ResourceExt,
 };
 
-use crate::{hbase_controller::HBASE_CONTROLLER_NAME, OPERATOR_NAME};
+use crate::{
+    crd::{HbaseCluster, HbaseRole, APP_NAME},
+    hbase_controller::HBASE_CONTROLLER_NAME,
+    OPERATOR_NAME,
+};
 
 #[derive(Snafu, Debug)]
 pub enum Error {
diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs
@@ -1,5 +1,4 @@
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_hbase_crd::{Container, HbaseCluster};
 use stackable_operator::{
     builder::configmap::ConfigMapBuilder,
     client::Client,
@@ -15,7 +14,10 @@ use stackable_operator::{
     role_utils::RoleGroupRef,
 };
 
-use crate::hbase_controller::MAX_HBASE_LOG_FILES_SIZE;
+use crate::{
+    crd::{Container, HbaseCluster},
+    hbase_controller::MAX_HBASE_LOG_FILES_SIZE,
+};
 
 #[derive(Snafu, Debug)]
 pub enum Error {
@@ -35,7 +37,7 @@ pub enum Error {
     },
 
     #[snafu(display("crd validation failure"))]
-    CrdValidationFailure { source: stackable_hbase_crd::Error },
+    CrdValidationFailure { source: crate::crd::Error },
 
     #[snafu(display("vectorAggregatorConfigMapName must be set"))]
     MissingVectorAggregatorAddress,
diff --git a/rust/operator-binary/src/security/opa.rs b/rust/operator-binary/src/security/opa.rs
@@ -1,7 +1,8 @@
 use snafu::{ResultExt, Snafu};
-use stackable_hbase_crd::{security::AuthorizationConfig, HbaseCluster};
 use stackable_operator::{client::Client, commons::opa::OpaApiVersion};
 
+use crate::crd::{security::AuthorizationConfig, HbaseCluster};
+
 const DEFAULT_DRY_RUN: bool = false;
 const DEFAULT_CACHE_ACTIVE: bool = true;
 const DEFAULT_CACHE_SECONDS: i32 = 5 * 60; // 5 minutes
diff --git a/rust/operator-binary/src/zookeeper.rs b/rust/operator-binary/src/zookeeper.rs
@@ -1,13 +1,14 @@
 use std::{collections::BTreeMap, num::ParseIntError};
 
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_hbase_crd::HbaseCluster;
 use stackable_operator::{
     client::Client, k8s_openapi::api::core::v1::ConfigMap, kube::ResourceExt,
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
 use tracing::warn;
 
+use crate::crd::HbaseCluster;
+
 const ZOOKEEPER_DISCOVERY_CM_HOSTS_ENTRY: &str = "ZOOKEEPER_HOSTS";
 const ZOOKEEPER_DISCOVERY_CM_CHROOT_ENTRY: &str = "ZOOKEEPER_CHROOT";
 const ZOOKEEPER_DISCOVERY_CM_CLIENT_PORT_ENTRY: &str = "ZOOKEEPER_CLIENT_PORT";
