move crate to module

xeniape · xeniape · commit f7439af05c7a · 2025-02-07T11:48:43.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
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
@@ -10,8 +10,6 @@ publish = false
 build = "build.rs"
 
 [dependencies]
-stackable-zookeeper-crd = { path = "../crd" }
-
 anyhow.workspace = true
 clap.workspace = true
 const_format.workspace = true
@@ -22,6 +20,7 @@ pin-project.workspace = true
 product-config.workspace = true
 semver.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/command.rs b/rust/operator-binary/src/command.rs
@@ -1,4 +1,4 @@
-use stackable_zookeeper_crd::{STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR, STACKABLE_RW_CONFIG_DIR};
+use crate::crd::{STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR, STACKABLE_RW_CONFIG_DIR};
 
 pub fn create_init_container_command_args() -> Vec<String> {
     vec![
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::{ZookeeperRole, APP_NAME};
+use crate::crd::{ZookeeperRole, APP_NAME};
 
 pub fn get_affinity(cluster_name: &str, role: &ZookeeperRole) -> StackableAffinityFragment {
     let affinity_between_role_pods =
@@ -37,7 +37,7 @@ mod tests {
         role_utils::RoleGroupRef,
     };
 
-    use crate::{ZookeeperCluster, ZookeeperRole};
+    use crate::{crd::affinity::ZookeeperRole, ZookeeperCluster};
 
     #[test]
     fn test_affinity_defaults() {
diff --git a/rust/operator-binary/src/crd/authentication.rs b/rust/operator-binary/src/crd/authentication.rs
@@ -6,7 +6,7 @@ use stackable_operator::{
     schemars::{self, JsonSchema},
 };
 
-use crate::ObjectRef;
+use crate::crd::ObjectRef;
 
 const SUPPORTED_AUTHENTICATION_CLASS: [&str; 1] = ["TLS"];
 
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
@@ -35,7 +35,9 @@ use stackable_operator::{
 };
 use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
 
-use crate::{affinity::get_affinity, authentication::ZookeeperAuthentication, tls::ZookeeperTls};
+use crate::crd::{
+    affinity::get_affinity, authentication::ZookeeperAuthentication, tls::ZookeeperTls,
+};
 
 pub mod affinity;
 pub mod authentication;
@@ -471,7 +473,10 @@ impl ZookeeperCluster {
         let version = self
             .spec
             .image
-            .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::CARGO_PKG_VERSION)
+            .resolve(
+                DOCKER_IMAGE_BASE_NAME,
+                crate::crd::built_info::CARGO_PKG_VERSION,
+            )
             .product_version;
         let zookeeper_versions_with_log4j = [
             "1.", "2.", "3.0.", "3.1.", "3.2.", "3.3.", "3.4.", "3.5.", "3.6.", "3.7.",
diff --git a/rust/operator-binary/src/crd/security.rs b/rust/operator-binary/src/crd/security.rs
@@ -25,7 +25,9 @@ use stackable_operator::{
     time::Duration,
 };
 
-use crate::{authentication, authentication::ResolvedAuthenticationClasses, tls, ZookeeperCluster};
+use crate::crd::{
+    authentication, authentication::ResolvedAuthenticationClasses, tls, ZookeeperCluster,
+};
 
 type Result<T, E = Error> = std::result::Result<T, E>;
 
diff --git a/rust/operator-binary/src/crd/tls.rs b/rust/operator-binary/src/crd/tls.rs
diff --git a/rust/operator-binary/src/discovery.rs b/rust/operator-binary/src/discovery.rs
@@ -8,9 +8,11 @@ use stackable_operator::{
     kube::{runtime::reflector::ObjectRef, Resource, ResourceExt},
     utils::cluster_info::KubernetesClusterInfo,
 };
-use stackable_zookeeper_crd::{security::ZookeeperSecurity, ZookeeperCluster, ZookeeperRole};
 
-use crate::utils::build_recommended_labels;
+use crate::{
+    crd::{security::ZookeeperSecurity, ZookeeperCluster, ZookeeperRole},
+    utils::build_recommended_labels,
+};
 
 type Result<T, E = Error> = std::result::Result<T, E>;
 
@@ -32,9 +34,7 @@ pub enum Error {
     NoNamespace,
 
     #[snafu(display("failed to list expected pods"))]
-    ExpectedPods {
-        source: stackable_zookeeper_crd::Error,
-    },
+    ExpectedPods { source: crate::crd::Error },
 
     #[snafu(display("could not find service port with name {}", port_name))]
     NoServicePort { port_name: String },
@@ -89,7 +89,7 @@ pub async fn build_discovery_configmaps(
         resolved_product_image,
     )?];
     if zk.spec.cluster_config.listener_class
-        == stackable_zookeeper_crd::CurrentlySupportedListenerClasses::ExternalUnstable
+        == crate::crd::CurrentlySupportedListenerClasses::ExternalUnstable
     {
         discovery_configmaps.push(build_discovery_configmap(
             zk,
diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use clap::{crate_description, crate_version, Parser};
+use crd::{ZookeeperCluster, ZookeeperZnode, APP_NAME, OPERATOR_NAME};
 use futures::{pin_mut, StreamExt};
 use stackable_operator::{
     cli::{Command, ProductOperatorRun},
@@ -20,11 +21,11 @@ use stackable_operator::{
     logging::controller::report_controller_reconciled,
     CustomResourceExt,
 };
-use stackable_zookeeper_crd::{ZookeeperCluster, ZookeeperZnode, APP_NAME, OPERATOR_NAME};
 
 use crate::{zk_controller::ZK_FULL_CONTROLLER_NAME, znode_controller::ZNODE_FULL_CONTROLLER_NAME};
 
 mod command;
+pub mod crd;
 mod discovery;
 mod operations;
 mod product_logging;
diff --git a/rust/operator-binary/src/operations/graceful_shutdown.rs b/rust/operator-binary/src/operations/graceful_shutdown.rs
@@ -1,6 +1,7 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::builder::pod::PodBuilder;
-use stackable_zookeeper_crd::ZookeeperConfig;
+
+use crate::crd::ZookeeperConfig;
 
 #[derive(Debug, Snafu)]
 pub enum Error {
diff --git a/rust/operator-binary/src/operations/pdb.rs b/rust/operator-binary/src/operations/pdb.rs
@@ -3,9 +3,11 @@ use stackable_operator::{
     builder::pdb::PodDisruptionBudgetBuilder, client::Client, cluster_resources::ClusterResources,
     commons::pdb::PdbConfig, kube::ResourceExt,
 };
-use stackable_zookeeper_crd::{ZookeeperCluster, ZookeeperRole, APP_NAME, OPERATOR_NAME};
 
-use crate::zk_controller::ZK_CONTROLLER_NAME;
+use crate::{
+    crd::{ZookeeperCluster, ZookeeperRole, APP_NAME, OPERATOR_NAME},
+    zk_controller::ZK_CONTROLLER_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
@@ -11,7 +11,8 @@ use stackable_operator::{
     },
     role_utils::RoleGroupRef,
 };
-use stackable_zookeeper_crd::{
+
+use crate::crd::{
     Container, LoggingFramework, ZookeeperCluster, ZookeeperRole, LOG4J_CONFIG_FILE,
     LOGBACK_CONFIG_FILE, MAX_ZK_LOG_FILES_SIZE, STACKABLE_LOG_DIR, ZOOKEEPER_LOG_FILE,
 };
@@ -34,9 +35,7 @@ pub enum Error {
     },
 
     #[snafu(display("crd validation failure"))]
-    CrdValidationFailure {
-        source: stackable_zookeeper_crd::Error,
-    },
+    CrdValidationFailure { source: crate::crd::Error },
 
     #[snafu(display("vectorAggregatorConfigMapName must be set"))]
     MissingVectorAggregatorAddress,
diff --git a/rust/operator-binary/src/zk_controller.rs b/rust/operator-binary/src/zk_controller.rs
diff --git a/rust/operator-binary/src/znode_controller.rs b/rust/operator-binary/src/znode_controller.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use stackable_zookeeper_crd::{STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR, STACKABLE_RW_CONFIG_DIR};`
	`1`	`+use crate::crd::{STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR, STACKABLE_RW_CONFIG_DIR};`
`2`	`2`
`3`	`3`	`pub fn create_init_container_command_args() -> Vec<String> {`
`4`	`4`	`vec![`