chore: Bump stackable-operator and use re-exports

Author: NickLarsenNZ

Cargo.lock

@@ -11,9 +11,7 @@ repository = "https://github.com/stackabletech/opa-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.6.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.91.1" }
 
 anyhow = "1.0"
 axum = "0.8"

Cargo.nix

@@ -13,7 +13,6 @@ publish = false
 [dependencies]
 stackable-opa-regorule-library = { path = "../regorule-library" }
 stackable-operator.workspace = true
-stackable-telemetry.workspace = true
 
 axum.workspace = true
 clap.workspace = true

Cargo.toml

@@ -1,7 +1,6 @@
 use std::{
     collections::{BTreeMap, BTreeSet},
     num::TryFromIntError,
-    ops::Deref as _,
     sync::{Arc, Mutex},
 };
 
@@ -15,7 +14,6 @@ use futures::{
 };
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
-    cli::RollingPeriod,
     k8s_openapi::api::core::v1::ConfigMap,
     kube::{
         api::ObjectMeta,
@@ -24,8 +22,11 @@ use stackable_operator::{
             watcher,
         },
     },
+    telemetry::{
+        Tracing,
+        tracing::{RollingPeriod, settings::Settings},
+    },
 };
-use stackable_telemetry::{Tracing, tracing::settings::Settings};
 use tokio::net::TcpListener;
 use tracing::level_filters::LevelFilter;
 
@@ -74,7 +75,7 @@ enum StartupError {
 
     #[snafu(display("failed to initialize stackable-telemetry"))]
     TracingInit {
-        source: stackable_telemetry::tracing::Error,
+        source: stackable_operator::telemetry::tracing::Error,
     },
 }
 
@@ -103,7 +104,6 @@ async fn main() -> Result<(), StartupError> {
                         .telemetry_arguments
                         .rolling_logs_period
                         .unwrap_or(RollingPeriod::Never)
-                        .deref()
                         .clone();
 
                     Settings::builder()

crate-hashes.json

@@ -11,8 +11,6 @@ publish = false
 [dependencies]
 product-config.workspace = true
 stackable-operator.workspace = true
-stackable-telemetry.workspace = true
-stackable-versioned.workspace = true
 
 anyhow.workspace = true
 clap.workspace = true

rust/bundle-builder/Cargo.toml

@@ -27,8 +27,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};
 
 pub mod user_info_fetcher;

rust/bundle-builder/src/main.rs

@@ -5,8 +5,8 @@ use stackable_operator::{
     commons::{networking::HostName, tls_verification::TlsClientDetails},
     schemars::{self, JsonSchema},
     time::Duration,
+    versioned::versioned,
 };
-use stackable_versioned::versioned;
 
 #[versioned(version(name = "v1alpha1"))]
 pub mod versioned {

rust/operator-binary/Cargo.toml

@@ -1,12 +1,12 @@
-use std::{ops::Deref as _, sync::Arc};
+use std::sync::Arc;
 
 use clap::Parser;
 use futures::StreamExt;
 use product_config::ProductConfigManager;
 use stackable_opa_operator::crd::{OPERATOR_NAME, OpaCluster, v1alpha1};
 use stackable_operator::{
     YamlSchema,
-    cli::{Command, ProductOperatorRun, RollingPeriod},
+    cli::{Command, ProductOperatorRun},
     client::{self, Client},
     k8s_openapi::api::{
         apps::v1::DaemonSet,
@@ -24,8 +24,11 @@ use stackable_operator::{
     logging::controller::report_controller_reconciled,
     namespace::WatchNamespace,
     shared::yaml::SerializeOptions,
+    telemetry::{
+        Tracing,
+        tracing::{RollingPeriod, settings::Settings},
+    },
 };
-use stackable_telemetry::{Tracing, tracing::settings::Settings};
 use tracing::level_filters::LevelFilter;
 
 use crate::controller::OPA_FULL_CONTROLLER_NAME;
@@ -92,7 +95,6 @@ async fn main() -> anyhow::Result<()> {
                     let rotation_period = telemetry_arguments
                         .rolling_logs_period
                         .unwrap_or(RollingPeriod::Never)
-                        .deref()
                         .clone();
 
                     Settings::builder()