chore: Bump operator-rs to 0.56.0

stackabletech · Oct 31, 2023 · 2e98faa · 2e98faa
1 parent 1bd56f9
commit 2e98faa
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,15 +16,16 @@ built = { version =  "0.6", features = ["chrono", "git2"] }
 clap = "4.3"
 fnv = "1.0"
 futures = { version = "0.3", features = ["compat"] }
+product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.6.0" }
 rstest = "0.18"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.7"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.55.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.56.0" }
 strum = { version = "0.25", features = ["derive"] }
 tokio = { version = "1.29", features = ["full"] }
 tracing = "0.1"
 
-[patch."https://github.com/stackabletech/operator-rs.git"]
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "docs/vector-process" }
+# [patch."https://github.com/stackabletech/operator-rs.git"]
+# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml
@@ -15,6 +15,7 @@ anyhow.workspace = true
 clap.workspace = true
 fnv.workspace = true
 futures.workspace = true
+product-config.workspace = true
 serde.workspace = true
 snafu.workspace = true
 stackable-operator.workspace = true

diff --git a/rust/operator-binary/src/discovery.rs b/rust/operator-binary/src/discovery.rs
@@ -34,7 +34,7 @@ pub fn build_discovery_configmap(
         )
         .add_data(
             HBASE_SITE_XML,
-            stackable_operator::product_config::writer::to_hadoop_xml(
+            product_config::writer::to_hadoop_xml(
                 hbase_site
                     .into_iter()
                     .map(|(k, v)| (k, Some(v)))

diff --git a/rust/operator-binary/src/hbase_controller.rs b/rust/operator-binary/src/hbase_controller.rs
@@ -10,6 +10,11 @@ use crate::{
     OPERATOR_NAME,
 };
 
+use product_config::{
+    types::PropertyNameKind,
+    writer::{self, to_java_properties_string},
+    ProductConfigManager,
+};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_hbase_crd::{
     Container, HbaseCluster, HbaseClusterStatus, HbaseConfig, HbaseConfigFragment, HbaseRole,
@@ -42,11 +47,6 @@ use stackable_operator::{
     labels::{role_group_selector_labels, role_selector_labels, ObjectLabels},
     logging::controller::ReconcilerError,
     memory::{BinaryMultiple, MemoryQuantity},
-    product_config::{
-        types::PropertyNameKind,
-        writer::{self, to_java_properties_string},
-        ProductConfigManager,
-    },
     product_config_utils::{transform_all_roles_to_config, validate_all_roles_and_groups_config},
     product_logging::{
         self,
@@ -214,7 +214,7 @@ pub enum Error {
         rolegroup
     ))]
     SerializeJvmSecurity {
-        source: stackable_operator::product_config::writer::PropertiesWriterError,
+        source: product_config::writer::PropertiesWriterError,
         rolegroup: RoleGroupRef<HbaseCluster>,
     },
     #[snafu(display("failed to create PodDisruptionBudget"))]