fix: bump stackable-operator dependency for non optional KeyValueConfigOverrides

Author: maltesander

Cargo.lock

@@ -798,25 +798,15 @@ spec:
                     properties:
                       hive-site.xml:
                         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
                       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
                     type: object
                   envOverrides:
@@ -1257,25 +1247,15 @@ spec:
                           properties:
                             hive-site.xml:
                               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
                             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
                           type: object
                         envOverrides:

Cargo.nix

@@ -12,9 +12,7 @@ use stackable_operator::{
 use crate::{
     controller::{
         HiveRoleGroupConfig, ValidatedCluster,
-        build::properties::{
-            ConfigFileName, core_site, hive_site, logging, resolved_overrides, security_properties,
-        },
+        build::properties::{ConfigFileName, core_site, hive_site, logging, security_properties},
         build_recommended_labels,
     },
     crd::v1alpha1,
@@ -55,7 +53,7 @@ pub fn build_metastore_rolegroup_config_map(
     rg: &HiveRoleGroupConfig,
 ) -> Result<ConfigMap> {
     // hive-site.xml
-    let hive_site_overrides = resolved_overrides(rg.config_overrides.hive_site_xml.clone());
+    let hive_site_overrides = rg.config_overrides.hive_site_xml.overrides.clone();
     let hive_site_data = hive_site::build(
         &cluster.cluster_config,
         &cluster.image.product_version,
@@ -65,7 +63,7 @@ pub fn build_metastore_rolegroup_config_map(
     .context(BuildHiveSiteSnafu)?;
 
     // security.properties
-    let security_overrides = resolved_overrides(rg.config_overrides.security_properties.clone());
+    let security_overrides = rg.config_overrides.security_properties.overrides.clone();
     let security_data = security_properties::build(security_overrides);
 
     let mut cm_builder = ConfigMapBuilder::new();

extra/crds.yaml

@@ -1,24 +1,10 @@
 //! Per-file builders for the Hive metastore config files.
 
-use std::collections::BTreeMap;
-
-use stackable_operator::v2::config_overrides::KeyValueConfigOverrides;
-
 pub mod core_site;
 pub mod hive_site;
 pub mod logging;
 pub mod security_properties;
 
-/// Resolve user-provided key/value overrides into `(key, value)` pairs, dropping
-/// entries whose value is unset (`None`).
-pub(crate) fn resolved_overrides(overrides: KeyValueConfigOverrides) -> BTreeMap<String, String> {
-    overrides
-        .overrides
-        .into_iter()
-        .filter_map(|(key, value)| value.map(|value| (key, value)))
-        .collect()
-}
-
 /// The names of the Hive config files assembled into the rolegroup `ConfigMap`.
 #[derive(Clone, Copy, Debug, strum::Display)]
 pub enum ConfigFileName {