use constant for image base name

Author: adwk67

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

@@ -11,7 +11,7 @@ use stackable_operator::{
     role_utils::GenericRoleConfig,
 };
 
-use crate::crd::{AnyServiceConfig, HbaseRole, v1alpha1};
+use crate::{crd::{AnyServiceConfig, HbaseRole, v1alpha1}, hbase_controller::CONTAINER_IMAGE_BASE_NAME};
 
 #[derive(Snafu, Debug)]
 pub enum Error {
@@ -67,15 +67,14 @@ pub struct ValidatedHbaseCluster {
 
 pub fn validate_cluster(
     hbase: &v1alpha1::HbaseCluster,
-    image_base_name: &str,
     image_repository: &str,
     pkg_version: &str,
     product_config_manager: &ProductConfigManager,
 ) -> Result<ValidatedHbaseCluster, Error> {
     let resolved_product_image = hbase
         .spec
         .image
-        .resolve(image_base_name, image_repository, pkg_version)
+        .resolve(CONTAINER_IMAGE_BASE_NAME, image_repository, pkg_version)
         .context(ResolveProductImageSnafu)?;
 
     let roles = hbase.build_role_properties().context(RolePropertiesSnafu)?;

rust/operator-binary/src/hbase_controller.rs

@@ -103,7 +103,7 @@ const HDFS_DISCOVERY_TMP_DIR: &str = "/stackable/tmp/hdfs";
 const HBASE_CONFIG_TMP_DIR: &str = "/stackable/tmp/hbase";
 const HBASE_LOG_CONFIG_TMP_DIR: &str = "/stackable/tmp/log_config";
 
-const CONTAINER_IMAGE_BASE_NAME: &str = "hbase";
+pub const CONTAINER_IMAGE_BASE_NAME: &str = "hbase";
 
 pub struct Ctx {
     pub client: stackable_operator::client::Client,
@@ -304,7 +304,6 @@ pub async fn reconcile_hbase(
 
     let validated = crate::controller::validate::validate_cluster(
         hbase,
-        CONTAINER_IMAGE_BASE_NAME,
         &ctx.operator_environment.image_repository,
         crate::built_info::PKG_VERSION,
         &ctx.product_config,