bump stackable-versioned, refactor version imports and references

xeniape · xeniape · commit b3b5ec141317 · 2025-02-17T13:10:15.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.8"
 stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0" }
-stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.5.0" }
+stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.5.1" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
 tracing = "0.1"
diff --git a/crate-hashes.json b/crate-hashes.json
diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs
@@ -6,8 +6,8 @@ use stackable_operator::commons::authentication::{ldap, oidc};
 
 use crate::crd::{
     authentication::{
-        v1alpha1::FlaskRolesSyncMoment, SupersetAuthenticationClassResolved,
-        SupersetClientAuthenticationDetailsResolved, DEFAULT_OIDC_PROVIDER,
+        self, SupersetAuthenticationClassResolved, SupersetClientAuthenticationDetailsResolved,
+        DEFAULT_OIDC_PROVIDER,
     },
     SupersetConfigOptions,
 };
@@ -121,7 +121,8 @@ fn append_authentication_config(
     );
     config.insert(
         SupersetConfigOptions::AuthRolesSyncAtLogin.to_string(),
-        (auth_config.sync_roles_at == FlaskRolesSyncMoment::Login).to_string(),
+        (auth_config.sync_roles_at == authentication::v1alpha1::FlaskRolesSyncMoment::Login)
+            .to_string(),
     );
 
     Ok(())
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
@@ -1,6 +1,5 @@
 use std::collections::BTreeMap;
 
-use authentication::v1alpha1::SupersetClientAuthenticationDetails;
 use product_config::flask_app_config_writer::{FlaskAppConfigOptions, PythonType};
 use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt, Snafu};
@@ -32,8 +31,6 @@ use stackable_operator::{
 use stackable_versioned::versioned;
 use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
 
-use crate::crd::affinity::get_affinity;
-
 pub mod affinity;
 pub mod authentication;
 pub mod druidconnection;
@@ -130,7 +127,7 @@ pub mod versioned {
     pub struct SupersetClusterConfig {
         /// List of AuthenticationClasses used to authenticate users.
         #[serde(default)]
-        pub authentication: Vec<SupersetClientAuthenticationDetails>,
+        pub authentication: Vec<authentication::v1alpha1::SupersetClientAuthenticationDetails>,
 
         /// The name of the Secret object containing the admin user credentials and database connection details.
         /// Read the
@@ -304,7 +301,7 @@ pub enum SupersetRole {
     Node,
 }
 
-/// A reference to a [`SupersetCluster`]
+/// A reference to a [`v1alpha1::SupersetCluster`]
 #[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SupersetClusterRef {
@@ -396,7 +393,7 @@ impl v1alpha1::SupersetConfig {
                 storage: v1alpha1::SupersetStorageConfigFragment {},
             },
             logging: product_logging::spec::default_logging(),
-            affinity: get_affinity(cluster_name, role),
+            affinity: affinity::get_affinity(cluster_name, role),
             graceful_shutdown_timeout: Some(DEFAULT_NODE_GRACEFUL_SHUTDOWN_TIMEOUT),
             row_limit: None,
             webserver_timeout: None,
diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs
@@ -24,7 +24,7 @@ use stackable_operator::{
 };
 
 use crate::{
-    crd::{druidconnection::v1alpha1::DruidConnection, v1alpha1::SupersetCluster, APP_NAME},
+    crd::{druidconnection, v1alpha1, APP_NAME},
     druid_connection_controller::DRUID_CONNECTION_FULL_CONTROLLER_NAME,
     superset_controller::SUPERSET_FULL_CONTROLLER_NAME,
 };
@@ -59,8 +59,8 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         Command::Crd => {
-            SupersetCluster::print_yaml_schema(built_info::PKG_VERSION)?;
-            DruidConnection::print_yaml_schema(built_info::PKG_VERSION)?;
+            v1alpha1::SupersetCluster::print_yaml_schema(built_info::PKG_VERSION)?;
+            druidconnection::v1alpha1::DruidConnection::print_yaml_schema(built_info::PKG_VERSION)?;
         }
         Command::Run(ProductOperatorRun {
             product_config,
@@ -101,7 +101,7 @@ async fn main() -> anyhow::Result<()> {
                 },
             ));
             let superset_controller = Controller::new(
-                watch_namespace.get_api::<DeserializeGuard<SupersetCluster>>(&client),
+                watch_namespace.get_api::<DeserializeGuard<v1alpha1::SupersetCluster>>(&client),
                 watcher::Config::default(),
             );
             let superset_store_1 = superset_controller.store();
@@ -162,7 +162,10 @@ async fn main() -> anyhow::Result<()> {
                 },
             ));
             let druid_connection_controller = Controller::new(
-                watch_namespace.get_api::<DeserializeGuard<DruidConnection>>(&client),
+                watch_namespace
+                    .get_api::<DeserializeGuard<druidconnection::v1alpha1::DruidConnection>>(
+                        &client,
+                    ),
                 watcher::Config::default(),
             );
             let druid_connection_store_1 = druid_connection_controller.store();
@@ -171,7 +174,7 @@ async fn main() -> anyhow::Result<()> {
             let druid_connection_controller = druid_connection_controller
                 .shutdown_on_signal()
                 .watches(
-                    watch_namespace.get_api::<DeserializeGuard<SupersetCluster>>(&client),
+                    watch_namespace.get_api::<DeserializeGuard<v1alpha1::SupersetCluster>>(&client),
                     watcher::Config::default(),
                     move |superset_cluster| {
                         druid_connection_store_1
@@ -242,7 +245,7 @@ async fn main() -> anyhow::Result<()> {
 }
 
 fn references_authentication_class(
-    superset: &DeserializeGuard<SupersetCluster>,
+    superset: &DeserializeGuard<v1alpha1::SupersetCluster>,
     authentication_class: &DeserializeGuard<AuthenticationClass>,
 ) -> bool {
     let Ok(superset) = &superset.0 else {
@@ -259,8 +262,8 @@ fn references_authentication_class(
 }
 
 fn valid_druid_connection(
-    superset_cluster: &DeserializeGuard<SupersetCluster>,
-    druid_connection: &DeserializeGuard<DruidConnection>,
+    superset_cluster: &DeserializeGuard<v1alpha1::SupersetCluster>,
+    druid_connection: &DeserializeGuard<druidconnection::v1alpha1::DruidConnection>,
 ) -> bool {
     let Ok(druid_connection) = &druid_connection.0 else {
         return false;
@@ -270,7 +273,7 @@ fn valid_druid_connection(
 }
 
 fn valid_druid_connection_namespace(
-    druid_connection: &DeserializeGuard<DruidConnection>,
+    druid_connection: &DeserializeGuard<druidconnection::v1alpha1::DruidConnection>,
     config_map: &DeserializeGuard<ConfigMap>,
 ) -> bool {
     let Ok(druid_connection) = &druid_connection.0 else {
@@ -281,7 +284,7 @@ fn valid_druid_connection_namespace(
 }
 
 fn valid_druid_job(
-    druid_connection: &DeserializeGuard<DruidConnection>,
+    druid_connection: &DeserializeGuard<druidconnection::v1alpha1::DruidConnection>,
     job: &DeserializeGuard<Job>,
 ) -> bool {
     let Ok(druid_connection) = &druid_connection.0 else {
diff --git a/rust/operator-binary/src/operations/graceful_shutdown.rs b/rust/operator-binary/src/operations/graceful_shutdown.rs
@@ -1,7 +1,7 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::builder::pod::PodBuilder;
 
-use crate::crd::v1alpha1::SupersetConfig;
+use crate::crd::v1alpha1;
 
 #[derive(Debug, Snafu)]
 pub enum Error {
@@ -12,7 +12,7 @@ pub enum Error {
 }
 
 pub fn add_graceful_shutdown_config(
-    merged_config: &SupersetConfig,
+    merged_config: &v1alpha1::SupersetConfig,
     pod_builder: &mut PodBuilder,
 ) -> Result<(), Error> {
     // This must be always set by the merge mechanism, as we provide a default value,
diff --git a/rust/operator-binary/src/operations/pdb.rs b/rust/operator-binary/src/operations/pdb.rs
@@ -5,7 +5,7 @@ use stackable_operator::{
 };
 
 use crate::{
-    crd::{v1alpha1::SupersetCluster, SupersetRole, APP_NAME},
+    crd::{v1alpha1, SupersetRole, APP_NAME},
     superset_controller::SUPERSET_CONTROLLER_NAME,
     OPERATOR_NAME,
 };
@@ -26,7 +26,7 @@ pub enum Error {
 
 pub async fn add_pdbs(
     pdb: &PdbConfig,
-    superset: &SupersetCluster,
+    superset: &v1alpha1::SupersetCluster,
     role: &SupersetRole,
     client: &Client,
     cluster_resources: &mut ClusterResources,
