replace parameter with compile-time value; rename function

Author: adwk67

rust/operator-binary/src/controller.rs

@@ -330,7 +330,7 @@ impl ReconcilerError for Error {
 /// succeeded for every role and role group before any resources are created.
 /// Placed in the controller so that subsequent steps that reference this struct
 /// only depend on the controller.
-pub struct ValidatedHiveCluster {
+pub struct ValidatedCluster {
     pub image: ResolvedProductImage,
     pub role_groups: BTreeMap<String, ValidatedRoleGroupConfig>,
     pub role_config: Option<ValidatedRoleConfig>,
@@ -357,7 +357,6 @@ pub async fn reconcile_hive(
     let validated = validate::validate_cluster(
         hive,
         &ctx.operator_environment.image_repository,
-        crate::built_info::PKG_VERSION,
         &ctx.product_config,
     )
     .context(ValidateSnafu)?;

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

@@ -12,7 +12,7 @@ use stackable_operator::{
 };
 
 use crate::{
-    controller::{CONTAINER_IMAGE_BASE_NAME, ValidatedHiveCluster},
+    controller::{CONTAINER_IMAGE_BASE_NAME, ValidatedCluster},
     crd::{
         HIVE_SITE_XML, HiveRole, JVM_SECURITY_PROPERTIES_FILE, MetaStoreConfig,
         v1alpha1::{self, HiveMetastoreRoleConfig},
@@ -65,13 +65,16 @@ pub struct ValidatedRoleGroupConfig {
 pub fn validate_cluster(
     hive: &v1alpha1::HiveCluster,
     image_repository: &str,
-    pkg_version: &str,
     product_config_manager: &ProductConfigManager,
-) -> Result<ValidatedHiveCluster, Error> {
+) -> Result<ValidatedCluster, Error> {
     let resolved_product_image = hive
         .spec
         .image
-        .resolve(CONTAINER_IMAGE_BASE_NAME, image_repository, pkg_version)
+        .resolve(
+            CONTAINER_IMAGE_BASE_NAME,
+            image_repository,
+            crate::built_info::PKG_VERSION,
+        )
         .context(ResolveProductImageSnafu)?;
 
     let role = hive.spec.metastore.as_ref().context(NoMetaStoreRoleSnafu)?;
@@ -147,7 +150,7 @@ pub fn validate_cluster(
         .jdbc_connection_details("METADATA")
         .context(InvalidMetadataDatabaseConnectionSnafu)?;
 
-    Ok(ValidatedHiveCluster {
+    Ok(ValidatedCluster {
         image: resolved_product_image,
         role_groups: group_configs,
         role_config,