From ab8680e049c30dccdcba738dea18f5deb0f6e365 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Fri, 27 Feb 2026 08:28:56 +0100
Subject: [PATCH 01/11] fix: Fix multiple compilation failures when not
 enabling default features

---
 .pre-commit-config.yaml                       | 96 +++++++++++++++++++
 crates/stackable-operator/Cargo.toml          | 12 +--
 crates/stackable-operator/src/eos/mod.rs      | 18 ++--
 crates/stackable-operator/src/lib.rs          |  2 -
 .../src/utils/cluster_info.rs                 | 11 +--
 crates/stackable-telemetry/src/tracing/mod.rs |  6 +-
 6 files changed, 114 insertions(+), 31 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2704540a9..a939bbc38 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -55,6 +55,30 @@ repos:
         pass_filenames: false
         files: \.rs$|Cargo\.(toml|lock)
 
+      - id: cargo-doc-no-default-features
+        name: cargo-doc-no-default-features
+        language: system
+        entry: cargo doc --no-default-features --document-private-items
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-doc-all-features
+        name: cargo-doc-all-features
+        language: system
+        entry: cargo doc --all-features --document-private-items
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-test
+        name: cargo-test
+        language: system
+        entry: cargo test --workspace
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
       - id: cargo-test-no-default-features
         name: cargo-test-no-default-features
         language: system
@@ -71,6 +95,78 @@ repos:
         pass_filenames: false
         files: \.rs$|Cargo\.(toml|lock)
 
+      - id: cargo-test-k8s-version-no-default-features
+        name: cargo-test-k8s-version-no-default-features
+        language: system
+        entry: cargo test --no-default-features --package k8s-version
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-test-stackable-certs-no-default-features
+        name: cargo-test-stackable-certs-no-default-features
+        language: system
+        entry: cargo test --no-default-features --package stackable-certs
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-test-stackable-operator-no-default-features
+        name: cargo-test-stackable-operator-no-default-features
+        language: system
+        entry: cargo test --no-default-features --package stackable-operator
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-test-stackable-operator-derive-no-default-features
+        name: cargo-test-stackable-operator-derive-no-default-features
+        language: system
+        entry: cargo test --no-default-features --package stackable-operator-derive
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-test-stackable-shared-no-default-features
+        name: cargo-test-stackable-shared-no-default-features
+        language: system
+        entry: cargo test --no-default-features --package stackable-shared
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-test-stackable-telemetry-no-default-features
+        name: cargo-test-stackable-telemetry-no-default-features
+        language: system
+        entry: cargo test --no-default-features --package stackable-telemetry
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-test-stackable-versioned-no-default-features
+        name: cargo-test-stackable-versioned-no-default-features
+        language: system
+        entry: cargo test --no-default-features --package stackable-versioned
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-test-stackable-versioned-macros-no-default-features
+        name: cargo-test-stackable-versioned-macros-no-default-features
+        language: system
+        entry: cargo test --no-default-features --package stackable-versioned-macros
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-test-stackable-webhook-no-default-features
+        name: cargo-test-stackable-webhook-no-default-features
+        language: system
+        entry: cargo test --no-default-features --package stackable-webhook
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
       - id: cargo-rustfmt
         name: cargo-rustfmt
         language: system
diff --git a/crates/stackable-operator/Cargo.toml b/crates/stackable-operator/Cargo.toml
index a72d867cb..0d7bcfaf6 100644
--- a/crates/stackable-operator/Cargo.toml
+++ b/crates/stackable-operator/Cargo.toml
@@ -8,22 +8,18 @@ edition.workspace = true
 repository.workspace = true
 
 [features]
-full = ["certs", "telemetry", "versioned", "time", "webhook", "clap"]
-default = ["telemetry", "versioned", "clap"]
+full = ["certs", "time", "webhook"]
 
-clap = []
 certs = ["dep:stackable-certs"]
-telemetry = ["dep:stackable-telemetry"]
 time = ["stackable-shared/time"]
-versioned = ["dep:stackable-versioned"]
 webhook = ["dep:stackable-webhook"]
 
 [dependencies]
 stackable-certs = { path = "../stackable-certs", optional = true }
 stackable-operator-derive = { path = "../stackable-operator-derive" }
-stackable-shared = { path = "../stackable-shared", features = ["time", "jiff"] }
-stackable-telemetry = { path = "../stackable-telemetry", optional = true, features = ["clap"] }
-stackable-versioned = { path = "../stackable-versioned", optional = true }
+stackable-shared = { path = "../stackable-shared", features = ["jiff"] }
+stackable-telemetry = { path = "../stackable-telemetry", features = ["clap"] }
+stackable-versioned = { path = "../stackable-versioned" }
 stackable-webhook = { path = "../stackable-webhook", optional = true }
 
 clap.workspace = true
diff --git a/crates/stackable-operator/src/eos/mod.rs b/crates/stackable-operator/src/eos/mod.rs
index 7e732c175..2dc5d94e1 100644
--- a/crates/stackable-operator/src/eos/mod.rs
+++ b/crates/stackable-operator/src/eos/mod.rs
@@ -9,35 +9,34 @@ use tracing::{Level, instrument};
 ///
 /// Additionally, this struct can be used as operator CLI arguments. This functionality is only
 /// available if the feature `clap` is enabled.
-#[cfg_attr(feature = "clap", derive(clap::Args))]
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq, clap::Args)]
 pub struct EndOfSupportOptions {
     /// The end-of-support check mode. Currently, only "offline" is supported.
-    #[cfg_attr(feature = "clap", arg(
+    #[arg(
         long = "eos-check-mode",
         env = "EOS_CHECK_MODE",
         default_value_t = EndOfSupportCheckMode::default(),
         value_enum
-    ))]
+    )]
     pub check_mode: EndOfSupportCheckMode,
 
     /// The interval in which the end-of-support check should run.
-    #[cfg_attr(feature = "clap", arg(
+    #[arg(
         long = "eos-interval",
         env = "EOS_INTERVAL",
         default_value_t = Self::default_interval()
-    ))]
+    )]
     pub interval: Duration,
 
     /// If the end-of-support check should be disabled entirely.
-    #[cfg_attr(feature = "clap", arg(long = "eos-disabled", env = "EOS_DISABLED"))]
+    #[arg(long = "eos-disabled", env = "EOS_DISABLED")]
     pub disabled: bool,
 
     /// The support duration (how long the operator should be considered supported after
     /// it's built-date).
     ///
     /// This field is currently not exposed as a CLI argument or environment variable.
-    #[cfg_attr(feature = "clap", arg(skip = Self::default_support_duration()))]
+    #[arg(skip = Self::default_support_duration())]
     pub support_duration: Duration,
 }
 
@@ -55,8 +54,7 @@ impl EndOfSupportOptions {
     }
 }
 
-#[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq, clap::ValueEnum)]
 pub enum EndOfSupportCheckMode {
     #[default]
     Offline,
diff --git a/crates/stackable-operator/src/lib.rs b/crates/stackable-operator/src/lib.rs
index c73e72143..003da36ba 100644
--- a/crates/stackable-operator/src/lib.rs
+++ b/crates/stackable-operator/src/lib.rs
@@ -42,9 +42,7 @@ pub use schemars;
 pub use stackable_certs as certs;
 pub use stackable_shared as shared;
 pub use stackable_shared::{crd::CustomResourceExt, yaml::YamlSchema};
-#[cfg(feature = "telemetry")]
 pub use stackable_telemetry as telemetry;
-#[cfg(feature = "versioned")]
 pub use stackable_versioned as versioned;
 #[cfg(feature = "webhook")]
 pub use stackable_webhook as webhook;
diff --git a/crates/stackable-operator/src/utils/cluster_info.rs b/crates/stackable-operator/src/utils/cluster_info.rs
index a7d7a813f..fdd3c2b71 100644
--- a/crates/stackable-operator/src/utils/cluster_info.rs
+++ b/crates/stackable-operator/src/utils/cluster_info.rs
@@ -15,16 +15,13 @@ pub struct KubernetesClusterInfo {
     pub cluster_domain: DomainName,
 }
 
-#[cfg_attr(
-    feature = "clap",
-    derive(clap::Parser),
-    command(next_help_heading = "Cluster Options")
-)]
+#[derive(clap::Parser)]
+#[command(next_help_heading = "Cluster Options")]
 #[derive(Debug, PartialEq, Eq)]
 pub struct KubernetesClusterInfoOptions {
     /// Kubernetes cluster domain, usually this is `cluster.local`.
     // We are not using a default value here, as we query the cluster if it is not specified.
-    #[cfg_attr(feature = "clap", arg(long, env))]
+    #[arg(long, env)]
     pub kubernetes_cluster_domain: Option<DomainName>,
 
     /// Name of the Kubernetes Node that the operator is running on.
@@ -32,7 +29,7 @@ pub struct KubernetesClusterInfoOptions {
     /// Note that when running the operator on Kubernetes we recommend to use the
     /// [downward API](https://kubernetes.io/docs/concepts/workloads/pods/downward-api/)
     /// to let Kubernetes project the namespace as the `KUBERNETES_NODE_NAME` env variable.
-    #[cfg_attr(feature = "clap", arg(long, env))]
+    #[arg(long, env)]
     pub kubernetes_node_name: String,
 }
 
diff --git a/crates/stackable-telemetry/src/tracing/mod.rs b/crates/stackable-telemetry/src/tracing/mod.rs
index 4262c1f46..c50f3285a 100644
--- a/crates/stackable-telemetry/src/tracing/mod.rs
+++ b/crates/stackable-telemetry/src/tracing/mod.rs
@@ -8,8 +8,6 @@
 
 use std::{ops::Not, path::PathBuf};
 
-#[cfg_attr(feature = "clap", cfg(doc))]
-use clap;
 use opentelemetry::trace::TracerProvider;
 use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
 use opentelemetry_otlp::{ExporterBuildError, LogExporter, SpanExporter};
@@ -125,7 +123,7 @@ pub enum Error {
 /// ```
 ///
 /// Also see the documentation for [`TelemetryOptions`] which details how it can be used as CLI
-/// arguments via [`clap`]. Additionally see [this section](#environment-variables-and-cli-arguments)
+/// arguments via `clap`. Additionally see [this section](#environment-variables-and-cli-arguments)
 /// in the docs for a full list of environment variables and CLI arguments used by the pre-configured
 /// instance.
 ///
@@ -148,7 +146,7 @@ pub enum Error {
 ///
 /// #[tokio::main]
 /// async fn main() -> Result<(), Error> {
-///     // This can come from a Clap argument for example. The enabled builder
+///     // This can come from a `clap` argument for example. The enabled builder
 ///     // function below allows enabling/disabling certain subscribers during
 ///     // runtime.
 ///     let otlp_log_flag = false;

From 86b1d13f30efe540330376642dbbd66cc1690932 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Thu, 5 Mar 2026 12:07:31 +0100
Subject: [PATCH 02/11] Add tokio-ws feature

---
 Cargo.lock                           | 42 ++++++++++++++++++++++++++++
 crates/stackable-operator/Cargo.toml |  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 67f360b32..945ff5cfe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -523,6 +523,12 @@ dependencies = [
  "syn 2.0.115",
 ]
 
+[[package]]
+name = "data-encoding"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
+
 [[package]]
 name = "delegate"
 version = "0.13.5"
@@ -1569,6 +1575,7 @@ dependencies = [
  "serde_yaml",
  "thiserror 2.0.18",
  "tokio",
+ "tokio-tungstenite",
  "tokio-util",
  "tower",
  "tower-http",
@@ -3359,6 +3366,18 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-tungstenite"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.18"
@@ -3647,6 +3666,23 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "tungstenite"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
+dependencies = [
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.9.2",
+ "sha1",
+ "thiserror 2.0.18",
+ "utf-8",
+]
+
 [[package]]
 name = "typenum"
 version = "1.19.0"
@@ -3702,6 +3738,12 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
diff --git a/crates/stackable-operator/Cargo.toml b/crates/stackable-operator/Cargo.toml
index c10ed0655..5a83ace23 100644
--- a/crates/stackable-operator/Cargo.toml
+++ b/crates/stackable-operator/Cargo.toml
@@ -8,11 +8,12 @@ edition.workspace = true
 repository.workspace = true
 
 [features]
-full = ["certs", "time", "webhook"]
+full = ["certs", "time", "webhook", "kube-ws"]
 
 certs = ["dep:stackable-certs"]
 time = ["stackable-shared/time"]
 webhook = ["dep:stackable-webhook"]
+kube-ws = ["kube/ws"]
 
 [dependencies]
 stackable-certs = { path = "../stackable-certs", optional = true }

From 33e38c9e610cd6fba767094326be5821a2ee1d03 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Fri, 6 Mar 2026 09:55:04 +0100
Subject: [PATCH 03/11] changelog

---
 crates/stackable-operator/CHANGELOG.md  | 8 ++++++++
 crates/stackable-telemetry/CHANGELOG.md | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md
index 64d9bde2c..4a2aec780 100644
--- a/crates/stackable-operator/CHANGELOG.md
+++ b/crates/stackable-operator/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+- BREAKING: Fix compilation failures when not enabling default features ([#1162]).
+  This is achieved by removing the `clap`, `telemetry` and `versioned` features, which where previously enabled by default.
+  They have been removed as the stackable-operator code actually always requires them.
+
+[#1162]: https://github.com/stackabletech/operator-rs/pull/1162
+
 ## [0.106.2] - 2026-02-26
 
 ### Changed
diff --git a/crates/stackable-telemetry/CHANGELOG.md b/crates/stackable-telemetry/CHANGELOG.md
index 5a16748fb..c61d81b33 100644
--- a/crates/stackable-telemetry/CHANGELOG.md
+++ b/crates/stackable-telemetry/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+- BREAKING: Fix compilation failures when not enabling default features ([#1162]).
+
+[#1162]: https://github.com/stackabletech/operator-rs/pull/1162
+
 ## [0.6.1] - 2025-07-10
 
 ### Changed

From 72af181b98d9a012c5bfb4f9a1b49d8fe9413bf0 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Fri, 6 Mar 2026 10:32:22 +0100
Subject: [PATCH 04/11] Disable cargo test --workspace for now

---
 .pre-commit-config.yaml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ef0194f91..cecc73314 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -71,13 +71,15 @@ repos:
         pass_filenames: false
         files: \.rs$|Cargo\.(toml|lock)
 
-      - id: cargo-test
-        name: cargo-test
-        language: system
-        entry: cargo test --workspace
-        stages: [pre-commit, pre-merge-commit]
-        pass_filenames: false
-        files: \.rs$|Cargo\.(toml|lock)
+      # As long as we run tests for every contained crate (to test turning off all features),
+      # we don't need to re-run them here
+      # - id: cargo-test
+      #   name: cargo-test
+      #   language: system
+      #   entry: cargo test --workspace
+      #   stages: [pre-commit, pre-merge-commit]
+      #   pass_filenames: false
+      #   files: \.rs$|Cargo\.(toml|lock)
 
       - id: cargo-test-no-default-features
         name: cargo-test-no-default-features

From e3465de6e2777cb8637a9267f35db1ab02eabc6f Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Fri, 6 Mar 2026 11:19:13 +0100
Subject: [PATCH 05/11] Add crds feature

---
 crates/stackable-operator/Cargo.toml               |  4 +++-
 crates/stackable-operator/src/cluster_resources.rs | 13 ++++++++++---
 crates/stackable-operator/src/lib.rs               |  2 ++
 crates/stackable-webhook/Cargo.toml                |  2 +-
 crates/xtask/Cargo.toml                            |  2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/crates/stackable-operator/Cargo.toml b/crates/stackable-operator/Cargo.toml
index 5a83ace23..028f59cfd 100644
--- a/crates/stackable-operator/Cargo.toml
+++ b/crates/stackable-operator/Cargo.toml
@@ -8,8 +8,10 @@ edition.workspace = true
 repository.workspace = true
 
 [features]
+default = ["crds"]
 full = ["certs", "time", "webhook", "kube-ws"]
 
+crds = ["dep:stackable-versioned"]
 certs = ["dep:stackable-certs"]
 time = ["stackable-shared/time"]
 webhook = ["dep:stackable-webhook"]
@@ -20,7 +22,7 @@ stackable-certs = { path = "../stackable-certs", optional = true }
 stackable-operator-derive = { path = "../stackable-operator-derive" }
 stackable-shared = { path = "../stackable-shared", features = ["jiff"] }
 stackable-telemetry = { path = "../stackable-telemetry", features = ["clap"] }
-stackable-versioned = { path = "../stackable-versioned" }
+stackable-versioned = { path = "../stackable-versioned", optional = true }
 stackable-webhook = { path = "../stackable-webhook", optional = true }
 
 clap.workspace = true
diff --git a/crates/stackable-operator/src/cluster_resources.rs b/crates/stackable-operator/src/cluster_resources.rs
index b8ece1137..6bb0474c0 100644
--- a/crates/stackable-operator/src/cluster_resources.rs
+++ b/crates/stackable-operator/src/cluster_resources.rs
@@ -36,7 +36,6 @@ use crate::{
             ResourceRequirementsExt, ResourceRequirementsType,
         },
     },
-    crd::listener,
     deep_merger::{self, ObjectOverrides},
     kvp::{
         Label, LabelError, Labels,
@@ -221,7 +220,8 @@ impl ClusterResource for Service {}
 impl ClusterResource for ServiceAccount {}
 impl ClusterResource for RoleBinding {}
 impl ClusterResource for PodDisruptionBudget {}
-impl ClusterResource for listener::v1alpha1::Listener {}
+#[cfg(feature = "crds")]
+impl ClusterResource for crate::crd::listener::v1alpha1::Listener {}
 
 impl ClusterResource for Job {
     fn pod_spec(&self) -> Option<&PodSpec> {
@@ -670,6 +670,13 @@ impl<'a> ClusterResources<'a> {
     ///
     /// * `client` - The client which is used to access Kubernetes
     pub async fn delete_orphaned_resources(self, client: &Client) -> Result<()> {
+        // We can only delete Listeners in case the "crds" feature is enabled, otherwise it's a NOP.
+        #[cfg(feature = "crds")]
+        let delete_listeners = self
+            .delete_orphaned_resources_of_kind::<crate::crd::listener::v1alpha1::Listener>(client);
+        #[cfg(not(feature = "crds"))]
+        let delete_listeners = async { Ok(()) };
+
         tokio::try_join!(
             self.delete_orphaned_resources_of_kind::<Service>(client),
             self.delete_orphaned_resources_of_kind::<StatefulSet>(client),
@@ -680,7 +687,7 @@ impl<'a> ClusterResources<'a> {
             self.delete_orphaned_resources_of_kind::<ServiceAccount>(client),
             self.delete_orphaned_resources_of_kind::<RoleBinding>(client),
             self.delete_orphaned_resources_of_kind::<PodDisruptionBudget>(client),
-            self.delete_orphaned_resources_of_kind::<listener::v1alpha1::Listener>(client),
+            delete_listeners
         )?;
 
         Ok(())
diff --git a/crates/stackable-operator/src/lib.rs b/crates/stackable-operator/src/lib.rs
index 003da36ba..46616252c 100644
--- a/crates/stackable-operator/src/lib.rs
+++ b/crates/stackable-operator/src/lib.rs
@@ -14,6 +14,7 @@ pub mod commons;
 pub mod config;
 pub mod constants;
 pub mod cpu;
+#[cfg(feature = "crds")]
 pub mod crd;
 pub mod deep_merger;
 pub mod eos;
@@ -43,6 +44,7 @@ pub use stackable_certs as certs;
 pub use stackable_shared as shared;
 pub use stackable_shared::{crd::CustomResourceExt, yaml::YamlSchema};
 pub use stackable_telemetry as telemetry;
+#[cfg(feature = "crds")]
 pub use stackable_versioned as versioned;
 #[cfg(feature = "webhook")]
 pub use stackable_webhook as webhook;
diff --git a/crates/stackable-webhook/Cargo.toml b/crates/stackable-webhook/Cargo.toml
index ca4bb8e7a..7c7ad3603 100644
--- a/crates/stackable-webhook/Cargo.toml
+++ b/crates/stackable-webhook/Cargo.toml
@@ -35,7 +35,7 @@ x509-cert.workspace = true
 
 [dev-dependencies]
 # Only needed for doc tests
-stackable-operator = { path = "../stackable-operator" }
+stackable-operator = { path = "../stackable-operator", features = ["crds"] }
 clap.workspace = true
 
 [lints]
diff --git a/crates/xtask/Cargo.toml b/crates/xtask/Cargo.toml
index b095a7313..b64675e9f 100644
--- a/crates/xtask/Cargo.toml
+++ b/crates/xtask/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2024"
 publish = false
 
 [dependencies]
-stackable-operator = { path = "../stackable-operator" }
+stackable-operator = { path = "../stackable-operator", features = ["crds"] }
 
 clap.workspace = true
 paste.workspace = true

From 9136851f5fd72a1b1d90e01517c32bb72fb97b0e Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Fri, 6 Mar 2026 11:21:41 +0100
Subject: [PATCH 06/11] Fixup full feature list

---
 crates/stackable-operator/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/stackable-operator/Cargo.toml b/crates/stackable-operator/Cargo.toml
index 028f59cfd..b26c78f7f 100644
--- a/crates/stackable-operator/Cargo.toml
+++ b/crates/stackable-operator/Cargo.toml
@@ -9,7 +9,7 @@ repository.workspace = true
 
 [features]
 default = ["crds"]
-full = ["certs", "time", "webhook", "kube-ws"]
+full = ["crds", "certs", "time", "webhook", "kube-ws"]
 
 crds = ["dep:stackable-versioned"]
 certs = ["dep:stackable-certs"]

From 1e0cde4e0037dd7729672aab5d27f684d96641af Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Mon, 9 Mar 2026 10:30:13 +0100
Subject: [PATCH 07/11] refactor: Use cfg!

---
 .../stackable-operator/src/cluster_resources.rs   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/crates/stackable-operator/src/cluster_resources.rs b/crates/stackable-operator/src/cluster_resources.rs
index 6bb0474c0..c5a06f866 100644
--- a/crates/stackable-operator/src/cluster_resources.rs
+++ b/crates/stackable-operator/src/cluster_resources.rs
@@ -671,11 +671,16 @@ impl<'a> ClusterResources<'a> {
     /// * `client` - The client which is used to access Kubernetes
     pub async fn delete_orphaned_resources(self, client: &Client) -> Result<()> {
         // We can only delete Listeners in case the "crds" feature is enabled, otherwise it's a NOP.
-        #[cfg(feature = "crds")]
-        let delete_listeners = self
-            .delete_orphaned_resources_of_kind::<crate::crd::listener::v1alpha1::Listener>(client);
-        #[cfg(not(feature = "crds"))]
-        let delete_listeners = async { Ok(()) };
+        let delete_listeners = async {
+            if cfg!(feature = "crds") {
+                self.delete_orphaned_resources_of_kind::<crate::crd::listener::v1alpha1::Listener>(
+                    client,
+                )
+                .await
+            } else {
+                Ok(())
+            }
+        };
 
         tokio::try_join!(
             self.delete_orphaned_resources_of_kind::<Service>(client),

From 52ec6284b94f7a70769f2100c76553edb3e8bc86 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Mon, 9 Mar 2026 10:32:28 +0100
Subject: [PATCH 08/11] Add new features to changelog

---
 crates/stackable-operator/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md
index 4a2aec780..ab9e7692a 100644
--- a/crates/stackable-operator/CHANGELOG.md
+++ b/crates/stackable-operator/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+
+- Added two new crate features: `crds` and `kube-ws` ([#1162]).
+
 ### Fixed
 
 - BREAKING: Fix compilation failures when not enabling default features ([#1162]).

From b15b9159a8f68f6c46013d5a543c15a5510cf192 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Date: Mon, 9 Mar 2026 10:33:06 +0100
Subject: [PATCH 09/11] Update crates/stackable-operator/CHANGELOG.md

Co-authored-by: Techassi <git@techassi.dev>
---
 crates/stackable-operator/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md
index ab9e7692a..8c3a6ee63 100644
--- a/crates/stackable-operator/CHANGELOG.md
+++ b/crates/stackable-operator/CHANGELOG.md
@@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 
 - BREAKING: Fix compilation failures when not enabling default features ([#1162]).
-  This is achieved by removing the `clap`, `telemetry` and `versioned` features, which where previously enabled by default.
+  This is achieved by removing the `clap`, `telemetry` and `versioned` features, which were previously enabled by default.
   They have been removed as the stackable-operator code actually always requires them.
 
 [#1162]: https://github.com/stackabletech/operator-rs/pull/1162

From 585bdfd1f08755de521947a16acba050e5bad3d1 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Mon, 9 Mar 2026 10:33:47 +0100
Subject: [PATCH 10/11] ci: Also disable cargo-test-no-default-features for now

---
 .pre-commit-config.yaml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index cecc73314..3a57dcb21 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -80,14 +80,13 @@ repos:
       #   stages: [pre-commit, pre-merge-commit]
       #   pass_filenames: false
       #   files: \.rs$|Cargo\.(toml|lock)
-
-      - id: cargo-test-no-default-features
-        name: cargo-test-no-default-features
-        language: system
-        entry: cargo test --no-default-features --workspace
-        stages: [pre-commit, pre-merge-commit]
-        pass_filenames: false
-        files: \.rs$|Cargo\.(toml|lock)
+      # - id: cargo-test-no-default-features
+      #   name: cargo-test-no-default-features
+      #   language: system
+      #   entry: cargo test --no-default-features --workspace
+      #   stages: [pre-commit, pre-merge-commit]
+      #   pass_filenames: false
+      #   files: \.rs$|Cargo\.(toml|lock)
 
       - id: cargo-test-all-features
         name: cargo-test-all-features

From f3a78a3f8e06fbcc9162e6329f9a53ab0ec97449 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Mon, 9 Mar 2026 11:06:25 +0100
Subject: [PATCH 11/11] Revert "refactor: Use cfg!"

This reverts commit 1e0cde4e0037dd7729672aab5d27f684d96641af.

It failed compilation, as it always compiles both branches, which fails
when the crds feature is not enabled.
---
 .../stackable-operator/src/cluster_resources.rs   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/crates/stackable-operator/src/cluster_resources.rs b/crates/stackable-operator/src/cluster_resources.rs
index c5a06f866..6bb0474c0 100644
--- a/crates/stackable-operator/src/cluster_resources.rs
+++ b/crates/stackable-operator/src/cluster_resources.rs
@@ -671,16 +671,11 @@ impl<'a> ClusterResources<'a> {
     /// * `client` - The client which is used to access Kubernetes
     pub async fn delete_orphaned_resources(self, client: &Client) -> Result<()> {
         // We can only delete Listeners in case the "crds" feature is enabled, otherwise it's a NOP.
-        let delete_listeners = async {
-            if cfg!(feature = "crds") {
-                self.delete_orphaned_resources_of_kind::<crate::crd::listener::v1alpha1::Listener>(
-                    client,
-                )
-                .await
-            } else {
-                Ok(())
-            }
-        };
+        #[cfg(feature = "crds")]
+        let delete_listeners = self
+            .delete_orphaned_resources_of_kind::<crate::crd::listener::v1alpha1::Listener>(client);
+        #[cfg(not(feature = "crds"))]
+        let delete_listeners = async { Ok(()) };
 
         tokio::try_join!(
             self.delete_orphaned_resources_of_kind::<Service>(client),