refactor: remove kerberos build properties from ValidatedClusterConfig

Author: maltesander

rust/operator-binary/src/controller.rs

@@ -451,11 +451,6 @@ pub struct ValidatedClusterConfig {
     pub hive_opa_config: Option<HiveOpaConfig>,
     /// The Kerberos `SecretClass` name, if Kerberos is enabled.
     pub kerberos_secret_class: Option<SecretClassName>,
-    /// Kerberos-related `hive-site.xml` entries (empty when Kerberos is disabled).
-    pub kerberos_config: BTreeMap<String, String>,
-    /// Whether a `core-site.xml` with `hadoop.security.authentication=kerberos` is
-    /// required (Kerberos enabled and no HDFS backend).
-    pub needs_kerberos_core_site: bool,
 }
 
 impl ValidatedClusterConfig {

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

@@ -39,8 +39,6 @@ mod tests {
 
 #[cfg(test)]
 pub(crate) mod test_support {
-    use std::collections::BTreeMap;
-
     use crate::{
         controller::{ValidatedClusterConfig, test_support::DERBY_YAML},
         crd::{
@@ -78,8 +76,6 @@ pub(crate) mod test_support {
             s3_connection_spec: None,
             hive_opa_config: None,
             kerberos_secret_class: None,
-            kerberos_config: BTreeMap::new(),
-            needs_kerberos_core_site: false,
         }
     }
 }

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

@@ -22,8 +22,7 @@ use stackable_operator::{
 use crate::{
     controller::{
         HiveRoleGroupConfig, RoleGroupName, ValidatedCluster, ValidatedClusterConfig,
-        ValidatedMetaStoreConfig, ValidatedRoleConfig, build::kerberos::kerberos_config_properties,
-        dereference::DereferencedObjects,
+        ValidatedMetaStoreConfig, ValidatedRoleConfig, dereference::DereferencedObjects,
     },
     crd::{
         HiveRole, MetaStoreConfig,
@@ -228,17 +227,6 @@ pub fn validate_cluster(
 
     let kerberos_secret_class = hive.kerberos_secret_class();
 
-    // Kerberos-related `hive-site.xml` entries (empty when Kerberos is disabled).
-    let kerberos_config = if kerberos_secret_class.is_some() {
-        kerberos_config_properties(name.as_ref(), namespace.as_ref(), cluster_info)
-    } else {
-        BTreeMap::new()
-    };
-
-    // A `core-site.xml` with `hadoop.security.authentication=kerberos` is required when
-    // Kerberos is enabled and there is no HDFS backend (i.e. S3).
-    let needs_kerberos_core_site = kerberos_secret_class.is_some() && hdfs.is_none();
-
     Ok(ValidatedCluster::new(
         name,
         namespace,
@@ -253,8 +241,6 @@ pub fn validate_cluster(
             s3_connection_spec: dereferenced_objects.s3_connection_spec,
             hive_opa_config: dereferenced_objects.hive_opa_config,
             kerberos_secret_class,
-            kerberos_config,
-            needs_kerberos_core_site,
         },
         role_group_configs,
     ))

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

@@ -221,10 +221,6 @@ impl v1alpha1::HiveCluster {
         }
     }
 
-    pub fn has_kerberos_enabled(&self) -> bool {
-        self.kerberos_secret_class().is_some()
-    }
-
     pub fn kerberos_secret_class(&self) -> Option<SecretClassName> {
         self.spec
             .cluster_config