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/superset-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"
 built = { version = "0.8", features = ["chrono", "git2"] }

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
@@ -646,11 +646,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

@@ -14,20 +14,24 @@ pub enum Error {
 }
 type Result<T, E = Error> = std::result::Result<T, E>;
 
-#[versioned(version(name = "v1alpha1"))]
+#[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"
+    )
+)]
 pub mod versioned {
     /// The DruidConnection resource can be used to automatically deploy a Druid datasource in Superset.
     /// Learn more about it in the [Superset operator usage guide](DOCS_BASE_URL_PLACEHOLDER/superset/usage-guide/connecting-druid).
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "superset.stackable.tech",
         plural = "druidconnections",
         status = "v1alpha1::DruidConnectionStatus",
         namespaced,
-        crates(
-            kube_core = "stackable_operator::kube::core",
-            k8s_openapi = "stackable_operator::k8s_openapi",
-            schemars = "stackable_operator::schemars"
-        )
     ))]
     #[derive(Clone, CustomResource, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
     #[serde(rename_all = "camelCase")]

crate-hashes.json

@@ -112,22 +112,26 @@ pub enum SupersetConfigOptions {
     AuthOpaCacheTtlInSec,
 }
 
-#[versioned(version(name = "v1alpha1"))]
+#[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"
+    )
+)]
 pub mod versioned {
     /// A Superset cluster stacklet. This resource is managed by the Stackable operator for Apache Superset.
     /// Find more information on how to use it and the resources that the operator generates in the
     /// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/superset/).
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "superset.stackable.tech",
         plural = "supersetclusters",
         shortname = "superset",
         status = "v1alpha1::SupersetClusterStatus",
         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")]

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

@@ -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)]
 use std::sync::Arc;
 
 use clap::Parser;
@@ -28,8 +31,8 @@ use stackable_operator::{
 
 use crate::{
     crd::{
-        APP_NAME, SupersetCluster,
-        druidconnection::{self, DruidConnection},
+        APP_NAME, SupersetCluster, SupersetClusterVersion,
+        druidconnection::{self, DruidConnection, DruidConnectionVersion},
         v1alpha1,
     },
     druid_connection_controller::DRUID_CONNECTION_FULL_CONTROLLER_NAME,
@@ -68,9 +71,9 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         Command::Crd => {
-            SupersetCluster::merged_crd(SupersetCluster::V1Alpha1)?
+            SupersetCluster::merged_crd(SupersetClusterVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
-            DruidConnection::merged_crd(DruidConnection::V1Alpha1)?
+            DruidConnection::merged_crd(DruidConnectionVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
         }
         Command::Run(ProductOperatorRun {

rust/operator-binary/src/crd/druidconnection.rs

@@ -810,7 +810,6 @@ fn build_server_rolegroup_statefulset(
             &ListenerReference::ListenerName(group_listener_name),
             &unversioned_recommended_labels,
         )
-        .context(BuildListenerVolumeSnafu)?
         .build_pvc(LISTENER_VOLUME_NAME.to_owned())
         .context(BuildListenerVolumeSnafu)?;
         Some(vec![pvc])