deps: bumo operator-rs branch

Author: maltesander

Cargo.lock

@@ -653,25 +653,15 @@ spec:
                     properties:
                       security.properties:
                         additionalProperties:
-                          nullable: true
                           type: string
                         default: {}
-                        description: |-
-                          Flat key-value overrides for `*.properties`, Hadoop XML, etc.
-
-                          This is backwards-compatible with the existing flat key-value YAML format
-                          used by `HashMap<String, String>`.
+                        description: Flat key-value overrides for `*.properties`, Hadoop XML, etc.
                         type: object
                       zoo.cfg:
                         additionalProperties:
-                          nullable: true
                           type: string
                         default: {}
-                        description: |-
-                          Flat key-value overrides for `*.properties`, Hadoop XML, etc.
-
-                          This is backwards-compatible with the existing flat key-value YAML format
-                          used by `HashMap<String, String>`.
+                        description: Flat key-value overrides for `*.properties`, Hadoop XML, etc.
                         type: object
                     type: object
                   envOverrides:
@@ -1210,25 +1200,15 @@ spec:
                           properties:
                             security.properties:
                               additionalProperties:
-                                nullable: true
                                 type: string
                               default: {}
-                              description: |-
-                                Flat key-value overrides for `*.properties`, Hadoop XML, etc.
-
-                                This is backwards-compatible with the existing flat key-value YAML format
-                                used by `HashMap<String, String>`.
+                              description: Flat key-value overrides for `*.properties`, Hadoop XML, etc.
                               type: object
                             zoo.cfg:
                               additionalProperties:
-                                nullable: true
                                 type: string
                               default: {}
-                              description: |-
-                                Flat key-value overrides for `*.properties`, Hadoop XML, etc.
-
-                                This is backwards-compatible with the existing flat key-value YAML format
-                                used by `HashMap<String, String>`.
+                              description: Flat key-value overrides for `*.properties`, Hadoop XML, etc.
                               type: object
                           type: object
                         envOverrides:

Cargo.nix

@@ -3,8 +3,6 @@
 //! Each submodule renders the key/value pairs (or file contents) for one file
 //! that ends up in the rolegroup ConfigMap.
 
-use stackable_operator::v2::config_overrides::KeyValueConfigOverrides;
-
 pub mod logging;
 pub mod security_properties;
 pub mod zoo_cfg;
@@ -17,15 +15,3 @@ pub enum ConfigFileName {
     #[strum(serialize = "security.properties")]
     SecurityProperties,
 }
-
-/// Resolves user-provided [`KeyValueConfigOverrides`] into the `(key, value)`
-/// pairs to merge into a config file, dropping entries whose value is unset
-/// (`None`).
-pub(crate) fn resolved_overrides(
-    overrides: KeyValueConfigOverrides,
-) -> impl Iterator<Item = (String, String)> {
-    overrides
-        .overrides
-        .into_iter()
-        .filter_map(|(key, value)| value.map(|value| (key, value)))
-}

extra/crds.yaml

@@ -2,7 +2,6 @@
 
 use std::collections::BTreeMap;
 
-use super::resolved_overrides;
 use crate::zk_controller::validate::ZookeeperRoleGroupConfig;
 
 const NETWORKADDRESS_CACHE_TTL: &str = "networkaddress.cache.ttl";
@@ -29,12 +28,12 @@ pub fn build(rolegroup_config: &ZookeeperRoleGroupConfig) -> BTreeMap<String, St
     );
 
     // configOverrides go last so they win.
-    security_properties.extend(resolved_overrides(
+    security_properties.extend(
         rolegroup_config
             .config_overrides
             .security_properties
             .clone(),
-    ));
+    );
 
     security_properties
 }

rust/operator-binary/src/zk_controller/build/properties/mod.rs

@@ -7,7 +7,6 @@
 
 use std::collections::BTreeMap;
 
-use super::resolved_overrides;
 use crate::{
     crd::{
         METRICS_PROVIDER_HTTP_PORT, METRICS_PROVIDER_HTTP_PORT_KEY, STACKABLE_DATA_DIR,
@@ -102,9 +101,7 @@ pub fn build(
     }
 
     // 5. configOverrides go last so they win.
-    zoo_cfg.extend(resolved_overrides(
-        rolegroup_config.config_overrides.zoo_cfg.clone(),
-    ));
+    zoo_cfg.extend(rolegroup_config.config_overrides.zoo_cfg.clone());
 
     zoo_cfg
 }