refactor: remove has_kerberos_enabled and has_https_enabled from ValidatedClusterConfig

Author: maltesander

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

@@ -83,7 +83,7 @@ pub fn build_rolegroup_config_map(
     let hbase_env_sh = hbase_env::build(
         merged_config,
         role,
-        cluster_config.kerberos_enabled,
+        cluster.has_kerberos_enabled(),
         construct_role_specific_non_heap_jvm_args(cluster, rg),
         overrides.hbase_env_sh.clone(),
     )

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

@@ -183,12 +183,14 @@ impl ValidatedCluster {
     /// Mirrors [`v1alpha1::HbaseCluster::has_kerberos_enabled`], derived here from the validated
     /// config so build steps don't have to re-read the raw cluster.
     pub fn has_kerberos_enabled(&self) -> bool {
-        self.cluster_config.kerberos_enabled
+        self.cluster_config.kerberos_secret_class.is_some()
     }
 
     /// Whether HTTPS is enabled for this cluster.
+    ///
+    /// Derived from the validated config (a TLS `SecretClass` was configured).
     pub fn has_https_enabled(&self) -> bool {
-        self.cluster_config.https_enabled
+        self.cluster_config.https_secret_class.is_some()
     }
 }
 
@@ -244,9 +246,6 @@ impl NameIsValidLabelValue for ValidatedCluster {
 pub struct ValidatedClusterConfig {
     // Pre-resolved OPA connection configuration.
     pub hbase_opa_config: Option<HbaseOpaConfig>,
-    pub kerberos_enabled: bool,
-    /// Whether HTTPS is enabled (a TLS `SecretClass` was configured).
-    pub https_enabled: bool,
     /// The Kerberos `SecretClass` name, if Kerberos is enabled.
     pub kerberos_secret_class: Option<SecretClassName>,
     /// The HTTPS/TLS `SecretClass` name, if HTTPS is enabled.

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

@@ -245,8 +245,6 @@ pub fn validate_cluster(
         ValidatedClusterConfig {
             zookeeper_connection_information: dereferenced_objects.zookeeper_connection_information,
             hbase_opa_config: dereferenced_objects.hbase_opa_config,
-            kerberos_enabled,
-            https_enabled,
             kerberos_secret_class: hbase.kerberos_secret_class(),
             https_secret_class: hbase.https_secret_class(),
             hdfs_config_map_name: hbase.spec.cluster_config.hdfs_config_map_name.clone(),