chore: Streamline feature gate

Author: Techassi

Cargo.lock

@@ -12,19 +12,19 @@ full = ["certs", "telemetry", "versioned", "time", "webhook", "clap"]
 default = ["telemetry", "versioned", "clap"]
 
 clap = []
-certs = ["dep:stackable-certs", "dep:x509-cert"]
+certs = ["dep:stackable-certs"]
 telemetry = ["dep:stackable-telemetry"]
 time = ["stackable-shared/time"]
 versioned = ["dep:stackable-versioned"]
-webhook = ["dep:stackable-webhook", "dep:x509-cert"]
+webhook = ["dep:stackable-webhook"]
 
 [dependencies]
 stackable-certs = { path = "../stackable-certs", optional = true }
 stackable-operator-derive = { path = "../stackable-operator-derive" }
 stackable-shared = { path = "../stackable-shared" }
 stackable-telemetry = { path = "../stackable-telemetry", optional = true, features = ["clap"] }
 stackable-versioned = { path = "../stackable-versioned", optional = true }
-stackable-webhook = { path = "../stackable-webhook", optional = true }
+stackable-webhook = { path = "../stackable-webhook", optional = true, features = ["maintainer"]}
 
 chrono.workspace = true
 clap.workspace = true
@@ -53,7 +53,6 @@ tracing.workspace = true
 tracing-appender.workspace = true
 tracing-subscriber.workspace = true
 url.workspace = true
-x509-cert = { workspace = true, optional = true }
 
 [dev-dependencies]
 rstest.workspace = true

crates/stackable-operator/Cargo.toml

@@ -10,16 +10,13 @@ use kube::{
     api::{Patch, PatchParams},
 };
 use snafu::{ResultExt, Snafu};
+use stackable_webhook::x509_cert::{self, Certificate, EncodePem, LineEnding};
 use tokio::sync::{mpsc, oneshot};
-use x509_cert::{
-    Certificate,
-    der::{EncodePem, pem::LineEnding},
-};
 
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display("failed to encode CA certificate as PEM format"))]
-    EncodeCertificateAuthorityAsPem { source: x509_cert::der::Error },
+    EncodeCertificateAuthorityAsPem { source: x509_cert::Error },
 
     #[snafu(display("failed to send initial CRD reconcile heartbeat"))]
     SendInitialReconcileHeartbeat,

crates/stackable-operator/src/crd/maintainer.rs

@@ -6,6 +6,10 @@ license.workspace = true
 edition.workspace = true
 repository.workspace = true
 
+[features]
+# Re-export selected items from the x509-cert crate needed by the CRD maintainer
+maintainer = []
+
 [dependencies]
 stackable-certs = { path = "../stackable-certs", features = ["rustls"] }
 stackable-shared = { path = "../stackable-shared" }

crates/stackable-webhook/Cargo.toml

@@ -28,6 +28,7 @@
 //! [1]: crate::servers::ConversionWebhookServer
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
+use ::x509_cert::Certificate;
 use axum::{Router, routing::get};
 use futures_util::{FutureExt as _, pin_mut, select};
 use snafu::{ResultExt, Snafu};
@@ -37,17 +38,22 @@ use tokio::{
     sync::mpsc,
 };
 use tower::ServiceBuilder;
-pub use x509_cert::Certificate;
 
-// use tower_http::trace::TraceLayer;
+// Selected re-exports
+pub use crate::options::WebhookOptions;
 use crate::tls::TlsServer;
 
 pub mod options;
 pub mod servers;
 pub mod tls;
 
-// Selected re-exports
-pub use crate::options::WebhookOptions;
+#[cfg(feature = "maintainer")]
+pub mod x509_cert {
+    pub use ::x509_cert::{
+        Certificate,
+        der::{EncodePem, Error, pem::LineEnding},
+    };
+}
 
 /// A generic webhook handler receiving a request and sending back a response.
 ///