bump stackable-versioned, refactor imports and version references

xeniape · xeniape · commit a5cc9fb7bddc · 2025-02-17T15:01:50.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" }
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
diff --git a/crate-hashes.json b/crate-hashes.json
diff --git a/deploy/helm/zookeeper-operator/crds/crds.yaml b/deploy/helm/zookeeper-operator/crds/crds.yaml
@@ -789,6 +789,7 @@ spec:
     kind: ZookeeperZnode
     plural: zookeeperznodes
     shortNames:
+      - zno
       - znode
     singular: zookeeperznode
   scope: Namespaced
diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs
@@ -37,7 +37,7 @@ mod tests {
         role_utils::RoleGroupRef,
     };
 
-    use crate::crd::{affinity::ZookeeperRole, v1alpha1::ZookeeperCluster};
+    use crate::crd::{affinity::ZookeeperRole, v1alpha1};
 
     #[test]
     fn test_affinity_defaults() {
@@ -60,7 +60,8 @@ mod tests {
               default:
                 replicas: 3
         "#;
-        let zk: ZookeeperCluster = serde_yaml::from_str(input).expect("illegal test input");
+        let zk: v1alpha1::ZookeeperCluster =
+            serde_yaml::from_str(input).expect("illegal test input");
 
         let rolegroup_ref = RoleGroupRef {
             cluster: ObjectRef::from_obj(&zk),
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
@@ -36,10 +36,7 @@ use stackable_operator::{
 use stackable_versioned::versioned;
 use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
 
-use crate::crd::{
-    affinity::get_affinity, authentication::v1alpha1::ZookeeperAuthentication,
-    tls::v1alpha1::ZookeeperTls,
-};
+use crate::crd::affinity::get_affinity;
 
 pub mod affinity;
 pub mod authentication;
@@ -161,7 +158,7 @@ pub mod versioned {
         /// Authentication settings for ZooKeeper like mTLS authentication.
         /// Read more in the [authentication usage guide](DOCS_BASE_URL_PLACEHOLDER/zookeeper/usage_guide/authentication).
         #[serde(default)]
-        pub authentication: Vec<ZookeeperAuthentication>,
+        pub authentication: Vec<authentication::v1alpha1::ZookeeperAuthentication>,
 
         /// Name of the Vector aggregator [discovery ConfigMap](DOCS_BASE_URL_PLACEHOLDER/concepts/service_discovery).
         /// It must contain the key `ADDRESS` with the address of the Vector aggregator.
@@ -176,7 +173,7 @@ pub mod versioned {
             default = "tls::default_zookeeper_tls",
             skip_serializing_if = "Option::is_none"
         )]
-        pub tls: Option<ZookeeperTls>,
+        pub tls: Option<tls::v1alpha1::ZookeeperTls>,
 
         /// This field controls which type of Service the Operator creates for this ZookeeperCluster:
         ///
@@ -306,9 +303,7 @@ pub mod versioned {
         group = "zookeeper.stackable.tech",
         kind = "ZookeeperZnode",
         plural = "zookeeperznodes",
-        // TODO: stackable-versioned currently only supports a single shortname.
-        // Leaving this one commented for now.
-        // shortname = "zno",
+        shortname = "zno",
         shortname = "znode",
         status = "ZookeeperZnodeStatus",
         namespaced,
diff --git a/rust/operator-binary/src/crd/security.rs b/rust/operator-binary/src/crd/security.rs
@@ -25,9 +25,7 @@ use stackable_operator::{
     time::Duration,
 };
 
-use crate::crd::{
-    authentication, authentication::ResolvedAuthenticationClasses, tls, v1alpha1::ZookeeperCluster,
-};
+use crate::crd::{authentication, authentication::ResolvedAuthenticationClasses, tls, v1alpha1};
 
 type Result<T, E = Error> = std::result::Result<T, E>;
 
@@ -95,7 +93,7 @@ impl ZookeeperSecurity {
     /// all provided `AuthenticationClass` references.
     pub async fn new_from_zookeeper_cluster(
         client: &Client,
-        zk: &ZookeeperCluster,
+        zk: &v1alpha1::ZookeeperCluster,
     ) -> Result<Self, Error> {
         Ok(ZookeeperSecurity {
             resolved_authentication_classes: authentication::resolve_authentication_classes(
diff --git a/rust/operator-binary/src/discovery.rs b/rust/operator-binary/src/discovery.rs
@@ -10,7 +10,7 @@ use stackable_operator::{
 };
 
 use crate::{
-    crd::{security::ZookeeperSecurity, v1alpha1::ZookeeperCluster, ZookeeperRole},
+    crd::{security::ZookeeperSecurity, v1alpha1, ZookeeperRole},
     utils::build_recommended_labels,
 };
 
@@ -21,7 +21,7 @@ pub enum Error {
     #[snafu(display("object {} is missing metadata to build owner reference", zk))]
     ObjectMissingMetadataForOwnerRef {
         source: stackable_operator::builder::meta::Error,
-        zk: ObjectRef<ZookeeperCluster>,
+        zk: ObjectRef<v1alpha1::ZookeeperCluster>,
     },
 
     #[snafu(display("chroot path {} was relative (must be absolute)", chroot))]
@@ -65,7 +65,7 @@ pub enum Error {
 /// Builds discovery [`ConfigMap`]s for connecting to a [`crate::crd::v1alpha1::ZookeeperCluster`] for all expected scenarios
 #[allow(clippy::too_many_arguments)]
 pub async fn build_discovery_configmaps(
-    zk: &ZookeeperCluster,
+    zk: &v1alpha1::ZookeeperCluster,
     owner: &impl Resource<DynamicType = ()>,
     client: &stackable_operator::client::Client,
     controller_name: &str,
@@ -112,7 +112,7 @@ pub async fn build_discovery_configmaps(
 /// `hosts` will usually come from either [`pod_hosts`] or [`nodeport_hosts`].
 #[allow(clippy::too_many_arguments)]
 fn build_discovery_configmap(
-    zk: &ZookeeperCluster,
+    zk: &v1alpha1::ZookeeperCluster,
     owner: &impl Resource<DynamicType = ()>,
     zookeeper_security: &ZookeeperSecurity,
     name: &str,
@@ -170,7 +170,7 @@ fn build_discovery_configmap(
 
 /// Lists all Pods FQDNs expected to host the [`crate::crd::v1alpha1::ZookeeperCluster`]
 fn pod_hosts<'a>(
-    zk: &'a ZookeeperCluster,
+    zk: &'a v1alpha1::ZookeeperCluster,
     zookeeper_security: &'a ZookeeperSecurity,
     cluster_info: &'a KubernetesClusterInfo,
 ) -> Result<impl IntoIterator<Item = (String, u16)> + 'a> {
diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs
@@ -1,10 +1,7 @@
 use std::sync::Arc;
 
 use clap::{crate_description, crate_version, Parser};
-use crd::{
-    v1alpha1::{ZookeeperCluster, ZookeeperZnode},
-    APP_NAME, OPERATOR_NAME,
-};
+use crd::{v1alpha1, APP_NAME, OPERATOR_NAME};
 use futures::{pin_mut, StreamExt};
 use stackable_operator::{
     cli::{Command, ProductOperatorRun},
@@ -54,8 +51,8 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         Command::Crd => {
-            ZookeeperCluster::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
-            ZookeeperZnode::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
+            v1alpha1::ZookeeperCluster::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
+            v1alpha1::ZookeeperZnode::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
         }
         Command::Run(ProductOperatorRun {
             product_config,
@@ -87,7 +84,7 @@ async fn main() -> anyhow::Result<()> {
             .await?;
 
             let zk_controller = Controller::new(
-                watch_namespace.get_api::<DeserializeGuard<ZookeeperCluster>>(&client),
+                watch_namespace.get_api::<DeserializeGuard<v1alpha1::ZookeeperCluster>>(&client),
                 watcher::Config::default(),
             );
 
@@ -158,7 +155,7 @@ async fn main() -> anyhow::Result<()> {
                 );
 
             let znode_controller = Controller::new(
-                watch_namespace.get_api::<DeserializeGuard<ZookeeperZnode>>(&client),
+                watch_namespace.get_api::<DeserializeGuard<v1alpha1::ZookeeperZnode>>(&client),
                 watcher::Config::default(),
             );
             let znode_event_recorder = Arc::new(Recorder::new(
@@ -176,7 +173,8 @@ async fn main() -> anyhow::Result<()> {
                     watcher::Config::default(),
                 )
                 .watches(
-                    watch_namespace.get_api::<DeserializeGuard<ZookeeperCluster>>(&client),
+                    watch_namespace
+                        .get_api::<DeserializeGuard<v1alpha1::ZookeeperCluster>>(&client),
                     watcher::Config::default(),
                     move |zk| {
                         znode_store
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::ZookeeperConfig;
+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: &ZookeeperConfig,
+    merged_config: &v1alpha1::ZookeeperConfig,
     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::ZookeeperCluster, ZookeeperRole, APP_NAME, OPERATOR_NAME},
+    crd::{v1alpha1, ZookeeperRole, APP_NAME, OPERATOR_NAME},
     zk_controller::ZK_CONTROLLER_NAME,
 };
 
@@ -25,7 +25,7 @@ pub enum Error {
 
 pub async fn add_pdbs(
     pdb: &PdbConfig,
-    zookeeper: &ZookeeperCluster,
+    zookeeper: &v1alpha1::ZookeeperCluster,
     role: &ZookeeperRole,
     client: &Client,
     cluster_resources: &mut ClusterResources,
diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs
@@ -13,9 +13,8 @@ use stackable_operator::{
 };
 
 use crate::crd::{
-    v1alpha1::{Container, ZookeeperCluster},
-    LoggingFramework, ZookeeperRole, LOG4J_CONFIG_FILE, LOGBACK_CONFIG_FILE, MAX_ZK_LOG_FILES_SIZE,
-    STACKABLE_LOG_DIR, ZOOKEEPER_LOG_FILE,
+    v1alpha1, LoggingFramework, ZookeeperRole, LOG4J_CONFIG_FILE, LOGBACK_CONFIG_FILE,
+    MAX_ZK_LOG_FILES_SIZE, STACKABLE_LOG_DIR, ZOOKEEPER_LOG_FILE,
 };
 
 #[derive(Snafu, Debug)]
@@ -50,7 +49,7 @@ const CONSOLE_CONVERSION_PATTERN: &str = "%d{ISO8601} [myid:%X{myid}] - %-5p [%t
 /// Return the address of the Vector aggregator if the corresponding ConfigMap name is given in the
 /// cluster spec
 pub async fn resolve_vector_aggregator_address(
-    zk: &ZookeeperCluster,
+    zk: &v1alpha1::ZookeeperCluster,
     client: &Client,
 ) -> Result<Option<String>> {
     let vector_aggregator_address = if let Some(vector_aggregator_config_map_name) = &zk
@@ -86,9 +85,9 @@ pub async fn resolve_vector_aggregator_address(
 
 /// Extend the role group ConfigMap with logging and Vector configurations
 pub fn extend_role_group_config_map(
-    zk: &ZookeeperCluster,
+    zk: &v1alpha1::ZookeeperCluster,
     role: ZookeeperRole,
-    rolegroup: &RoleGroupRef<ZookeeperCluster>,
+    rolegroup: &RoleGroupRef<v1alpha1::ZookeeperCluster>,
     vector_aggregator_address: Option<&str>,
     cm_builder: &mut ConfigMapBuilder,
 ) -> Result<()> {
@@ -98,7 +97,7 @@ pub fn extend_role_group_config_map(
 
     if let Some(ContainerLogConfig {
         choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
-    }) = logging.containers.get(&Container::Zookeeper)
+    }) = logging.containers.get(&v1alpha1::Container::Zookeeper)
     {
         match zk.logging_framework() {
             LoggingFramework::LOG4J => {
@@ -137,7 +136,7 @@ pub fn extend_role_group_config_map(
 
     let vector_log_config = if let Some(ContainerLogConfig {
         choice: Some(ContainerLogConfigChoice::Automatic(log_config)),
-    }) = logging.containers.get(&Container::Vector)
+    }) = logging.containers.get(&v1alpha1::Container::Vector)
     {
         Some(log_config)
     } else {
diff --git a/rust/operator-binary/src/zk_controller.rs b/rust/operator-binary/src/zk_controller.rs
diff --git a/rust/operator-binary/src/znode_controller.rs b/rust/operator-binary/src/znode_controller.rs
