refactor: add clusteroperation & object overrides to ValidatedCluster / ValidatedZnode

Author: maltesander

rust/operator-binary/src/zk_controller.rs

@@ -238,8 +238,8 @@ pub async fn reconcile_zk(
         &validated_cluster.name,
         &validated_cluster.namespace,
         &validated_cluster.uid,
-        ClusterResourceApplyStrategy::from(&zk.spec.cluster_operation),
-        &zk.spec.object_overrides,
+        ClusterResourceApplyStrategy::from(&validated_cluster.cluster_operation),
+        &validated_cluster.object_overrides,
     );
 
     let (rbac_sa, rbac_rolebinding) = build_rbac_resources(

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

@@ -12,8 +12,12 @@ use std::{collections::BTreeMap, str::FromStr};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     cli::OperatorEnvironmentOptions,
-    commons::product_image_selection::{self, ResolvedProductImage},
+    commons::{
+        cluster_operation::ClusterOperation,
+        product_image_selection::{self, ResolvedProductImage},
+    },
     config::fragment,
+    deep_merger::ObjectOverrides,
     k8s_openapi::{api::core::v1::PodTemplateSpec, apimachinery::pkg::apis::meta::v1::ObjectMeta},
     kube::{Resource, ResourceExt},
     kvp::Labels,
@@ -213,6 +217,13 @@ pub struct ValidatedCluster {
     pub cluster_config: ValidatedClusterConfig,
     pub role_group_configs:
         BTreeMap<ZookeeperRole, BTreeMap<RoleGroupName, ValidatedRoleGroupConfig>>,
+    /// The cluster's operation settings (pause/stop), from which the
+    /// [`ClusterResourceApplyStrategy`](stackable_operator::cluster_resources::ClusterResourceApplyStrategy)
+    /// is derived. Carried here so the apply step does not reach into the cluster spec.
+    pub cluster_operation: ClusterOperation,
+    /// Object overrides applied to the cluster's resources, carried so the apply step does not reach
+    /// into the raw [`v1alpha1::ZookeeperCluster`].
+    pub object_overrides: ObjectOverrides,
 }
 
 impl ValidatedCluster {
@@ -228,6 +239,8 @@ impl ValidatedCluster {
             ZookeeperRole,
             BTreeMap<RoleGroupName, ValidatedRoleGroupConfig>,
         >,
+        cluster_operation: ClusterOperation,
+        object_overrides: ObjectOverrides,
     ) -> Self {
         Self {
             metadata: ObjectMeta {
@@ -243,6 +256,8 @@ impl ValidatedCluster {
             product_version,
             cluster_config,
             role_group_configs,
+            cluster_operation,
+            object_overrides,
         }
     }
 
@@ -470,6 +485,8 @@ pub fn validate(
             listener_class,
         },
         role_group_configs,
+        zk.spec.cluster_operation.clone(),
+        zk.spec.object_overrides.clone(),
     ))
 }
 

rust/operator-binary/src/znode_controller.rs

@@ -233,14 +233,7 @@ pub async fn reconcile_znode(
                     let validated_znode =
                         validate::validate(&znode, &dereferenced, &ctx.operator_environment)
                             .context(ValidateClusterSnafu)?;
-                    reconcile_apply(
-                        client,
-                        &znode,
-                        &validated_znode,
-                        dereferenced.zk,
-                        &znode_path,
-                    )
-                    .await
+                    reconcile_apply(client, &validated_znode, dereferenced.zk, &znode_path).await
                 }
                 finalizer::Event::Cleanup(_znode) => {
                     let dereferenced = match dereferenced_objects {
@@ -270,7 +263,6 @@ pub async fn reconcile_znode(
 
 async fn reconcile_apply(
     client: &stackable_operator::client::Client,
-    znode: &v1alpha1::ZookeeperZnode,
     validated_znode: &validate::ValidatedZnode,
     zk: v1alpha1::ZookeeperCluster,
     znode_path: &str,
@@ -279,11 +271,14 @@ async fn reconcile_apply(
         APP_NAME,
         OPERATOR_NAME,
         ZNODE_CONTROLLER_NAME,
-        &znode.object_ref(&()),
-        ClusterResourceApplyStrategy::from(&zk.spec.cluster_operation),
-        &znode.spec.object_overrides,
+        &validated_znode.object_ref(&()),
+        ClusterResourceApplyStrategy::from(&validated_znode.cluster_operation),
+        &validated_znode.object_overrides,
     )
-    .context(ZnodeMissingExpectedKeysSnafu { znode })?;
+    .with_context(|_| ZnodeMissingExpectedKeysSnafu {
+        znode: ObjectRef::<v1alpha1::ZookeeperZnode>::new(&validated_znode.name)
+            .within(validated_znode.namespace.as_ref()),
+    })?;
 
     znode_mgmt::ensure_znode_exists(
         &zk_mgmt_addr(

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

@@ -8,7 +8,8 @@ use std::str::FromStr;
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     cli::OperatorEnvironmentOptions,
-    commons::product_image_selection,
+    commons::{cluster_operation::ClusterOperation, product_image_selection},
+    deep_merger::ObjectOverrides,
     k8s_openapi::apimachinery::pkg::apis::meta::v1::ObjectMeta,
     kube::Resource,
     kvp::LabelValue,
@@ -83,6 +84,14 @@ pub struct ValidatedZnode {
     /// `app.kubernetes.io/version` label.
     pub product_version: ProductVersion,
     pub zookeeper_security: ZookeeperSecurity,
+    /// The parent cluster's operation settings (pause/stop), from which the
+    /// [`ClusterResourceApplyStrategy`](stackable_operator::cluster_resources::ClusterResourceApplyStrategy)
+    /// for the znode's resources is derived. Carried here so the apply step does not reach into the
+    /// cluster spec.
+    pub cluster_operation: ClusterOperation,
+    /// Object overrides applied to the znode's resources, carried so the apply step does not reach
+    /// into the raw [`v1alpha1::ZookeeperZnode`].
+    pub object_overrides: ObjectOverrides,
 }
 
 impl HasName for ValidatedZnode {
@@ -187,5 +196,7 @@ pub fn validate(
         uid,
         product_version,
         zookeeper_security,
+        cluster_operation: dereferenced_objects.zk.spec.cluster_operation.clone(),
+        object_overrides: znode.spec.object_overrides.clone(),
     })
 }