refactor to new structure

Author: sbernauer

Cargo.lock

@@ -186,6 +186,13 @@ spec:
                       nullable: true
                       type: string
                   type: object
+                objectOverrides:
+                  default: []
+                  description: TODO docs
+                  items:
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  type: array
                 servers:
                   description: |-
                     This struct represents a role - e.g. HDFS datanodes or Trino workers. It has a key-value-map containing
@@ -1029,6 +1036,13 @@ spec:
                       nullable: true
                       type: string
                   type: object
+                objectOverrides:
+                  default: []
+                  description: TODO docs
+                  items:
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  type: array
               type: object
             status:
               nullable: true

Cargo.nix

@@ -23,6 +23,7 @@ use stackable_operator::{
     },
     kube::{CustomResource, ResourceExt, runtime::reflector::ObjectRef},
     memory::{BinaryMultiple, MemoryQuantity},
+    patchinator::ObjectOverrides,
     product_config_utils::{self, Configuration},
     product_logging::{self, spec::Logging},
     role_utils::{GenericRoleConfig, JavaCommonConfig, Role, RoleGroup, RoleGroupRef},
@@ -128,7 +129,7 @@ pub mod versioned {
     /// A ZooKeeper cluster stacklet. This resource is managed by the Stackable operator for Apache ZooKeeper.
     /// Find more information on how to use it and the resources that the operator generates in the
     /// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/zookeeper/).
-    #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
+    #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, Serialize)]
     #[versioned(crd(
         group = "zookeeper.stackable.tech",
         plural = "zookeeperclusters",
@@ -155,8 +156,8 @@ pub mod versioned {
         pub servers:
             Option<Role<ZookeeperConfigFragment, ZookeeperServerRoleConfig, JavaCommonConfig>>,
 
-        /// TODO docs
-        pub object_overrides: Option<String>,
+        #[serde(flatten)]
+        pub object_overrides: ObjectOverrides,
     }
 
     #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
@@ -293,7 +294,7 @@ pub mod versioned {
     ///
     /// You can learn more about this in the
     /// [Isolating clients with ZNodes usage guide](DOCS_BASE_URL_PLACEHOLDER/zookeeper/usage_guide/isolating_clients_with_znodes).
-    #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
+    #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, Serialize)]
     #[versioned(crd(
         group = "zookeeper.stackable.tech",
         plural = "zookeeperznodes",
@@ -307,6 +308,9 @@ pub mod versioned {
         /// The reference to the ZookeeperCluster that this ZNode belongs to.
         #[serde(default)]
         pub cluster_ref: ClusterRef<ZookeeperCluster>,
+
+        #[serde(flatten)]
+        pub object_overrides: ObjectOverrides,
     }
 
     #[derive(Clone, Default, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]

crate-hashes.json

@@ -28,7 +28,7 @@ pub async fn add_pdbs(
     zookeeper: &v1alpha1::ZookeeperCluster,
     role: &ZookeeperRole,
     client: &Client,
-    cluster_resources: &mut ClusterResources,
+    cluster_resources: &mut ClusterResources<'_>,
 ) -> Result<(), Error> {
     if !pdb.enabled {
         return Ok(());

deploy/helm/zookeeper-operator/crds/crds.yaml

@@ -373,7 +373,7 @@ pub async fn reconcile_zk(
         ZK_CONTROLLER_NAME,
         &zk.object_ref(&()),
         ClusterResourceApplyStrategy::from(&zk.spec.cluster_operation),
-        zk.spec.object_overrides.as_ref(),
+        &zk.spec.object_overrides,
     )
     .context(CreateClusterResourcesSnafu)?;
 

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

@@ -287,7 +287,7 @@ async fn reconcile_apply(
         ZNODE_CONTROLLER_NAME,
         &znode.object_ref(&()),
         ClusterResourceApplyStrategy::from(&zk.spec.cluster_operation),
-        zk.spec.object_overrides.as_ref(),
+        &znode.spec.object_overrides,
     )
     .context(ZnodeMissingExpectedKeysSnafu { znode })?;