Skip to content

Commit

Permalink
Use updated product-config (#486)
Browse files Browse the repository at this point in the history
  • Loading branch information
Techassi authored Nov 2, 2023
1 parent d3241eb commit be4a79e
Show file tree
Hide file tree
Showing 6 changed files with 224 additions and 35 deletions.
184 changes: 173 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[workspace]
members = [
"rust/crd", "rust/operator-binary"
]
members = ["rust/crd", "rust/operator-binary"]

[workspace.package]
version = "0.0.0-dev"
Expand All @@ -11,7 +9,7 @@ edition = "2021"
repository = "https://github.com/stackabletech/opa-operator"

[workspace.dependencies]
built = { version = "0.6", features = ["chrono", "git2"] }
built = { version = "0.6", features = ["chrono", "git2"] }
clap = "4.3"
futures = { version = "0.3", features = ["compat"] }
fnv = "1.0"
Expand All @@ -20,7 +18,8 @@ semver = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
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" }
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.6.0" }
strum = { version = "0.25", features = ["derive"] }
tokio = { version = "1.29", features = ["full"] }
tracing = "0.1"
Expand Down
3 changes: 2 additions & 1 deletion rust/crd/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::{collections::BTreeMap, str::FromStr};

use serde::{Deserialize, Serialize};
use snafu::{OptionExt, ResultExt, Snafu};
use stackable_operator::{
Expand All @@ -19,7 +21,6 @@ use stackable_operator::{
schemars::{self, JsonSchema},
status::condition::{ClusterCondition, HasStatusCondition},
};
use std::{collections::BTreeMap, str::FromStr};
use strum::{Display, EnumIter, EnumString};

pub const APP_NAME: &str = "opa";
Expand Down
1 change: 1 addition & 0 deletions rust/operator-binary/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ serde.workspace = true
serde_json.workspace = true
snafu.workspace = true
stackable-operator.workspace = true
product-config.workspace = true
strum.workspace = true
tokio.workspace = true
tracing.workspace = true
Expand Down
Loading

0 comments on commit be4a79e

Please sign in to comment.