Use updated product-config

Cargo.toml

@@ -1,7 +1,5 @@
 [workspace]
-members = [
-    "rust/crd", "rust/operator-binary"
-]
+members = ["rust/crd", "rust/operator-binary"]
 
 [workspace.package]
 version = "0.0.0-dev"
@@ -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"] }
@@ -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" }
+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"

rust/crd/Cargo.toml

@@ -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
 

rust/crd/src/lib.rs

@@ -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::{
@@ -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";