use upstream tag

Author: sbernauer

Cargo.lock

@@ -31,8 +31,8 @@ tokio = { version = "1.40", features = ["full"] }
 tokio-zookeeper = "0.4"
 tracing = "0.1"
 
-[patch."https://github.com/stackabletech/operator-rs"]
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
+# [patch."https://github.com/stackabletech/operator-rs"]
+# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
 
 [patch.crates-io]
 # tokio-zookeeper = { path = "../tokio-zookeeper" }

Cargo.toml

@@ -27,8 +27,8 @@ use stackable_operator::{
     product_logging::{self, spec::Logging},
     role_utils::{GenericRoleConfig, JavaCommonConfig, Role, RoleGroup, RoleGroupRef},
     schemars::{self, JsonSchema},
+    shared::time::Duration,
     status::condition::{ClusterCondition, HasStatusCondition},
-    time::Duration,
     utils::cluster_info::KubernetesClusterInfo,
     versioned::versioned,
 };

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

@@ -22,7 +22,7 @@ use stackable_operator::{
     client::Client,
     crd::authentication::core,
     k8s_openapi::api::core::v1::Volume,
-    time::Duration,
+    shared::time::Duration,
 };
 
 use crate::{

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

@@ -65,11 +65,11 @@ use stackable_operator::{
         },
     },
     role_utils::RoleGroupRef,
+    shared::time::Duration,
     status::condition::{
         compute_conditions, operations::ClusterOperationsConditionBuilder,
         statefulset::StatefulSetConditionBuilder,
     },
-    time::Duration,
     utils::{COMMON_BASH_TRAP_FUNCTIONS, cluster_info::KubernetesClusterInfo},
 };
 use strum::{EnumDiscriminants, IntoStaticStr};

rust/operator-binary/src/zk_controller.rs

@@ -17,7 +17,7 @@ use stackable_operator::{
         runtime::{controller, finalizer, reflector::ObjectRef},
     },
     logging::controller::ReconcilerError,
-    time::Duration,
+    shared::time::Duration,
     utils::cluster_info::KubernetesClusterInfo,
 };
 use strum::{EnumDiscriminants, IntoStaticStr};