Merge branch 'refactor/remove-product-config' into use-improved-keyvalueconfigoverrides

Author: siegfriedweber

rust/operator-binary/src/container.rs

@@ -131,11 +131,6 @@ pub enum Error {
         source: ListenerOperatorVolumeSourceBuilderError,
     },
 
-    #[snafu(display("missing or invalid labels for the listener volume"))]
-    ListenerVolumeLabels {
-        source: ListenerOperatorVolumeSourceBuilderError,
-    },
-
     #[snafu(display("failed to configure logging"))]
     ConfigureLogging { source: LoggingError },
 

rust/operator-binary/src/controller/build/config_map.rs

@@ -10,12 +10,14 @@ use stackable_operator::{
 };
 
 use crate::{
-    controller::build::properties::{
-        ConfigFileName, core_site, hadoop_policy, hdfs_site, logging, security_properties,
-        ssl_client, ssl_server,
+    controller::{
+        ValidatedCluster,
+        build::properties::{
+            ConfigFileName, core_site, hadoop_policy, hdfs_site, logging, security_properties,
+            ssl_client, ssl_server,
+        },
     },
     crd::{HdfsNodeRole, v1alpha1},
-    hdfs_controller::ValidatedCluster,
 };
 
 #[derive(Snafu, Debug)]

rust/operator-binary/src/controller/build/discovery.rs

@@ -10,9 +10,9 @@ use stackable_operator::{
 use crate::{
     build_recommended_labels,
     config::{CoreSiteConfigBuilder, HdfsSiteConfigBuilder},
-    controller::build::properties::ConfigFileName,
+    controller::{ValidatedCluster, build::properties::ConfigFileName},
     crd::{HdfsNodeRole, HdfsPodRef},
-    hdfs_controller::{HDFS_CONTROLLER_NAME, ValidatedCluster},
+    hdfs_controller::HDFS_CONTROLLER_NAME,
     security::kerberos::KerberosConfig,
 };
 

rust/operator-binary/src/controller/build/properties/core_site.rs

@@ -5,7 +5,7 @@ use stackable_operator::{
 };
 
 use crate::{
-    config::CoreSiteConfigBuilder, crd::HdfsNodeRole, hdfs_controller::ValidatedCluster,
+    config::CoreSiteConfigBuilder, controller::ValidatedCluster, crd::HdfsNodeRole,
     security::kerberos::KerberosConfig,
 };
 

rust/operator-binary/src/controller/build/properties/hadoop_policy.rs

@@ -15,17 +15,11 @@ pub fn build(overrides: KeyValueConfigOverrides) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::controller::build::properties::test_support::EMPTY_HADOOP_XML;
 
     #[test]
     fn empty_overrides_render_empty_configuration() {
-        assert_eq!(
-            build(KeyValueConfigOverrides::default()),
-            concat!(
-                "<?xml version=\"1.0\"?>\n",
-                "<configuration>\n",
-                "</configuration>"
-            )
-        );
+        assert_eq!(build(KeyValueConfigOverrides::default()), EMPTY_HADOOP_XML);
     }
 
     #[test]

rust/operator-binary/src/controller/build/properties/hdfs_site.rs

@@ -6,8 +6,8 @@ use stackable_operator::{
 
 use crate::{
     config::HdfsSiteConfigBuilder,
+    controller::ValidatedCluster,
     crd::{AnyNodeConfig, HdfsNodeRole},
-    hdfs_controller::ValidatedCluster,
 };
 
 /// Renders `hdfs-site.xml`: operator defaults, HA wiring derived from the pod

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

@@ -3,6 +3,8 @@
 //! config file; the shared [`stackable_operator::v2::config_file_writer`]
 //! module serializes maps to the Hadoop-XML / Java-properties on-wire format.
 
+use crate::container::{TLS_STORE_DIR, TLS_STORE_PASSWORD};
+
 pub mod core_site;
 pub mod hadoop_policy;
 pub mod hdfs_site;
@@ -11,6 +13,22 @@ pub mod security_properties;
 pub mod ssl_client;
 pub mod ssl_server;
 
+/// The `<prefix>.truststore.*` entries (location, type, password) injected into
+/// `ssl-client.xml` / `ssl-server.xml` when HTTPS is enabled.
+fn truststore_entries(prefix: &str) -> [(String, String); 3] {
+    [
+        (
+            format!("{prefix}.truststore.location"),
+            format!("{TLS_STORE_DIR}/truststore.p12"),
+        ),
+        (format!("{prefix}.truststore.type"), "pkcs12".to_string()),
+        (
+            format!("{prefix}.truststore.password"),
+            TLS_STORE_PASSWORD.to_string(),
+        ),
+    ]
+}
+
 /// The names of the HDFS config files assembled into the rolegroup `ConfigMap`.
 #[derive(Clone, Copy, Debug, strum::Display)]
 pub enum ConfigFileName {
@@ -53,9 +71,17 @@ pub(crate) mod test_support {
     };
 
     use crate::{
-        controller::validate::validate_cluster, crd::v1alpha1, hdfs_controller::ValidatedCluster,
+        controller::{ValidatedCluster, validate::validate_cluster},
+        crd::v1alpha1,
     };
 
+    /// The rendered output of an empty Hadoop-XML configuration (no entries).
+    pub const EMPTY_HADOOP_XML: &str = concat!(
+        "<?xml version=\"1.0\"?>\n",
+        "<configuration>\n",
+        "</configuration>"
+    );
+
     /// A minimal three-role HdfsCluster used to drive the per-file builder tests.
     pub const MINIMAL_HDFS_YAML: &str = r#"
 ---

rust/operator-binary/src/controller/build/properties/ssl_client.rs

@@ -9,26 +9,13 @@ use stackable_operator::v2::{
     config_file_writer::to_hadoop_xml, config_overrides::KeyValueConfigOverrides,
 };
 
-use crate::container::{TLS_STORE_DIR, TLS_STORE_PASSWORD};
+use crate::controller::build::properties::truststore_entries;
 
 /// Renders `ssl-client.xml` for the given HTTPS state and user overrides.
 pub fn build(https_enabled: bool, overrides: KeyValueConfigOverrides) -> String {
     let mut config: BTreeMap<String, String> = BTreeMap::new();
     if https_enabled {
-        config.extend([
-            (
-                "ssl.client.truststore.location".to_string(),
-                format!("{TLS_STORE_DIR}/truststore.p12"),
-            ),
-            (
-                "ssl.client.truststore.type".to_string(),
-                "pkcs12".to_string(),
-            ),
-            (
-                "ssl.client.truststore.password".to_string(),
-                TLS_STORE_PASSWORD.to_string(),
-            ),
-        ]);
+        config.extend(truststore_entries("ssl.client"));
     }
     // Overrides applied last so users win.
     config.extend(overrides);
@@ -38,16 +25,16 @@ pub fn build(https_enabled: bool, overrides: KeyValueConfigOverrides) -> String
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::{
+        container::{TLS_STORE_DIR, TLS_STORE_PASSWORD},
+        controller::build::properties::test_support::EMPTY_HADOOP_XML,
+    };
 
     #[test]
     fn disabled_https_without_overrides_renders_empty_configuration() {
         assert_eq!(
             build(false, KeyValueConfigOverrides::default()),
-            concat!(
-                "<?xml version=\"1.0\"?>\n",
-                "<configuration>\n",
-                "</configuration>"
-            )
+            EMPTY_HADOOP_XML
         );
     }
 

rust/operator-binary/src/controller/build/properties/ssl_server.rs

@@ -9,25 +9,17 @@ use stackable_operator::v2::{
     config_file_writer::to_hadoop_xml, config_overrides::KeyValueConfigOverrides,
 };
 
-use crate::container::{TLS_STORE_DIR, TLS_STORE_PASSWORD};
+use crate::{
+    container::{TLS_STORE_DIR, TLS_STORE_PASSWORD},
+    controller::build::properties::truststore_entries,
+};
 
 /// Renders `ssl-server.xml` for the given HTTPS state and user overrides.
 pub fn build(https_enabled: bool, overrides: KeyValueConfigOverrides) -> String {
     let mut config: BTreeMap<String, String> = BTreeMap::new();
     if https_enabled {
+        config.extend(truststore_entries("ssl.server"));
         config.extend([
-            (
-                "ssl.server.truststore.location".to_string(),
-                format!("{TLS_STORE_DIR}/truststore.p12"),
-            ),
-            (
-                "ssl.server.truststore.type".to_string(),
-                "pkcs12".to_string(),
-            ),
-            (
-                "ssl.server.truststore.password".to_string(),
-                TLS_STORE_PASSWORD.to_string(),
-            ),
             (
                 "ssl.server.keystore.location".to_string(),
                 format!("{TLS_STORE_DIR}/keystore.p12"),
@@ -47,16 +39,13 @@ pub fn build(https_enabled: bool, overrides: KeyValueConfigOverrides) -> String
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::controller::build::properties::test_support::EMPTY_HADOOP_XML;
 
     #[test]
     fn disabled_https_without_overrides_renders_empty_configuration() {
         assert_eq!(
             build(false, KeyValueConfigOverrides::default()),
-            concat!(
-                "<?xml version=\"1.0\"?>\n",
-                "<configuration>\n",
-                "</configuration>"
-            )
+            EMPTY_HADOOP_XML
         );
     }