Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Use updated product-config #340

Merged
merged 2 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 172 additions & 9 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/airflow-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 @@ -22,7 +20,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", branch = "refactor/product-config-errors" }
Techassi marked this conversation as resolved.
Show resolved Hide resolved
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
1 change: 1 addition & 0 deletions rust/crd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ serde.workspace = true
serde_json.workspace = true
snafu.workspace = true
stackable-operator.workspace = true
product-config.workspace = true
strum.workspace = true
tracing.workspace = true

Expand Down
16 changes: 8 additions & 8 deletions rust/crd/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
pub mod affinity;
pub mod authentication;
mod git_sync;

use crate::affinity::get_affinity;
use crate::authentication::AirflowAuthentication;
use std::collections::BTreeMap;

use git_sync::GitSync;
use product_config::flask_app_config_writer::{FlaskAppConfigOptions, PythonType};
use serde::{Deserialize, Serialize};
use snafu::{OptionExt, ResultExt, Snafu};
use stackable_operator::{
Expand All @@ -26,16 +22,20 @@ use stackable_operator::{
kube::{CustomResource, ResourceExt},
labels::ObjectLabels,
memory::{BinaryMultiple, MemoryQuantity},
product_config::flask_app_config_writer::{FlaskAppConfigOptions, PythonType},
product_config_utils::{ConfigError, Configuration},
product_logging::{self, spec::Logging},
role_utils::{CommonConfiguration, GenericRoleConfig, Role, RoleGroup, RoleGroupRef},
schemars::{self, JsonSchema},
status::condition::{ClusterCondition, HasStatusCondition},
};
use std::collections::BTreeMap;
use strum::{Display, EnumIter, EnumString, IntoEnumIterator};

use crate::{affinity::get_affinity, authentication::AirflowAuthentication};

pub mod affinity;
pub mod authentication;
mod git_sync;

pub const AIRFLOW_UID: i64 = 1000;
pub const APP_NAME: &str = "airflow";
pub const OPERATOR_NAME: &str = "airflow.stackable.tech";
Expand Down
Loading