pass dereferenced fields through to validation

Author: adwk67

rust/operator-binary/src/controller.rs

@@ -335,6 +335,8 @@ pub struct ValidatedCluster {
     pub role_groups: BTreeMap<String, ValidatedRoleGroupConfig>,
     pub role_config: Option<ValidatedRoleConfig>,
     pub metadata_database_connection_details: JdbcDatabaseConnectionDetails,
+    pub s3_connection_spec: Option<s3::v1alpha1::ConnectionSpec>,
+    pub hive_opa_config: Option<HiveOpaConfig>,
 }
 
 pub async fn reconcile_hive(
@@ -358,6 +360,8 @@ pub async fn reconcile_hive(
         hive,
         &ctx.operator_environment.image_repository,
         &ctx.product_config,
+        dereferenced.s3_connection_spec,
+        dereferenced.hive_opa_config,
     )
     .context(ValidateSnafu)?;
 
@@ -410,10 +414,10 @@ pub async fn reconcile_hive(
             &rolegroup,
             &validated_rg_config.product_config_properties,
             &validated.metadata_database_connection_details,
-            dereferenced.s3_connection_spec.as_ref(),
+            validated.s3_connection_spec.as_ref(),
             &validated_rg_config.merged_config,
             &client.kubernetes_cluster_info,
-            dereferenced.hive_opa_config.as_ref(),
+            validated.hive_opa_config.as_ref(),
         )?;
         let rg_statefulset = build_metastore_rolegroup_statefulset(
             hive,
@@ -422,10 +426,10 @@ pub async fn reconcile_hive(
             &rolegroup,
             &validated_rg_config.product_config_properties,
             &validated.metadata_database_connection_details,
-            dereferenced.s3_connection_spec.as_ref(),
+            validated.s3_connection_spec.as_ref(),
             &validated_rg_config.merged_config,
             &rbac_sa.name_any(),
-            dereferenced.hive_opa_config.as_ref(),
+            validated.hive_opa_config.as_ref(),
         )?;
 
         cluster_resources

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

@@ -7,11 +7,13 @@ use product_config::{ProductConfigManager, types::PropertyNameKind};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     commons::product_image_selection,
+    crd::s3,
     product_config_utils::{transform_all_roles_to_config, validate_all_roles_and_groups_config},
     role_utils::GenericRoleConfig,
 };
 
 use crate::{
+    config::opa::HiveOpaConfig,
     controller::{CONTAINER_IMAGE_BASE_NAME, ValidatedCluster},
     crd::{
         HIVE_SITE_XML, HiveRole, JVM_SECURITY_PROPERTIES_FILE, MetaStoreConfig,
@@ -66,6 +68,8 @@ pub fn validate_cluster(
     hive: &v1alpha1::HiveCluster,
     image_repository: &str,
     product_config_manager: &ProductConfigManager,
+    s3_connection_spec: Option<s3::v1alpha1::ConnectionSpec>,
+    hive_opa_config: Option<HiveOpaConfig>,
 ) -> Result<ValidatedCluster, Error> {
     let resolved_product_image = hive
         .spec
@@ -155,5 +159,7 @@ pub fn validate_cluster(
         role_groups: group_configs,
         role_config,
         metadata_database_connection_details,
+        s3_connection_spec,
+        hive_opa_config,
     })
 }