chore: Bump stackable-operator and use re-exports

Author: NickLarsenNZ

Cargo.lock

@@ -11,9 +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", tag = "stackable-operator-0.90.0" }
-stackable-telemetry = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-telemetry-0.4.0" }
-stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.7.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.91.1" }
 
 anyhow = "1.0"
 built = { version = "0.7", features = ["chrono", "git2"] }

Cargo.nix

@@ -12,8 +12,6 @@ build = "build.rs"
 [dependencies]
 product-config.workspace = true
 stackable-operator.workspace = true
-stackable-telemetry.workspace = true
-stackable-versioned.workspace = true
 
 anyhow.workspace = true
 clap.workspace = true

Cargo.toml

@@ -4,8 +4,8 @@ use stackable_operator::{
     client::Client,
     commons::authentication::{AuthenticationClass, AuthenticationClassProvider},
     schemars::{self, JsonSchema},
+    versioned::versioned,
 };
-use stackable_versioned::versioned;
 
 use crate::crd::ObjectRef;
 

crate-hashes.json

@@ -30,8 +30,8 @@ use stackable_operator::{
     status::condition::{ClusterCondition, HasStatusCondition},
     time::Duration,
     utils::cluster_info::KubernetesClusterInfo,
+    versioned::versioned,
 };
-use stackable_versioned::versioned;
 use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
 
 use crate::crd::affinity::get_affinity;

rust/operator-binary/Cargo.toml

@@ -1,6 +1,8 @@
 use serde::{Deserialize, Serialize};
-use stackable_operator::schemars::{self, JsonSchema};
-use stackable_versioned::versioned;
+use stackable_operator::{
+    schemars::{self, JsonSchema},
+    versioned::versioned,
+};
 
 const TLS_DEFAULT_SECRET_CLASS: &str = "tls";
 

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

@@ -1,11 +1,11 @@
-use std::{ops::Deref as _, sync::Arc};
+use std::sync::Arc;
 
 use clap::Parser;
 use crd::{APP_NAME, OPERATOR_NAME, ZookeeperCluster, ZookeeperZnode, v1alpha1};
 use futures::{StreamExt, pin_mut};
 use stackable_operator::{
     YamlSchema,
-    cli::{Command, ProductOperatorRun, RollingPeriod},
+    cli::{Command, ProductOperatorRun},
     k8s_openapi::api::{
         apps::v1::StatefulSet,
         core::v1::{ConfigMap, Endpoints, Service},
@@ -22,8 +22,11 @@ use stackable_operator::{
     },
     logging::controller::report_controller_reconciled,
     shared::yaml::SerializeOptions,
+    telemetry::{
+        Tracing,
+        tracing::{RollingPeriod, settings::Settings},
+    },
 };
-use stackable_telemetry::{Tracing, tracing::settings::Settings};
 use tracing::level_filters::LevelFilter;
 
 use crate::{zk_controller::ZK_FULL_CONTROLLER_NAME, znode_controller::ZNODE_FULL_CONTROLLER_NAME};
@@ -83,7 +86,6 @@ async fn main() -> anyhow::Result<()> {
                     let rotation_period = telemetry_arguments
                         .rolling_logs_period
                         .unwrap_or(RollingPeriod::Never)
-                        .deref()
                         .clone();
 
                     Settings::builder()