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/zookeeper-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

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

@@ -119,24 +119,27 @@ pub enum LoggingFramework {
     LOGBACK,
 }
 
-#[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 ZooKeeper cluster stacklet. This resource is managed by the Stackable operator for Apache ZooKeeper.
     /// Find more information on how to use it and the resources that the operator generates in the
     /// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/zookeeper/).
     #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "zookeeper.stackable.tech",
-        kind = "ZookeeperCluster",
         plural = "zookeeperclusters",
         shortname = "zk",
         status = "v1alpha1::ZookeeperClusterStatus",
         namespaced,
-        crates(
-            kube_core = "stackable_operator::kube::core",
-            k8s_openapi = "stackable_operator::k8s_openapi",
-            schemars = "stackable_operator::schemars"
-        )
     ))]
     #[serde(rename_all = "camelCase")]
     pub struct ZookeeperClusterSpec {
@@ -293,19 +296,13 @@ pub mod versioned {
     /// You can learn more about this in the
     /// [Isolating clients with ZNodes usage guide](DOCS_BASE_URL_PLACEHOLDER/zookeeper/usage_guide/isolating_clients_with_znodes).
     #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
-    #[versioned(k8s(
+    #[versioned(crd(
         group = "zookeeper.stackable.tech",
-        kind = "ZookeeperZnode",
         plural = "zookeeperznodes",
         shortname = "zno",
         shortname = "znode",
         status = "v1alpha1::ZookeeperZnodeStatus",
         namespaced,
-        crates(
-            kube_core = "stackable_operator::kube::core",
-            k8s_openapi = "stackable_operator::k8s_openapi",
-            schemars = "stackable_operator::schemars"
-        )
     ))]
     #[serde(rename_all = "camelCase")]
     pub struct ZookeeperZnodeSpec {

crate-hashes.json

@@ -1,7 +1,13 @@
+// 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;
-use crd::{APP_NAME, OPERATOR_NAME, ZookeeperCluster, ZookeeperZnode, v1alpha1};
+use crd::{
+    APP_NAME, OPERATOR_NAME, ZookeeperCluster, ZookeeperClusterVersion, ZookeeperZnode,
+    ZookeeperZnodeVersion, v1alpha1,
+};
 use futures::{StreamExt, pin_mut};
 use stackable_operator::{
     YamlSchema,
@@ -54,9 +60,9 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         Command::Crd => {
-            ZookeeperCluster::merged_crd(ZookeeperCluster::V1Alpha1)?
+            ZookeeperCluster::merged_crd(ZookeeperClusterVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
-            ZookeeperZnode::merged_crd(ZookeeperZnode::V1Alpha1)?
+            ZookeeperZnode::merged_crd(ZookeeperZnodeVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
         }
         Command::Run(ProductOperatorRun {

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

@@ -329,7 +329,7 @@ impl ReconcilerError for Error {
             Error::ApplyRoleBinding { .. } => None,
             Error::BuildRbacResources { .. } => None,
             Error::DeleteOrphans { .. } => None,
-            Error::VectorAggregatorConfigMapMissing { .. } => None,
+            Error::VectorAggregatorConfigMapMissing => None,
             Error::InvalidLoggingConfig { .. } => None,
             Error::FailedToInitializeSecurityContext { .. } => None,
             Error::FailedToResolveConfig { .. } => None,
@@ -786,7 +786,6 @@ pub fn build_role_listener_pvc(
         &ListenerReference::ListenerName(group_listener_name.to_string()),
         unversioned_recommended_labels,
     )
-    .expect("ListenerOperatorVolumeSourceBuilder::new always returns Ok()")
     .build_pvc(LISTENER_VOLUME_NAME.to_string())
     .context(BuildListenerPersistentVolumeSnafu)
 }