Skip to content

Commit

Permalink
Use updated product-config (#384)
Browse files Browse the repository at this point in the history
  • Loading branch information
Techassi authored Nov 2, 2023
1 parent 057d8c2 commit 4c97ad8
Show file tree
Hide file tree
Showing 5 changed files with 237 additions and 38 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 @@ -12,7 +10,7 @@ repository = "https://github.com/stackabletech/hive-operator"

[workspace.dependencies]
anyhow = "1.0"
built = { version = "0.6", features = ["chrono", "git2"] }
built = { version = "0.6", features = ["chrono", "git2"] }
clap = "4.3"
fnv = "1.0"
futures = { version = "0.3", features = ["compat"] }
Expand All @@ -24,7 +22,8 @@ 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" }
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
8 changes: 5 additions & 3 deletions rust/crd/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pub mod affinity;
use std::{collections::BTreeMap, str::FromStr};

use affinity::get_affinity;
use indoc::formatdoc;
use serde::{Deserialize, Serialize};
use snafu::{OptionExt, ResultExt, Snafu};
Expand All @@ -24,9 +23,12 @@ use stackable_operator::{
schemars::{self, JsonSchema},
status::condition::{ClusterCondition, HasStatusCondition},
};
use std::{collections::BTreeMap, str::FromStr};
use strum::{Display, EnumIter, EnumString, IntoEnumIterator};

use crate::affinity::get_affinity;

pub mod affinity;

pub const APP_NAME: &str = "hive";
// directories
pub const STACKABLE_CONFIG_DIR: &str = "/stackable/config";
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 @@ -21,6 +21,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 4c97ad8

Please sign in to comment.