chore: Version SparkHistoryServer

Author: Techassi

deploy/helm/spark-k8s-operator/crds/crds.yaml

@@ -998,7 +998,7 @@ spec:
     kind: SparkHistoryServer
     plural: sparkhistoryservers
     shortNames:
-      - shs
+      - sparkhist
     singular: sparkhistoryserver
   scope: Namespaced
   versions:

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

@@ -36,7 +36,7 @@ mod test {
         role_utils::RoleGroupRef,
     };
 
-    use crate::crd::{constants::HISTORY_ROLE_NAME, history::SparkHistoryServer};
+    use crate::crd::{constants::HISTORY_ROLE_NAME, history::v1alpha1};
 
     #[test]
     pub fn test_history_affinity_defaults() {
@@ -62,7 +62,7 @@ mod test {
         "#;
 
         let deserializer = serde_yaml::Deserializer::from_str(input);
-        let history: SparkHistoryServer =
+        let history: v1alpha1::SparkHistoryServer =
             serde_yaml::with::singleton_map_recursive::deserialize(deserializer).unwrap();
         let expected: StackableAffinity = StackableAffinity {
             node_affinity: None,

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

@@ -28,6 +28,7 @@ use stackable_operator::{
     schemars::{self, JsonSchema},
     time::Duration,
 };
+use stackable_versioned::versioned;
 use strum::{Display, EnumIter};
 
 use crate::crd::{affinity::history_affinity, constants::*, logdir::ResolvedLogDir};
@@ -51,19 +52,21 @@ pub enum Error {
 /// A Spark cluster history server component. This resource is managed by the Stackable operator
 /// for Apache Spark. Find more information on how to use it in the
 /// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/spark-k8s/usage-guide/history-server).
-#[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, Serialize)]
-#[kube(
-    group = "spark.stackable.tech",
-    version = "v1alpha1",
-    kind = "SparkHistoryServer",
-    shortname = "shs",
-    namespaced,
-    crates(
-        kube_core = "stackable_operator::kube::core",
-        k8s_openapi = "stackable_operator::k8s_openapi",
-        schemars = "stackable_operator::schemars"
+#[versioned(
+    version(name = "v1alpha1"),
+    k8s(
+        group = "spark.stackable.tech",
+        kind = "SparkHistoryServer",
+        shortname = "sparkhist",
+        namespaced,
+        crates(
+            kube_core = "stackable_operator::kube::core",
+            k8s_openapi = "stackable_operator::k8s_openapi",
+            schemars = "stackable_operator::schemars"
+        )
     )
 )]
+#[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SparkHistoryServerSpec {
     pub image: ProductImage,
@@ -129,7 +132,7 @@ impl CurrentlySupportedListenerClasses {
     }
 }
 
-impl SparkHistoryServer {
+impl v1alpha1::SparkHistoryServer {
     /// Returns a reference to the role. Raises an error if the role is not defined.
     pub fn role(&self) -> &Role<HistoryConfigFragment> {
         &self.spec.nodes
@@ -138,7 +141,7 @@ impl SparkHistoryServer {
     /// Returns a reference to the role group. Raises an error if the role or role group are not defined.
     pub fn rolegroup(
         &self,
-        rolegroup_ref: &RoleGroupRef<SparkHistoryServer>,
+        rolegroup_ref: &RoleGroupRef<Self>,
     ) -> Result<RoleGroup<HistoryConfigFragment, GenericProductSpecificCommonConfig>, Error> {
         self.spec
             .nodes
@@ -152,7 +155,7 @@ impl SparkHistoryServer {
 
     pub fn merged_config(
         &self,
-        rolegroup_ref: &RoleGroupRef<SparkHistoryServer>,
+        rolegroup_ref: &RoleGroupRef<Self>,
     ) -> Result<HistoryConfig, Error> {
         // Initialize the result with all default values as baseline
         let conf_defaults = HistoryConfig::default_config(&self.name_any());
@@ -184,7 +187,7 @@ impl SparkHistoryServer {
             .map(i32::from)
     }
 
-    pub fn cleaner_rolegroups(&self) -> Vec<RoleGroupRef<SparkHistoryServer>> {
+    pub fn cleaner_rolegroups(&self) -> Vec<RoleGroupRef<Self>> {
         let mut rgs = vec![];
         for (rg_name, rg_config) in &self.spec.nodes.role_groups {
             if let Some(true) = rg_config.config.config.cleaner {
@@ -444,7 +447,7 @@ impl HistoryConfig {
 }
 
 impl Configuration for HistoryConfigFragment {
-    type Configurable = SparkHistoryServer;
+    type Configurable = v1alpha1::SparkHistoryServer;
 
     fn compute_env(
         &self,
@@ -515,7 +518,7 @@ mod test {
         "#};
 
         let deserializer = serde_yaml::Deserializer::from_str(input);
-        let history: SparkHistoryServer =
+        let history: v1alpha1::SparkHistoryServer =
             serde_yaml::with::singleton_map_recursive::deserialize(deserializer).unwrap();
 
         let log_dir = ResolvedLogDir::S3(S3LogDir {

rust/operator-binary/src/history/history_controller.rs

@@ -57,8 +57,7 @@ use crate::{
             VOLUME_MOUNT_NAME_CONFIG, VOLUME_MOUNT_NAME_LOG, VOLUME_MOUNT_NAME_LOG_CONFIG,
             VOLUME_MOUNT_PATH_CONFIG, VOLUME_MOUNT_PATH_LOG, VOLUME_MOUNT_PATH_LOG_CONFIG,
         },
-        history,
-        history::{HistoryConfig, SparkHistoryServer, SparkHistoryServerContainer},
+        history::{self, v1alpha1, HistoryConfig, SparkHistoryServerContainer},
         logdir::ResolvedLogDir,
         tlscerts, to_spark_env_sh_string,
     },
@@ -214,7 +213,7 @@ impl ReconcilerError for Error {
 }
 /// Updates the status of the SparkApplication that started the pod.
 pub async fn reconcile(
-    shs: Arc<DeserializeGuard<SparkHistoryServer>>,
+    shs: Arc<DeserializeGuard<v1alpha1::SparkHistoryServer>>,
     ctx: Arc<Ctx>,
 ) -> Result<Action> {
     tracing::info!("Starting reconcile history server");
@@ -357,7 +356,7 @@ pub async fn reconcile(
 }
 
 pub fn error_policy(
-    _obj: Arc<DeserializeGuard<SparkHistoryServer>>,
+    _obj: Arc<DeserializeGuard<v1alpha1::SparkHistoryServer>>,
     error: &Error,
     _ctx: Arc<Ctx>,
 ) -> Action {
@@ -369,11 +368,11 @@ pub fn error_policy(
 
 #[allow(clippy::result_large_err)]
 fn build_config_map(
-    shs: &SparkHistoryServer,
+    shs: &v1alpha1::SparkHistoryServer,
     config: &HashMap<PropertyNameKind, BTreeMap<String, String>>,
     merged_config: &HistoryConfig,
     app_version_label: &str,
-    rolegroupref: &RoleGroupRef<SparkHistoryServer>,
+    rolegroupref: &RoleGroupRef<v1alpha1::SparkHistoryServer>,
     log_dir: &ResolvedLogDir,
     vector_aggregator_address: Option<&str>,
 ) -> Result<ConfigMap, Error> {
@@ -441,9 +440,9 @@ fn build_config_map(
 
 #[allow(clippy::result_large_err)]
 fn build_stateful_set(
-    shs: &SparkHistoryServer,
+    shs: &v1alpha1::SparkHistoryServer,
     resolved_product_image: &ResolvedProductImage,
-    rolegroupref: &RoleGroupRef<SparkHistoryServer>,
+    rolegroupref: &RoleGroupRef<v1alpha1::SparkHistoryServer>,
     log_dir: &ResolvedLogDir,
     merged_config: &HistoryConfig,
     serviceaccount: &ServiceAccount,
@@ -609,10 +608,10 @@ fn build_stateful_set(
 
 #[allow(clippy::result_large_err)]
 fn build_service(
-    shs: &SparkHistoryServer,
+    shs: &v1alpha1::SparkHistoryServer,
     app_version_label: &str,
     role: &str,
-    group: Option<&RoleGroupRef<SparkHistoryServer>>,
+    group: Option<&RoleGroupRef<v1alpha1::SparkHistoryServer>>,
 ) -> Result<Service, Error> {
     let group_name = match group {
         Some(rgr) => rgr.role_group.clone(),
@@ -677,7 +676,7 @@ fn build_service(
 // See: https://github.com/stackabletech/spark-k8s-operator/issues/499
 #[allow(clippy::result_large_err)]
 fn build_history_role_serviceaccount(
-    shs: &SparkHistoryServer,
+    shs: &v1alpha1::SparkHistoryServer,
     app_version_label: &str,
 ) -> Result<(ServiceAccount, RoleBinding)> {
     let sa = ServiceAccount {
@@ -718,9 +717,9 @@ fn build_history_role_serviceaccount(
 
 #[allow(clippy::result_large_err)]
 fn spark_defaults(
-    shs: &SparkHistoryServer,
+    shs: &v1alpha1::SparkHistoryServer,
     log_dir: &ResolvedLogDir,
-    rolegroupref: &RoleGroupRef<SparkHistoryServer>,
+    rolegroupref: &RoleGroupRef<v1alpha1::SparkHistoryServer>,
 ) -> Result<String, Error> {
     let mut log_dir_settings = log_dir.history_server_spark_config().context(LogDirSnafu)?;
 
@@ -782,8 +781,8 @@ fn labels<'a, T>(
 /// group should have a replica count of 0 or 1.
 #[allow(clippy::result_large_err)]
 fn cleaner_config(
-    shs: &SparkHistoryServer,
-    rolegroup_ref: &RoleGroupRef<SparkHistoryServer>,
+    shs: &v1alpha1::SparkHistoryServer,
+    rolegroup_ref: &RoleGroupRef<v1alpha1::SparkHistoryServer>,
 ) -> Result<BTreeMap<String, String>, Error> {
     let mut result = BTreeMap::new();
 

rust/operator-binary/src/history/operations/pdb.rs

@@ -6,7 +6,7 @@ use stackable_operator::{
 
 use crate::crd::{
     constants::{APP_NAME, HISTORY_CONTROLLER_NAME, HISTORY_ROLE_NAME, OPERATOR_NAME},
-    history::SparkHistoryServer,
+    history::v1alpha1,
 };
 
 #[derive(Snafu, Debug)]
@@ -25,7 +25,7 @@ pub enum Error {
 
 pub async fn add_pdbs(
     pdb: &PdbConfig,
-    history: &SparkHistoryServer,
+    history: &v1alpha1::SparkHistoryServer,
     client: &Client,
     cluster_resources: &mut ClusterResources,
 ) -> Result<(), Error> {

rust/operator-binary/src/main.rs

@@ -30,7 +30,7 @@ use crate::crd::{
         SPARK_CONTROLLER_NAME, SPARK_FULL_CONTROLLER_NAME,
     },
     history::SparkHistoryServer,
-    v1alpha1, SparkApplication,
+    SparkApplication,
 };
 
 mod crd;
@@ -66,7 +66,8 @@ async fn main() -> anyhow::Result<()> {
         Command::Crd => {
             SparkApplication::merged_crd(SparkApplication::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
-            // SparkHistoryServer::print_yaml_schema(built_info::PKG_VERSION)?;
+            SparkHistoryServer::merged_crd(SparkHistoryServer::V1Alpha1)?
+                .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
         }
         Command::Run(ProductOperatorRun {
             product_config,
@@ -106,7 +107,8 @@ async fn main() -> anyhow::Result<()> {
                 },
             ));
             let app_controller = Controller::new(
-                watch_namespace.get_api::<DeserializeGuard<v1alpha1::SparkApplication>>(&client),
+                watch_namespace
+                    .get_api::<DeserializeGuard<crd::v1alpha1::SparkApplication>>(&client),
                 watcher::Config::default(),
             )
             .owns(
@@ -192,11 +194,17 @@ async fn main() -> anyhow::Result<()> {
                 },
             ));
             let history_controller = Controller::new(
-                watch_namespace.get_api::<DeserializeGuard<SparkHistoryServer>>(&client),
+                watch_namespace
+                    .get_api::<DeserializeGuard<crd::history::v1alpha1::SparkHistoryServer>>(
+                        &client,
+                    ),
                 watcher::Config::default(),
             )
             .owns(
-                watch_namespace.get_api::<DeserializeGuard<SparkHistoryServer>>(&client),
+                watch_namespace
+                    .get_api::<DeserializeGuard<crd::history::v1alpha1::SparkHistoryServer>>(
+                        &client,
+                    ),
                 watcher::Config::default(),
             )
             .owns(