chore: Bump stackable-operator and use re-exports

Author: NickLarsenNZ

Cargo.lock

@@ -11,9 +11,7 @@ repository = "https://github.com/stackabletech/spark-k8s-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

@@ -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
 const_format.workspace = true

Cargo.toml

@@ -27,8 +27,8 @@ use stackable_operator::{
     role_utils::{GenericRoleConfig, JavaCommonConfig, Role, RoleGroup, RoleGroupRef},
     schemars::{self, JsonSchema},
     time::Duration,
+    versioned::versioned,
 };
-use stackable_versioned::versioned;
 use strum::{Display, EnumIter};
 
 use crate::{

crate-hashes.json

@@ -41,8 +41,8 @@ use stackable_operator::{
     schemars::{self, JsonSchema},
     time::Duration,
     utils::crds::raw_object_list_schema,
+    versioned::versioned,
 };
-use stackable_versioned::versioned;
 
 use crate::{
     config::jvm::construct_extra_java_options,

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, pin_mut};
 use history::history_controller;
 use product_config::ProductConfigManager;
 use stackable_operator::{
     YamlSchema,
-    cli::{Command, ProductOperatorRun, RollingPeriod},
+    cli::{Command, ProductOperatorRun},
     k8s_openapi::api::{
         apps::v1::StatefulSet,
         core::v1::{ConfigMap, Pod, Service},
@@ -21,8 +21,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::{info_span, level_filters::LevelFilter};
 use tracing_futures::Instrument;
 
@@ -96,7 +99,6 @@ async fn main() -> anyhow::Result<()> {
                     let rotation_period = telemetry_arguments
                         .rolling_logs_period
                         .unwrap_or(RollingPeriod::Never)
-                        .deref()
                         .clone();
 
                     Settings::builder()