refactor: use ProductVersion in status

Author: maltesander

extra/crds.yaml

@@ -2280,7 +2280,10 @@ spec:
                   type: object
                 type: array
               deployed_version:
+                maxLength: 63
+                minLength: 1
                 nullable: true
+                pattern: ^[a-z0-9A-Z]([a-z0-9A-Z-_.]*[a-z0-9A-Z]+)?$
                 type: string
             type: object
         required:

rust/operator-binary/src/controller/upgrade.rs

@@ -5,6 +5,7 @@ use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     client::Client,
     k8s_openapi::{api::apps::v1::StatefulSet, apimachinery::pkg::apis::meta::v1::LabelSelector},
+    v2::types::operator::ProductVersion,
 };
 
 use super::ValidatedCluster;
@@ -32,15 +33,15 @@ pub enum ClusterVersionUpdateState {
 pub async fn cluster_version_update_state(
     cluster: &ValidatedCluster,
     client: &Client,
-    deployed_version: Option<&String>,
+    deployed_version: Option<&ProductVersion>,
 ) -> Result<ClusterVersionUpdateState> {
     // The version we want to converge to, i.e. the resolved product image version.
     let resolved_version = &cluster.image.product_version;
 
     // Handle full restarts for a version change
     match deployed_version {
         Some(deployed_version) => {
-            if deployed_version != resolved_version {
+            if deployed_version.as_ref() != resolved_version.as_str() {
                 // Check if statefulsets are already scaled to zero, if not - requeue
                 let selector = LabelSelector {
                     match_expressions: None,

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

@@ -39,7 +39,10 @@ use stackable_operator::{
     v2::{
         config_overrides::KeyValueConfigOverrides,
         role_utils::JavaCommonConfig,
-        types::kubernetes::{ConfigMapName, ListenerClassName, SecretClassName},
+        types::{
+            kubernetes::{ConfigMapName, ListenerClassName, SecretClassName},
+            operator::ProductVersion,
+        },
     },
     versioned::versioned,
 };
@@ -292,7 +295,7 @@ pub enum NifiRole {
 
 #[derive(Clone, Debug, Default, Deserialize, JsonSchema, Serialize)]
 pub struct NifiStatus {
-    pub deployed_version: Option<String>,
+    pub deployed_version: Option<ProductVersion>,
     #[serde(default)]
     pub conditions: Vec<ClusterCondition>,
 }

rust/operator-binary/src/nifi_controller.rs

@@ -1,6 +1,6 @@
 //! Ensures that `Pod`s are configured and running for each [`v1alpha1::NifiCluster`].
 
-use std::sync::Arc;
+use std::{str::FromStr, sync::Arc};
 
 use const_format::concatcp;
 use snafu::{OptionExt, ResultExt, Snafu};
@@ -21,7 +21,10 @@ use stackable_operator::{
         compute_conditions, operations::ClusterOperationsConditionBuilder,
         statefulset::StatefulSetConditionBuilder,
     },
-    v2::{cluster_resources::cluster_resources_new, types::operator::RoleGroupName},
+    v2::{
+        cluster_resources::cluster_resources_new,
+        types::operator::{ProductVersion, RoleGroupName},
+    },
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
 use tracing::Instrument;
@@ -221,7 +224,7 @@ pub async fn reconcile_nifi(
         .as_ref()
         .and_then(|status| status.deployed_version.as_ref());
     let rolling_upgrade_supported = resolved_product_image.product_version.starts_with("2.")
-        && deployed_version.is_some_and(|v| v.starts_with("2."));
+        && deployed_version.is_some_and(|v| v.as_ref().starts_with("2."));
 
     if !rolling_upgrade_supported {
         cluster_version_update_state =
@@ -429,7 +432,10 @@ pub async fn reconcile_nifi(
     // we are still in the process of updating
     let status = if cluster_version_update_state != ClusterVersionUpdateState::UpdateRequested {
         NifiStatus {
-            deployed_version: Some(resolved_product_image.product_version.clone()),
+            deployed_version: Some(
+                ProductVersion::from_str(&resolved_product_image.product_version)
+                    .expect("the resolved product version is a valid product version label value"),
+            ),
             conditions,
         }
     } else {