Skip to content

Commit d415c59

Browse files
committed
bump op-rs to 0.112.0
1 parent a85f623 commit d415c59

6 files changed

Lines changed: 55 additions & 55 deletions

File tree

Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2024"
1010
repository = "https://github.com/stackabletech/zookeeper-operator"
1111

1212
[workspace.dependencies]
13-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.111.1", features = ["webhook"] }
13+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.112.0", features = ["webhook"] }
1414

1515
anyhow = "1.0"
1616
built = { version = "0.8", features = ["chrono", "git2"] }
@@ -31,7 +31,7 @@ tokio-zookeeper = "0.4"
3131
tracing = "0.1"
3232

3333
[patch."https://github.com/stackabletech/operator-rs.git"]
34-
stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "smooth-operator" }
34+
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "smooth-operator" }
3535
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
3636

3737
[patch.crates-io]

crate-hashes.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/operator-binary/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ publish = false
1010
build = "build.rs"
1111

1212
[dependencies]
13-
stackable-operator.workspace = true
13+
stackable-operator = { workspace = true, features = ["test-support"] }
1414

1515
anyhow.workspace = true
1616
clap.workspace = true

rust/operator-binary/src/zk_controller/validate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use stackable_operator::{
3232
HasName, HasUid, NameIsValidLabelValue,
3333
builder::{
3434
meta::ownerreference_from_resource,
35-
pod::container::{self, EnvVarName, EnvVarSet},
35+
pod::container::{EnvVarName, EnvVarSet},
3636
},
3737
controller_utils::{get_cluster_name, get_namespace, get_uid},
3838
kvp::label::{recommended_labels, role_group_selector},
@@ -104,7 +104,7 @@ pub enum Error {
104104

105105
#[snafu(display("invalid environment variable override name in role group {role_group:?}"))]
106106
ParseEnvVarName {
107-
source: container::Error,
107+
source: stackable_operator::v2::macros::attributed_string_type::Error,
108108
role_group: String,
109109
},
110110

0 commit comments

Comments
 (0)