chore: Bump stackable_operator to 0.93.1

Part of stackabletech/issues#642.

Bump stackable-operator to 0.93.1 which versions common CRD structs.

Author: NickLarsenNZ

Cargo.lock

@@ -11,10 +11,10 @@ repository = "https://github.com/stackabletech/spark-k8s-operator"
 
 [workspace.dependencies]
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.92.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.93.1" }
 
 anyhow = "1.0"
-built = { version = "0.7", features = ["chrono", "git2"] }
+built = { version = "0.8", features = ["chrono", "git2"] }
 clap = "4.5"
 const_format = "0.2"
 futures = { version = "0.3", features = ["compat"] }

Cargo.nix

@@ -1,6 +1,6 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
-    commons::s3::S3ConnectionSpec,
+    crd::s3,
     role_utils::{self, JvmArgumentOverrides},
 };
 
@@ -25,7 +25,7 @@ pub enum Error {
 /// 2. `spark.executor.extraJavaOptions`
 pub fn construct_extra_java_options(
     spark_application: &SparkApplication,
-    s3_conn: &Option<S3ConnectionSpec>,
+    s3_conn: &Option<s3::v1alpha1::ConnectionSpec>,
     log_dir: &Option<ResolvedLogDir>,
 ) -> Result<(String, String), Error> {
     // Note (@sbernauer): As of 2025-03-04, we did not set any heap related JVM arguments, so I

Cargo.toml

@@ -16,10 +16,8 @@ use stackable_operator::{
             },
         },
     },
-    commons::{
-        listener::{Listener, ListenerPort},
-        product_image_selection::ResolvedProductImage,
-    },
+    commons::product_image_selection::ResolvedProductImage,
+    crd::listener,
     k8s_openapi::{
         DeepMerge,
         api::{
@@ -53,7 +51,7 @@ use crate::{
             VOLUME_MOUNT_NAME_LOG, VOLUME_MOUNT_NAME_LOG_CONFIG, VOLUME_MOUNT_PATH_CONFIG,
             VOLUME_MOUNT_PATH_LOG, VOLUME_MOUNT_PATH_LOG_CONFIG,
         },
-        listener,
+        listener_ext,
     },
     product_logging,
 };
@@ -65,7 +63,9 @@ const HTTP: &str = "http";
 #[allow(clippy::enum_variant_names)]
 pub enum Error {
     #[snafu(display("failed to build spark connect listener"))]
-    BuildListener { source: crate::crd::listener::Error },
+    BuildListener {
+        source: crate::crd::listener_ext::Error,
+    },
 
     #[snafu(display("failed to build listener volume"))]
     BuildListenerVolume {
@@ -616,27 +616,27 @@ pub(crate) fn build_listener(
     scs: &v1alpha1::SparkConnectServer,
     config: &v1alpha1::ServerConfig,
     resolved_product_image: &ResolvedProductImage,
-) -> Result<Listener, Error> {
+) -> Result<listener::v1alpha1::Listener, Error> {
     let listener_name = dummy_role_group_ref(scs).object_name();
     let listener_class = config.listener_class.clone();
     let role = SparkConnectRole::Server.to_string();
     let recommended_object_labels =
         common::labels(scs, &resolved_product_image.app_version_label, &role);
 
     let listener_ports = [
-        ListenerPort {
+        listener::v1alpha1::ListenerPort {
             name: GRPC.to_string(),
             port: CONNECT_GRPC_PORT,
             protocol: Some("TCP".to_string()),
         },
-        ListenerPort {
+        listener::v1alpha1::ListenerPort {
             name: HTTP.to_string(),
             port: CONNECT_UI_PORT,
             protocol: Some("TCP".to_string()),
         },
     ];
 
-    listener::build_listener(
+    listener_ext::build_listener(
         scs,
         &listener_name,
         &listener_class,

crate-hashes.json

@@ -11,12 +11,12 @@ use stackable_operator::{
             CpuLimitsFragment, MemoryLimitsFragment, NoRuntimeLimits, NoRuntimeLimitsFragment,
             Resources, ResourcesFragment,
         },
-        s3::S3BucketInlineOrReference,
     },
     config::{
         fragment::{self, Fragment, ValidationError},
         merge::Merge,
     },
+    crd::s3,
     k8s_openapi::{api::core::v1::EnvVar, apimachinery::pkg::api::resource::Quantity},
     kube::{CustomResource, ResourceExt, runtime::reflector::ObjectRef},
     product_config_utils::{
@@ -271,7 +271,7 @@ pub enum LogFileDirectorySpec {
 #[serde(rename_all = "camelCase")]
 pub struct S3LogFileDirectorySpec {
     pub prefix: String,
-    pub bucket: S3BucketInlineOrReference,
+    pub bucket: s3::v1alpha1::InlineBucketOrReference,
 }
 
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -410,10 +410,7 @@ fn default_listener_class() -> String {
 #[cfg(test)]
 mod test {
     use indoc::indoc;
-    use stackable_operator::commons::{
-        s3::{ResolvedS3Bucket, ResolvedS3Connection},
-        tls_verification::TlsClientDetails,
-    };
+    use stackable_operator::{commons::tls_verification::TlsClientDetails, crd::s3};
 
     use super::*;
     use crate::crd::logdir::S3LogDir;
@@ -451,9 +448,9 @@ mod test {
             serde_yaml::with::singleton_map_recursive::deserialize(deserializer).unwrap();
 
         let log_dir = ResolvedLogDir::S3(S3LogDir {
-            bucket: ResolvedS3Bucket {
+            bucket: s3::v1alpha1::ResolvedBucket {
                 bucket_name: "my-bucket".to_string(),
-                connection: ResolvedS3Connection {
+                connection: s3::v1alpha1::ConnectionSpec {
                     host: "my-s3".to_string().try_into().unwrap(),
                     port: None,
                     access_style: Default::default(),

rust/operator-binary/src/config/jvm.rs

@@ -1,9 +1,6 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
-    builder::meta::ObjectMetaBuilder,
-    commons::listener::{Listener, ListenerPort, ListenerSpec},
-    kube::Resource,
-    kvp::ObjectLabels,
+    builder::meta::ObjectMetaBuilder, crd::listener, kube::Resource, kvp::ObjectLabels,
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
 
@@ -22,14 +19,15 @@ pub enum Error {
     },
 }
 
+// TODO (@NickLarsenNZ): Move this functionality to stackable-operator
 pub fn build_listener<T: Resource<DynamicType = ()>>(
     resource: &T,
     listener_name: &str,
     listener_class: &str,
     listener_labels: ObjectLabels<T>,
-    listener_ports: &[ListenerPort],
-) -> Result<Listener, Error> {
-    Ok(Listener {
+    listener_ports: &[listener::v1alpha1::ListenerPort],
+) -> Result<listener::v1alpha1::Listener, Error> {
+    Ok(listener::v1alpha1::Listener {
         metadata: ObjectMetaBuilder::new()
             .name_and_namespace(resource)
             .name(listener_name)
@@ -38,10 +36,10 @@ pub fn build_listener<T: Resource<DynamicType = ()>>(
             .with_recommended_labels(listener_labels)
             .context(ObjectMetaSnafu)?
             .build(),
-        spec: ListenerSpec {
+        spec: listener::v1alpha1::ListenerSpec {
             class_name: Some(listener_class.into()),
             ports: Some(listener_ports.to_vec()),
-            ..ListenerSpec::default()
+            ..listener::v1alpha1::ListenerSpec::default()
         },
         status: None,
     })

rust/operator-binary/src/connect/server.rs

@@ -6,10 +6,8 @@ use stackable_operator::{
         SecretFormat, SecretOperatorVolumeSourceBuilder, SecretOperatorVolumeSourceBuilderError,
         VolumeBuilder,
     },
-    commons::{
-        s3::{ResolvedS3Bucket, S3AccessStyle, S3Error},
-        secret_class::SecretClassVolume,
-    },
+    commons::secret_class::SecretClassVolume,
+    crd::s3,
     k8s_openapi::api::core::v1::{Volume, VolumeMount},
     time::Duration,
 };
@@ -47,8 +45,15 @@ pub enum Error {
         source: stackable_operator::commons::secret_class::SecretClassVolumeError,
     },
 
-    #[snafu(display("failed to configure S3 connection/bucket"))]
-    ConfigureS3 { source: S3Error },
+    #[snafu(display("failed to configure S3 bucket"))]
+    ConfigureS3Bucket {
+        source: stackable_operator::crd::s3::v1alpha1::BucketError,
+    },
+
+    #[snafu(display("failed to configure S3 connection"))]
+    ConfigureS3Connection {
+        source: stackable_operator::crd::s3::v1alpha1::ConnectionError,
+    },
 }
 
 pub enum ResolvedLogDir {
@@ -142,7 +147,7 @@ impl ResolvedLogDir {
 }
 
 pub struct S3LogDir {
-    pub bucket: ResolvedS3Bucket,
+    pub bucket: s3::v1alpha1::ResolvedBucket,
     pub prefix: String,
 }
 
@@ -158,7 +163,7 @@ impl S3LogDir {
             // TODO (@NickLarsenNZ): Explain this unwrap. Either convert to expect, or gracefully handle the error.
             .resolve(client, namespace.unwrap().as_str())
             .await
-            .context(ConfigureS3Snafu)?;
+            .context(ConfigureS3BucketSnafu)?;
 
         if bucket.connection.tls.uses_tls() && !bucket.connection.tls.uses_tls() {
             return S3TlsNoVerificationNotSupportedSnafu.fail();
@@ -187,11 +192,14 @@ impl S3LogDir {
             ("spark.history.fs.logDirectory".to_string(), self.url()),
             (
                 "spark.hadoop.fs.s3a.endpoint".to_string(),
-                connection.endpoint().context(ConfigureS3Snafu)?.to_string(),
+                connection
+                    .endpoint()
+                    .context(ConfigureS3ConnectionSnafu)?
+                    .to_string(),
             ),
             (
                 "spark.hadoop.fs.s3a.path.style.access".to_string(),
-                (connection.access_style == S3AccessStyle::Path).to_string(),
+                (connection.access_style == s3::v1alpha1::S3AccessStyle::Path).to_string(),
             ),
             (
                 "spark.hadoop.fs.s3a.endpoint.region".to_string(),
@@ -212,11 +220,14 @@ impl S3LogDir {
         let bucket_name = &self.bucket.bucket_name;
         result.insert(
             format!("spark.hadoop.fs.s3a.bucket.{bucket_name}.endpoint"),
-            connection.endpoint().context(ConfigureS3Snafu)?.to_string(),
+            connection
+                .endpoint()
+                .context(ConfigureS3ConnectionSnafu)?
+                .to_string(),
         );
         result.insert(
             format!("spark.hadoop.fs.s3a.bucket.{bucket_name}.path.style.access"),
-            (connection.access_style == S3AccessStyle::Path).to_string(),
+            (connection.access_style == s3::v1alpha1::S3AccessStyle::Path).to_string(),
         );
         result.insert(
             format!("spark.hadoop.fs.s3a.bucket.{bucket_name}.region"),