adjust version references, remove redundant code

Author: xeniape

rust/operator-binary/src/crd/affinity.rs

@@ -32,7 +32,7 @@ mod tests {
     };
 
     use super::*;
-    use crate::crd::v1alpha1::SupersetCluster;
+    use crate::crd::v1alpha1;
 
     #[test]
     fn test_affinity_defaults() {
@@ -51,7 +51,8 @@ mod tests {
               default:
                 replicas: 1
         "#;
-        let superset: SupersetCluster = serde_yaml::from_str(input).expect("illegal test input");
+        let superset: v1alpha1::SupersetCluster =
+            serde_yaml::from_str(input).expect("illegal test input");
         let merged_config = superset
             .merged_config(&SupersetRole::Node, &superset.node_rolegroup_ref("default"))
             .unwrap();

rust/operator-binary/src/crd/authentication.rs

@@ -110,7 +110,7 @@ pub mod versioned {
         /// If we should replace ALL the user's roles each login, or only on registration.
         /// Gets mapped to `AUTH_ROLES_SYNC_AT_LOGIN`
         #[serde(default)]
-        pub sync_roles_at: FlaskRolesSyncMoment,
+        pub sync_roles_at: v1alpha1::FlaskRolesSyncMoment,
     }
 
     #[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]

rust/operator-binary/src/crd/druidconnection.rs

@@ -22,7 +22,6 @@ pub mod versioned {
     #[derive(Clone, CustomResource, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
     #[versioned(k8s(
         group = "superset.stackable.tech",
-        kind = "DruidConnection",
         plural = "druidconnections",
         status = "DruidConnectionStatus",
         namespaced,
@@ -35,9 +34,9 @@ pub mod versioned {
     #[serde(rename_all = "camelCase")]
     pub struct DruidConnectionSpec {
         /// The Superset to connect.
-        pub superset: ClusterRef,
+        pub superset: v1alpha1::ClusterRef,
         /// The Druid to connect.
-        pub druid: ClusterRef,
+        pub druid: v1alpha1::ClusterRef,
     }
 
     #[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
@@ -54,7 +53,7 @@ pub mod versioned {
     pub struct DruidConnectionStatus {
         #[serde(skip_serializing_if = "Option::is_none")]
         pub started_at: Option<Time>,
-        pub condition: DruidConnectionStatusCondition,
+        pub condition: v1alpha1::DruidConnectionStatusCondition,
     }
 
     #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, JsonSchema, PartialEq, Serialize)]

rust/operator-binary/src/crd/mod.rs

@@ -97,7 +97,6 @@ pub mod versioned {
     #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
     #[versioned(k8s(
         group = "superset.stackable.tech",
-        kind = "SupersetCluster",
         plural = "supersetclusters",
         shortname = "superset",
         status = "SupersetClusterStatus",
@@ -115,11 +114,11 @@ pub mod versioned {
 
         /// Settings that affect all roles and role groups.
         /// The settings in the `clusterConfig` are cluster wide settings that do not need to be configurable at role or role group level.
-        pub cluster_config: SupersetClusterConfig,
+        pub cluster_config: v1alpha1::SupersetClusterConfig,
 
         // no doc - docs in the struct.
         #[serde(default, skip_serializing_if = "Option::is_none")]
-        pub nodes: Option<Role<SupersetConfigFragment>>,
+        pub nodes: Option<Role<v1alpha1::SupersetConfigFragment>>,
     }
 
     #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
@@ -151,7 +150,7 @@ pub mod versioned {
         /// In the future, this setting will control which [ListenerClass](DOCS_BASE_URL_PLACEHOLDER/listener-operator/listenerclass.html)
         /// will be used to expose the service, and ListenerClass names will stay the same, allowing for a non-breaking change.
         #[serde(default)]
-        pub listener_class: CurrentlySupportedListenerClasses,
+        pub listener_class: v1alpha1::CurrentlySupportedListenerClasses,
 
         /// The name of a Secret object.
         /// The Secret should contain a key `connections.mapboxApiKey`.
@@ -195,10 +194,10 @@ pub mod versioned {
 
         /// CPU and memory limits for Superset pods
         #[fragment_attrs(serde(default))]
-        pub resources: Resources<SupersetStorageConfig, NoRuntimeLimits>,
+        pub resources: Resources<v1alpha1::SupersetStorageConfig, NoRuntimeLimits>,
 
         #[fragment_attrs(serde(default))]
-        pub logging: Logging<Container>,
+        pub logging: Logging<v1alpha1::Container>,
 
         #[fragment_attrs(serde(default))]
         pub affinity: StackableAffinity,

rust/operator-binary/src/druid_connection_controller.rs

@@ -25,13 +25,7 @@ use stackable_operator::{
 use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
-    crd::{
-        druidconnection::v1alpha1::{
-            DruidConnection, DruidConnectionStatus, DruidConnectionStatusCondition,
-        },
-        v1alpha1::SupersetCluster,
-        PYTHONPATH, SUPERSET_CONFIG_FILENAME,
-    },
+    crd::{druidconnection, v1alpha1, PYTHONPATH, SUPERSET_CONFIG_FILENAME},
     rbac,
     superset_controller::DOCKER_IMAGE_BASE_NAME,
     util::{get_job_state, JobState},
@@ -81,7 +75,7 @@ pub enum Error {
     #[snafu(display("namespace missing on DruidConnection {druid_connection}"))]
     DruidConnectionNoNamespace {
         source: crate::crd::druidconnection::Error,
-        druid_connection: ObjectRef<DruidConnection>,
+        druid_connection: ObjectRef<druidconnection::v1alpha1::DruidConnection>,
     },
     #[snafu(display("failed to patch service account"))]
     ApplyServiceAccount {
@@ -132,7 +126,7 @@ impl ReconcilerError for Error {
 }
 
 pub async fn reconcile_druid_connection(
-    druid_connection: Arc<DeserializeGuard<DruidConnection>>,
+    druid_connection: Arc<DeserializeGuard<druidconnection::v1alpha1::DruidConnection>>,
     ctx: Arc<Ctx>,
 ) -> Result<Action> {
     tracing::info!("Starting reconciling DruidConnections");
@@ -160,7 +154,7 @@ pub async fn reconcile_druid_connection(
 
     if let Some(ref s) = druid_connection.status {
         match s.condition {
-            DruidConnectionStatusCondition::Pending => {
+            druidconnection::v1alpha1::DruidConnectionStatusCondition::Pending => {
                 // Is the referenced druid discovery configmap there?
                 let druid_discovery_cm_exists = client
                     .get_opt::<ConfigMap>(
@@ -176,7 +170,7 @@ pub async fn reconcile_druid_connection(
                     .is_some();
 
                 let superset_cluster = client
-                    .get::<SupersetCluster>(
+                    .get::<v1alpha1::SupersetCluster>(
                         &druid_connection.superset_name(),
                         &druid_connection.superset_namespace().context(
                             DruidConnectionNoNamespaceSnafu {
@@ -237,7 +231,7 @@ pub async fn reconcile_druid_connection(
                         .context(ApplyStatusSnafu)?;
                 }
             }
-            DruidConnectionStatusCondition::Importing => {
+            druidconnection::v1alpha1::DruidConnectionStatusCondition::Importing => {
                 let ns = druid_connection
                     .namespace()
                     .unwrap_or_else(|| "default".to_string());
@@ -262,16 +256,16 @@ pub async fn reconcile_druid_connection(
                         .context(ApplyStatusSnafu)?;
                 }
             }
-            DruidConnectionStatusCondition::Ready => (),
-            DruidConnectionStatusCondition::Failed => (),
+            druidconnection::v1alpha1::DruidConnectionStatusCondition::Ready => (),
+            druidconnection::v1alpha1::DruidConnectionStatusCondition::Failed => (),
         }
     } else {
         // Status not set yet, initialize
         client
             .apply_patch_status(
                 DRUID_CONNECTION_CONTROLLER_NAME,
                 druid_connection,
-                &DruidConnectionStatus::new(),
+                &druidconnection::v1alpha1::DruidConnectionStatus::new(),
             )
             .await
             .context(ApplyStatusSnafu)?;
@@ -306,8 +300,8 @@ fn build_druid_db_yaml(druid_cluster_name: &str, sqlalchemy_str: &str) -> Result
 
 /// Builds the import job.  When run it will import the druid connection into the database.
 async fn build_import_job(
-    superset_cluster: &SupersetCluster,
-    druid_connection: &DruidConnection,
+    superset_cluster: &v1alpha1::SupersetCluster,
+    druid_connection: &druidconnection::v1alpha1::DruidConnection,
     resolved_product_image: &ResolvedProductImage,
     sqlalchemy_str: &str,
     sa_name: &str,
@@ -378,7 +372,7 @@ async fn build_import_job(
 }
 
 pub fn error_policy(
-    _obj: Arc<DeserializeGuard<DruidConnection>>,
+    _obj: Arc<DeserializeGuard<druidconnection::v1alpha1::DruidConnection>>,
     error: &Error,
     _ctx: Arc<Ctx>,
 ) -> Action {

rust/operator-binary/src/main.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use clap::{crate_description, crate_version, Parser};
+use crd::druidconnection::DruidConnection;
 use futures::{pin_mut, StreamExt};
 use stackable_operator::{
     cli::{Command, ProductOperatorRun},
@@ -20,11 +21,12 @@ use stackable_operator::{
         ResourceExt,
     },
     logging::controller::report_controller_reconciled,
-    CustomResourceExt,
+    shared::yaml::SerializeOptions,
+    YamlSchema,
 };
 
 use crate::{
-    crd::{druidconnection, v1alpha1, APP_NAME},
+    crd::{druidconnection, v1alpha1, SupersetCluster, APP_NAME},
     druid_connection_controller::DRUID_CONNECTION_FULL_CONTROLLER_NAME,
     superset_controller::SUPERSET_FULL_CONTROLLER_NAME,
 };
@@ -59,8 +61,10 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         Command::Crd => {
-            v1alpha1::SupersetCluster::print_yaml_schema(built_info::PKG_VERSION)?;
-            druidconnection::v1alpha1::DruidConnection::print_yaml_schema(built_info::PKG_VERSION)?;
+            SupersetCluster::merged_crd(SupersetCluster::V1Alpha1)?
+                .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
+            DruidConnection::merged_crd(DruidConnection::V1Alpha1)?
+                .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
         }
         Command::Run(ProductOperatorRun {
             product_config,