stackabletech · Techassi · Jul 10, 2025 · Jun 13, 2025 · Jun 17, 2025 · Jun 17, 2025
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,6 +4,8 @@
   "rust-analyzer.rustfmt.overrideCommand": [
     "rustfmt",
     "+nightly-2025-05-26",
+    "--edition",
+    "2024",
     "--"
   ]
 }
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/stackable-operator/Cargo.toml b/crates/stackable-operator/Cargo.toml
@@ -16,8 +16,8 @@ versioned = []
 
 [dependencies]
 stackable-telemetry = { path = "../stackable-telemetry", features = ["clap"] }
-stackable-versioned = { path = "../stackable-versioned", features = ["k8s"] }
 stackable-operator-derive = { path = "../stackable-operator-derive" }
+stackable-versioned = { path = "../stackable-versioned" }
 stackable-shared = { path = "../stackable-shared" }
 
 chrono.workspace = true

diff --git a/crates/stackable-operator/src/crd/authentication/core/mod.rs b/crates/stackable-operator/src/crd/authentication/core/mod.rs
@@ -6,7 +6,14 @@ use crate::versioned::versioned;
 
 mod v1alpha1_impl;
 
-#[versioned(version(name = "v1alpha1"))]
+#[versioned(
+    version(name = "v1alpha1"),
+    crates(
+        kube_core = "kube::core",
+        k8s_openapi = "k8s_openapi",
+        schemars = "schemars",
+    )
+)]
 pub mod versioned {
     pub mod v1alpha1 {
         // Re-export the v1alpha1-specific error type from the private impl module.
@@ -26,14 +33,9 @@ pub mod versioned {
     ///
     /// [1]: DOCS_BASE_URL_PLACEHOLDER/concepts/authentication
     /// [2]: DOCS_BASE_URL_PLACEHOLDER/tutorials/authentication_with_openldap
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "authentication.stackable.tech",
         plural = "authenticationclasses",
-        crates(
-            kube_core = "kube::core",
-            k8s_openapi = "k8s_openapi",
-            schemars = "schemars",
-        )
     ))]
     #[derive(
         Clone,

diff --git a/crates/stackable-operator/src/crd/authentication/kerberos/mod.rs b/crates/stackable-operator/src/crd/authentication/kerberos/mod.rs
@@ -3,11 +3,13 @@ use serde::{Deserialize, Serialize};
 use stackable_versioned::versioned;
 
 #[versioned(version(name = "v1alpha1"))]
-#[derive(
-    Clone, Debug, Deserialize, Eq, Hash, JsonSchema, Ord, PartialEq, PartialOrd, Serialize,
-)]
-#[serde(rename_all = "camelCase")]
-pub struct AuthenticationProvider {
-    /// Mandatory SecretClass used to obtain keytabs.
-    pub kerberos_secret_class: String,
+pub mod versioned {
+    #[derive(
+        Clone, Debug, Deserialize, Eq, Hash, JsonSchema, Ord, PartialEq, PartialOrd, Serialize,
+    )]
+    #[serde(rename_all = "camelCase")]
+    pub struct AuthenticationProvider {
+        /// Mandatory SecretClass used to obtain keytabs.
+        pub kerberos_secret_class: String,
+    }
 }
diff --git a/crates/stackable-operator/src/crd/authentication/tls/mod.rs b/crates/stackable-operator/src/crd/authentication/tls/mod.rs
@@ -3,14 +3,16 @@ use serde::{Deserialize, Serialize};
 use stackable_versioned::versioned;
 
 #[versioned(version(name = "v1alpha1"))]
-#[derive(
-    Clone, Debug, Deserialize, Eq, Hash, JsonSchema, Ord, PartialEq, PartialOrd, Serialize,
-)]
-#[serde(rename_all = "camelCase")]
-pub struct AuthenticationProvider {
-    /// See [ADR017: TLS authentication](DOCS_BASE_URL_PLACEHOLDER/contributor/adr/adr017-tls_authentication).
-    /// If `client_cert_secret_class` is not set, the TLS settings may also be used for client authentication.
-    /// If `client_cert_secret_class` is set, the [SecretClass](DOCS_BASE_URL_PLACEHOLDER/secret-operator/secretclass)
-    /// will be used to provision client certificates.
-    pub client_cert_secret_class: Option<String>,
+pub mod versioned {
+    #[derive(
+        Clone, Debug, Deserialize, Eq, Hash, JsonSchema, Ord, PartialEq, PartialOrd, Serialize,
+    )]
+    #[serde(rename_all = "camelCase")]
+    pub struct AuthenticationProvider {
+        /// See [ADR017: TLS authentication](DOCS_BASE_URL_PLACEHOLDER/contributor/adr/adr017-tls_authentication).
+        /// If `client_cert_secret_class` is not set, the TLS settings may also be used for client authentication.
+        /// If `client_cert_secret_class` is set, the [SecretClass](DOCS_BASE_URL_PLACEHOLDER/secret-operator/secretclass)
+        /// will be used to provision client certificates.
+        pub client_cert_secret_class: Option<String>,
+    }
 }
diff --git a/crates/stackable-operator/src/crd/listener/class/mod.rs b/crates/stackable-operator/src/crd/listener/class/mod.rs
@@ -25,7 +25,7 @@ pub mod versioned {
     /// Defines a policy for how [Listeners](DOCS_BASE_URL_PLACEHOLDER/listener-operator/listener) should be exposed.
     /// Read the [ListenerClass documentation](DOCS_BASE_URL_PLACEHOLDER/listener-operator/listenerclass)
     /// for more information.
-    #[versioned(k8s(group = "listeners.stackable.tech"))]
+    #[versioned(crd(group = "listeners.stackable.tech"))]
     #[derive(CustomResource, Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq, Eq)]
     #[serde(rename_all = "camelCase")]
     pub struct ListenerClassSpec {

diff --git a/crates/stackable-operator/src/crd/listener/listeners/mod.rs b/crates/stackable-operator/src/crd/listener/listeners/mod.rs
@@ -49,7 +49,7 @@ pub mod versioned {
     ///    ["sticky" scheduling](DOCS_BASE_URL_PLACEHOLDER/listener-operator/listener#_sticky_scheduling).
     ///
     /// Learn more in the [Listener documentation](DOCS_BASE_URL_PLACEHOLDER/listener-operator/listener).
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "listeners.stackable.tech",
         status = "v1alpha1::ListenerStatus",
         namespaced
@@ -79,7 +79,7 @@ pub mod versioned {
     /// This is not expected to be created or modified by users. It will be created by
     /// the Stackable Listener Operator when mounting the listener volume, and is always
     /// named `pod-{pod.metadata.uid}`.
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "listeners.stackable.tech",
         plural = "podlisteners",
         namespaced,
@@ -112,7 +112,7 @@ pub mod versioned {
     }
 
     /// Informs users about how to reach the Listener.
-    #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq, Eq)]
+    #[derive(Serialize, Deserialize, Clone, Debug, Default, JsonSchema, PartialEq, Eq)]
     #[serde(rename_all = "camelCase")]
     pub struct ListenerStatus {
         /// The backing Kubernetes Service.

diff --git a/crates/stackable-operator/src/crd/s3/bucket/mod.rs b/crates/stackable-operator/src/crd/s3/bucket/mod.rs
@@ -6,23 +6,25 @@ use crate::{crd::s3::connection::v1alpha1 as conn_v1alpha1, versioned::versioned
 
 mod v1alpha1_impl;
 
-#[versioned(version(name = "v1alpha1"))]
+#[versioned(
+    version(name = "v1alpha1"),
+    crates(
+        kube_core = "kube::core",
+        k8s_openapi = "k8s_openapi",
+        schemars = "schemars",
+    )
+)]
 pub mod versioned {
     pub mod v1alpha1 {
         pub use v1alpha1_impl::BucketError;
     }
 
     /// S3 bucket specification containing the bucket name and an inlined or referenced connection specification.
     /// Learn more on the [S3 concept documentation](DOCS_BASE_URL_PLACEHOLDER/concepts/s3).
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "s3.stackable.tech",
         kind = "S3Bucket",
         plural = "s3buckets",
-        crates(
-            kube_core = "kube::core",
-            k8s_openapi = "k8s_openapi",
-            schemars = "schemars",
-        ),
         namespaced
     ))]
     #[derive(Clone, CustomResource, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]

diff --git a/crates/stackable-operator/src/crd/s3/connection/mod.rs b/crates/stackable-operator/src/crd/s3/connection/mod.rs
@@ -16,23 +16,25 @@ mod v1alpha1_impl;
 /// Use this type in you operator!
 pub type ResolvedConnection = v1alpha1::ConnectionSpec;
 
-#[versioned(version(name = "v1alpha1"))]
+#[versioned(
+    version(name = "v1alpha1"),
+    crates(
+        kube_core = "kube::core",
+        k8s_openapi = "k8s_openapi",
+        schemars = "schemars",
+    )
+)]
 pub mod versioned {
     pub mod v1alpha1 {
         pub use v1alpha1_impl::ConnectionError;
     }
 
     /// S3 connection definition as a resource.
     /// Learn more on the [S3 concept documentation](DOCS_BASE_URL_PLACEHOLDER/concepts/s3).
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "s3.stackable.tech",
         kind = "S3Connection",
         plural = "s3connections",
-        crates(
-            kube_core = "kube::core",
-            k8s_openapi = "k8s_openapi",
-            schemars = "schemars",
-        ),
         namespaced
     ))]
     #[derive(CustomResource, Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]

diff --git a/crates/stackable-versioned-macros/Cargo.toml b/crates/stackable-versioned-macros/Cargo.toml
@@ -24,26 +24,22 @@ normal = ["k8s-openapi", "kube"]
 [lib]
 proc-macro = true
 
-[features]
-full = ["k8s"]
-k8s = ["dep:kube", "dep:k8s-openapi"]
-
 [dependencies]
 k8s-version = { path = "../k8s-version", features = ["darling"] }
 
 convert_case.workspace = true
 darling.workspace = true
 indoc.workspace = true
 itertools.workspace = true
-k8s-openapi = { workspace = true, optional = true }
-kube = { workspace = true, optional = true }
+k8s-openapi.workspace = true
+kube.workspace = true
 proc-macro2.workspace = true
 syn.workspace = true
 quote.workspace = true
 
 [dev-dependencies]
 # Only needed for doc tests / examples
-stackable-versioned = { path = "../stackable-versioned", features = ["k8s"] }
+stackable-versioned = { path = "../stackable-versioned" }
 
 insta.workspace = true
 prettyplease.workspace = true

diff --git a/crates/stackable-versioned-macros/src/attrs/common.rs b/crates/stackable-versioned-macros/src/attrs/common.rs