chore: Bump stackable-operator to 0.94.0 and update other dependencies

Author: NickLarsenNZ

Cargo.lock

@@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/trino-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.93.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.94.0" }
 
 anyhow = "1.0"
 async-trait = "0.1"

Cargo.nix

@@ -45,7 +45,7 @@ spec:
                                 type: string
                               extraScopes:
                                 default: []
-                                description: An optional list of extra scopes which get merged with the scopes defined in the `AuthenticationClass`.
+                                description: An optional list of extra scopes which get merged with the scopes defined in the AuthenticationClass
                                 items:
                                   type: string
                                 type: array
@@ -1199,11 +1199,6 @@ spec:
                         format: date-time
                         nullable: true
                         type: string
-                      lastUpdateTime:
-                        description: The last time this condition was updated.
-                        format: date-time
-                        nullable: true
-                        type: string
                       message:
                         description: A human readable message indicating details about the transition.
                         nullable: true

Cargo.toml

@@ -153,10 +153,8 @@ pub fn add_cert_to_truststore(
 /// into a new keystore with password in a writeable empty dir
 ///
 /// # Arguments
-/// - `source_directory`      - The directory of the source keystore.
-///                             Should usually be a secret operator volume mount.
-/// - `destination_directory` - The directory of the destination keystore.
-///                             Should usually be an empty dir.
+/// - `source_directory`: The directory of the source keystore. Should usually be a secret operator volume mount.
+/// - `destination_directory`: The directory of the destination keystore. Should usually be an empty dir.
 fn import_keystore(source_directory: &str, destination_directory: &str) -> Vec<String> {
     vec![
         // The source directory is a secret-op mount and we do not want to write / add anything in there
@@ -177,10 +175,8 @@ fn import_keystore(source_directory: &str, destination_directory: &str) -> Vec<S
 /// into a new truststore with password in a writeable empty dir
 ///
 /// # Arguments
-/// - `source_directory`      - The directory of the source truststore.
-///                             Should usually be a secret operator volume mount.
-/// - `destination_directory` - The directory of the destination truststore.
-///                             Should usually be an empty dir.
+/// - `source_directory`: The directory of the source truststore. Should usually be a secret operator volume mount.
+/// - `destination_directory`: The directory of the destination truststore. Should usually be an empty dir.
 fn import_truststore(source_directory: &str, destination_directory: &str) -> Vec<String> {
     vec![
         // The source directory is a secret-op mount and we do not want to write / add anything in there

crate-hashes.json

@@ -26,23 +26,23 @@ use tpch::TpchConnector;
 
 use self::delta_lake::DeltaLakeConnector;
 
-#[versioned(version(name = "v1alpha1"), options(skip(from)))]
+#[versioned(
+    version(name = "v1alpha1"),
+    crates(
+        kube_core = "stackable_operator::kube::core",
+        kube_client = "stackable_operator::kube::client",
+        k8s_openapi = "stackable_operator::k8s_openapi",
+        schemars = "stackable_operator::schemars",
+        versioned = "stackable_operator::versioned",
+    ),
+    skip(from)
+)]
 pub mod versioned {
     /// The TrinoCatalog resource can be used to define catalogs in Kubernetes objects.
     /// Read more about it in the [Trino operator concept docs](DOCS_BASE_URL_PLACEHOLDER/trino/concepts)
     /// and the [Trino operator usage guide](DOCS_BASE_URL_PLACEHOLDER/trino/usage-guide/catalogs/).
     /// The documentation also contains a list of all the supported backends.
-    #[versioned(k8s(
-        group = "trino.stackable.tech",
-        kind = "TrinoCatalog",
-        plural = "trinocatalogs",
-        namespaced,
-        crates(
-            kube_core = "stackable_operator::kube::core",
-            k8s_openapi = "stackable_operator::k8s_openapi",
-            schemars = "stackable_operator::schemars"
-        )
-    ))]
+    #[versioned(crd(group = "trino.stackable.tech", plural = "trinocatalogs", namespaced,))]
     #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct TrinoCatalogSpec {
@@ -95,9 +95,9 @@ pub enum TrinoCatalogConnector {
 
 #[cfg(test)]
 mod tests {
-    use crate::crd::catalog::TrinoCatalog;
+    use crate::crd::catalog::{TrinoCatalog, TrinoCatalogVersion};
     #[test]
     fn test_crd_generation() {
-        TrinoCatalog::merged_crd(TrinoCatalog::V1Alpha1).unwrap();
+        TrinoCatalog::merged_crd(TrinoCatalogVersion::V1Alpha1).unwrap();
     }
 }

deploy/helm/trino-operator/crds/crds.yaml

@@ -160,23 +160,27 @@ pub enum Error {
     FragmentValidationFailure { source: ValidationError },
 }
 
-#[versioned(version(name = "v1alpha1"), options(skip(from)))]
+#[versioned(
+    version(name = "v1alpha1"),
+    crates(
+        kube_core = "stackable_operator::kube::core",
+        kube_client = "stackable_operator::kube::client",
+        k8s_openapi = "stackable_operator::k8s_openapi",
+        schemars = "stackable_operator::schemars",
+        versioned = "stackable_operator::versioned",
+    ),
+    skip(from)
+)]
 pub mod versioned {
     /// A Trino cluster stacklet. This resource is managed by the Stackable operator for Trino.
     /// Find more information on how to use it and the resources that the operator generates in the
     /// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/trino/).
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "trino.stackable.tech",
-        kind = "TrinoCluster",
         plural = "trinoclusters",
         shortname = "trino",
         status = "TrinoClusterStatus",
         namespaced,
-        crates(
-            kube_core = "stackable_operator::kube::core",
-            k8s_openapi = "stackable_operator::k8s_openapi",
-            schemars = "stackable_operator::schemars"
-        )
     ))]
     #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
     #[serde(rename_all = "camelCase")]

rust/operator-binary/src/command.rs

@@ -65,7 +65,6 @@ pub fn build_group_listener_pvc(
         &ListenerReference::ListenerName(group_listener_name.to_string()),
         unversioned_recommended_labels,
     )
-    .context(BuildListenerPersistentVolumeSnafu)?
     .build_pvc(LISTENER_VOLUME_NAME.to_string())
     .context(BuildListenerPersistentVolumeSnafu)
 }

rust/operator-binary/src/crd/catalog/mod.rs

@@ -1,3 +1,6 @@
+// TODO: Look into how to properly resolve `clippy::result_large_err`.
+// This will need changes in our and upstream error types.
+#![allow(clippy::result_large_err)]
 mod authentication;
 mod authorization;
 mod catalog;
@@ -39,7 +42,11 @@ use stackable_operator::{
 
 use crate::{
     controller::{FULL_CONTROLLER_NAME, OPERATOR_NAME},
-    crd::{TrinoCluster, catalog::TrinoCatalog, v1alpha1},
+    crd::{
+        TrinoCluster, TrinoClusterVersion,
+        catalog::{TrinoCatalog, TrinoCatalogVersion},
+        v1alpha1,
+    },
 };
 
 mod built_info {
@@ -58,9 +65,9 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         Command::Crd => {
-            TrinoCluster::merged_crd(TrinoCluster::V1Alpha1)?
+            TrinoCluster::merged_crd(TrinoClusterVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
-            TrinoCatalog::merged_crd(TrinoCatalog::V1Alpha1)?
+            TrinoCatalog::merged_crd(TrinoCatalogVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
         }
         Command::Run(ProductOperatorRun {