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]>

Author: Techassi

Cargo.lock

@@ -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"

Cargo.nix

@@ -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

Cargo.toml

@@ -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(

crate-hashes.json

@@ -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(

rust/crd/Cargo.toml

@@ -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,
 };
 

rust/operator-binary/Cargo.toml

@@ -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 {