chore: Version CRD and DruidClusterConfig (#687)

* chore: Remove separate CRD crate * chore: Remove unused items, add #[cfg(test)] to some items * test: Fix unit tests * chore: Version DruidCluster * chore: Fix invalid references in doc comments * chore: Remove separate CRD crate * chore: Bump openssl to 0.10.70 to fix RUSTSEC-2025-0004 * chore: Version DruidClusterConfig * chore: Move DruidCluster impl blocks * make regenerate-nix --------- Co-authored-by: Razvan-Daniel Mihai <[email protected]>
stackabletech · Feb 12, 2025 · 267f1a6 · 267f1a6
1 parent 99cd01c
commit 267f1a6
Show file tree

Hide file tree

Showing 31 changed files with 2,360 additions and 1,231 deletions.
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]
@@ -10,6 +10,12 @@ edition = "2021"
 repository = "https://github.com/stackabletech/druid-operator"
 
 [workspace.dependencies]
+stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = [
+  "k8s",
+], tag = "stackable-versioned-0.5.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0" }
+product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
+
 anyhow = "1.0"
 built = { version = "0.7", features = ["chrono", "git2"] }
 clap = "4.5"
@@ -18,15 +24,13 @@ fnv = "1.0"
 futures = { version = "0.3", features = ["compat"] }
 indoc = "2.0"
 openssl = "0.10"
-product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
 pin-project = "1.1"
 rstest = "0.24"
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
 tracing = "0.1"

diff --git a/crate-hashes.json b/crate-hashes.json
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,9 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-stackable-druid-crd = { path = "../crd" }
+stackable-versioned.workspace = true
+stackable-operator.workspace = true
+product-config.workspace = true
 
 anyhow.workspace = true
 clap.workspace = true
@@ -23,8 +25,6 @@ semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 snafu.workspace = true
-stackable-operator.workspace = true
-product-config.workspace = true
 strum.workspace = true
 tokio.workspace = true
 tracing.workspace = true

diff --git a/rust/operator-binary/src/authentication/ldap.rs b/rust/operator-binary/src/authentication/ldap.rs
@@ -1,16 +1,16 @@
 use std::collections::BTreeMap;
 
 use snafu::ResultExt;
-use stackable_druid_crd::security::{
-    add_cert_to_trust_store_cmd, STACKABLE_TLS_DIR, TLS_STORE_PASSWORD,
-};
 use stackable_operator::{
     builder::pod::{container::ContainerBuilder, PodBuilder},
     commons::authentication::ldap::AuthenticationProvider,
 };
 
-use crate::authentication::{
-    AddLdapVolumesSnafu, ConstructLdapEndpointUrlSnafu, Error, MissingLdapBindCredentialsSnafu,
+use crate::{
+    authentication::{
+        AddLdapVolumesSnafu, ConstructLdapEndpointUrlSnafu, Error, MissingLdapBindCredentialsSnafu,
+    },
+    crd::security::{add_cert_to_trust_store_cmd, STACKABLE_TLS_DIR, TLS_STORE_PASSWORD},
 };
 
 fn add_authenticator_config(

diff --git a/rust/operator-binary/src/authentication/mod.rs b/rust/operator-binary/src/authentication/mod.rs
@@ -1,11 +1,6 @@
 use std::collections::BTreeMap;
 
 use snafu::Snafu;
-use stackable_druid_crd::{
-    authentication::{AuthenticationClassResolved, AuthenticationClassesResolved},
-    security::{ESCALATOR_INTERNAL_CLIENT_PASSWORD_ENV, INTERNAL_INITIAL_CLIENT_PASSWORD_ENV},
-    DruidCluster, DruidRole,
-};
 use stackable_operator::{
     builder::pod::{container::ContainerBuilder, PodBuilder},
     commons::{
@@ -20,11 +15,18 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::EnvVar,
 };
 
+use crate::{
+    crd::{
+        authentication::{AuthenticationClassResolved, AuthenticationClassesResolved},
+        security::{ESCALATOR_INTERNAL_CLIENT_PASSWORD_ENV, INTERNAL_INITIAL_CLIENT_PASSWORD_ENV},
+        v1alpha1, DruidRole,
+    },
+    internal_secret::{build_shared_internal_secret_name, env_var_from_secret},
+};
+
 pub mod ldap;
 pub mod oidc;
 
-use crate::internal_secret::{build_shared_internal_secret_name, env_var_from_secret};
-
 type Result<T, E = Error> = std::result::Result<T, E>;
 
 #[derive(Snafu, Debug)]
@@ -159,7 +161,11 @@ impl DruidAuthenticationConfig {
         command
     }
 
-    pub fn get_env_var_mounts(&self, druid: &DruidCluster, role: &DruidRole) -> Vec<EnvVar> {
+    pub fn get_env_var_mounts(
+        &self,
+        druid: &v1alpha1::DruidCluster,
+        role: &DruidRole,
+    ) -> Vec<EnvVar> {
         let mut envs = vec![];
         let internal_secret_name = build_shared_internal_secret_name(druid);
         envs.push(env_var_from_secret(

diff --git a/rust/operator-binary/src/authentication/oidc.rs b/rust/operator-binary/src/authentication/oidc.rs
@@ -1,9 +1,6 @@
 use std::collections::BTreeMap;
 
 use snafu::ResultExt;
-use stackable_druid_crd::{
-    security::add_cert_to_jvm_trust_store_cmd, DruidRole, COOKIE_PASSPHRASE_ENV,
-};
 use stackable_operator::{
     builder::pod::{container::ContainerBuilder, PodBuilder},
     commons::authentication::oidc::{AuthenticationProvider, ClientAuthenticationOptions},
@@ -12,6 +9,7 @@ use stackable_operator::{
 
 use crate::{
     authentication::{AddOidcVolumesSnafu, ConstructOidcWellKnownUrlSnafu, Error},
+    crd::{security::add_cert_to_jvm_trust_store_cmd, DruidRole, COOKIE_PASSPHRASE_ENV},
     internal_secret::env_var_from_secret,
 };
 

diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs
@@ -1,10 +1,11 @@
 use indoc::formatdoc;
 use snafu::{ResultExt, Snafu};
-use stackable_druid_crd::{
+use stackable_operator::memory::MemoryQuantity;
+
+use crate::crd::{
     DruidRole, JVM_SECURITY_PROPERTIES_FILE, LOG4J2_CONFIG, RW_CONFIG_DIRECTORY,
     STACKABLE_TRUST_STORE, STACKABLE_TRUST_STORE_PASSWORD,
 };
-use stackable_operator::memory::MemoryQuantity;
 
 #[derive(Snafu, Debug)]
 pub enum Error {

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::{PodAffinity, PodAntiAffinity},
 };
 
-use crate::{DeepStorageSpec, DruidRole, HdfsDeepStorageSpec, APP_NAME};
+use crate::crd::{DeepStorageSpec, DruidRole, HdfsDeepStorageSpec, APP_NAME};
 
 /// Please have a look at the architecture diagram in <https://druid.apache.org/assets/images/druid-architecture-7db1cd79d2d70b2e5ccc73b6bebfcaa4.svg>
 /// to understand which roles do communicate with each other.
@@ -32,7 +32,7 @@ pub fn get_affinity(
         DruidRole::Historical |
         // Ingests data
         DruidRole::MiddleManager => {
-            if let DeepStorageSpec::HDFS(HdfsDeepStorageSpec {
+            if let DeepStorageSpec::Hdfs(HdfsDeepStorageSpec {
                 config_map_name: hdfs_discovery_cm_name,
                 ..
             }) = deep_storage
@@ -90,7 +90,7 @@ mod tests {
     };
 
     use super::*;
-    use crate::DruidCluster;
+    use crate::crd::v1alpha1;
 
     #[rstest]
     #[case(DruidRole::Coordinator)]
@@ -141,7 +141,7 @@ mod tests {
                 replicas: 1
         "#;
         let deserializer = serde_yaml::Deserializer::from_str(input);
-        let druid: DruidCluster =
+        let druid: v1alpha1::DruidCluster =
             serde_yaml::with::singleton_map_recursive::deserialize(deserializer).unwrap();
         let merged_config = druid
             .merged_config()

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
@@ -12,7 +12,7 @@ use stackable_operator::{
 };
 use tracing::info;
 
-use crate::DruidClusterConfig;
+use crate::crd::v1alpha1::DruidClusterConfig;
 
 type Result<T, E = Error> = std::result::Result<T, E>;
 
@@ -219,15 +219,6 @@ impl AuthenticationClassesResolved {
         }
         false
     }
-
-    pub fn oidc_authentication_enabled(&self) -> bool {
-        if !self.auth_classes.is_empty() {
-            if let Some(AuthenticationClassResolved::Oidc { .. }) = self.auth_classes.first() {
-                return true;
-            }
-        }
-        false
-    }
 }
 
 #[cfg(test)]
@@ -239,7 +230,7 @@ mod tests {
     use stackable_operator::kube;
 
     use super::*;
-    use crate::{authentication::AuthenticationClassesResolved, DruidClusterConfig};
+    use crate::crd::{authentication::AuthenticationClassesResolved, v1alpha1::DruidClusterConfig};
 
     const BASE_CLUSTER_CONFIG: &str = r#"
 deepStorage:

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/memory.rs → rust/operator-binary/src/crd/memory.rs b/rust/crd/src/memory.rs → rust/operator-binary/src/crd/memory.rs
@@ -7,7 +7,7 @@ use stackable_operator::{
     memory::{BinaryMultiple, MemoryQuantity},
 };
 
-use crate::{
+use crate::crd::{
     storage::HistoricalStorage, PROCESSING_BUFFER_SIZE_BYTES, PROCESSING_NUM_MERGE_BUFFERS,
     PROCESSING_NUM_THREADS,
 };