chore: Version HbaseConfigOverrides

Author: siegfriedweber

docs/modules/hbase/pages/usage-guide/overrides.adoc

@@ -12,6 +12,8 @@ For a role or role group, at the same level of `config`, you can specify: `confi
 
 * `hbase-site.xml`
 * `hbase-env.sh`
+* `ssl-server.xml`
+* `ssl-client.xml`
 * `security.properties`
 
 NOTE: `hdfs-site.xml` is not listed here, the file is always taken from the referenced HDFS cluster.

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

@@ -95,66 +95,17 @@ const DEFAULT_REGION_MOVER_DELTA_TO_SHUTDOWN: Duration = Duration::from_minutes_
 const DEFAULT_LISTENER_CLASS: &str = "cluster-internal";
 
 pub type MasterRoleType =
-    Role<HbaseConfigFragment, HbaseConfigOverrides, GenericRoleConfig, JavaCommonConfig>;
-pub type RegionServerRoleType =
-    Role<RegionServerConfigFragment, HbaseConfigOverrides, GenericRoleConfig, JavaCommonConfig>;
-pub type RestServerRoleType =
-    Role<HbaseConfigFragment, HbaseConfigOverrides, GenericRoleConfig, JavaCommonConfig>;
+    Role<HbaseConfigFragment, v1alpha1::HbaseConfigOverrides, GenericRoleConfig, JavaCommonConfig>;
 
-#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct HbaseConfigOverrides {
-    #[serde(
-        default,
-        rename = "hbase-site.xml",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub hbase_site_xml: Option<KeyValueConfigOverrides>,
-
-    #[serde(
-        default,
-        rename = "hbase-env.sh",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub hbase_env_sh: Option<KeyValueConfigOverrides>,
-
-    #[serde(
-        default,
-        rename = "ssl-server.xml",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub ssl_server_xml: Option<KeyValueConfigOverrides>,
-
-    #[serde(
-        default,
-        rename = "ssl-client.xml",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub ssl_client_xml: Option<KeyValueConfigOverrides>,
-
-    #[serde(
-        default,
-        rename = "security.properties",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub security_properties: Option<KeyValueConfigOverrides>,
-}
+pub type RegionServerRoleType = Role<
+    RegionServerConfigFragment,
+    v1alpha1::HbaseConfigOverrides,
+    GenericRoleConfig,
+    JavaCommonConfig,
+>;
 
-impl KeyValueOverridesProvider for HbaseConfigOverrides {
-    fn get_key_value_overrides(&self, file: &str) -> BTreeMap<String, Option<String>> {
-        let field = match file {
-            HBASE_SITE_XML => self.hbase_site_xml.as_ref(),
-            HBASE_ENV_SH => self.hbase_env_sh.as_ref(),
-            SSL_SERVER_XML => self.ssl_server_xml.as_ref(),
-            SSL_CLIENT_XML => self.ssl_client_xml.as_ref(),
-            JVM_SECURITY_PROPERTIES_FILE => self.security_properties.as_ref(),
-            _ => None,
-        };
-        field
-            .map(KeyValueConfigOverrides::as_product_config_overrides)
-            .unwrap_or_default()
-    }
-}
+pub type RestServerRoleType =
+    Role<HbaseConfigFragment, v1alpha1::HbaseConfigOverrides, GenericRoleConfig, JavaCommonConfig>;
 
 #[derive(Snafu, Debug)]
 pub enum Error {
@@ -281,6 +232,45 @@ pub mod versioned {
         #[serde(default, skip_serializing_if = "Option::is_none")]
         pub authorization: Option<AuthorizationConfig>,
     }
+
+    #[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct HbaseConfigOverrides {
+        #[serde(
+            default,
+            rename = "hbase-site.xml",
+            skip_serializing_if = "Option::is_none"
+        )]
+        pub hbase_site_xml: Option<KeyValueConfigOverrides>,
+
+        #[serde(
+            default,
+            rename = "hbase-env.sh",
+            skip_serializing_if = "Option::is_none"
+        )]
+        pub hbase_env_sh: Option<KeyValueConfigOverrides>,
+
+        #[serde(
+            default,
+            rename = "ssl-server.xml",
+            skip_serializing_if = "Option::is_none"
+        )]
+        pub ssl_server_xml: Option<KeyValueConfigOverrides>,
+
+        #[serde(
+            default,
+            rename = "ssl-client.xml",
+            skip_serializing_if = "Option::is_none"
+        )]
+        pub ssl_client_xml: Option<KeyValueConfigOverrides>,
+
+        #[serde(
+            default,
+            rename = "security.properties",
+            skip_serializing_if = "Option::is_none"
+        )]
+        pub security_properties: Option<KeyValueConfigOverrides>,
+    }
 }
 
 impl HasStatusCondition for v1alpha1::HbaseCluster {
@@ -410,7 +400,7 @@ impl v1alpha1::HbaseCluster {
                 Vec<PropertyNameKind>,
                 Role<
                     impl Configuration<Configurable = Self>,
-                    HbaseConfigOverrides,
+                    v1alpha1::HbaseConfigOverrides,
                     GenericRoleConfig,
                     JavaCommonConfig,
                 >,
@@ -592,6 +582,22 @@ impl v1alpha1::HbaseCluster {
     }
 }
 
+impl KeyValueOverridesProvider for v1alpha1::HbaseConfigOverrides {
+    fn get_key_value_overrides(&self, file: &str) -> BTreeMap<String, Option<String>> {
+        let field = match file {
+            HBASE_SITE_XML => self.hbase_site_xml.as_ref(),
+            HBASE_ENV_SH => self.hbase_env_sh.as_ref(),
+            SSL_SERVER_XML => self.ssl_server_xml.as_ref(),
+            SSL_CLIENT_XML => self.ssl_client_xml.as_ref(),
+            JVM_SECURITY_PROPERTIES_FILE => self.security_properties.as_ref(),
+            _ => None,
+        };
+        field
+            .map(KeyValueConfigOverrides::as_product_config_overrides)
+            .unwrap_or_default()
+    }
+}
+
 pub fn merged_env(rolegroup_config: Option<&BTreeMap<String, String>>) -> Vec<EnvVar> {
     let merged_env: Vec<EnvVar> = if let Some(rolegroup_config) = rolegroup_config {
         rolegroup_config

rust/operator-binary/src/kerberos.rs

@@ -241,6 +241,7 @@ pub fn add_kerberos_pod_config(
         // Mount keytab
         let kerberos_secret_operator_volume = SecretOperatorVolumeSourceBuilder::new(
             kerberos_secret_class,
+            // We need both public (krb5.conf) and private (keytab) parts.
             SecretClassVolumeProvisionParts::PublicPrivate,
         )
         .with_service_scope(hbase.name_any())
@@ -268,6 +269,8 @@ pub fn add_kerberos_pod_config(
                 .ephemeral(
                     SecretOperatorVolumeSourceBuilder::new(
                         https_secret_class,
+                        // HBase serves its own TLS endpoints, so the Pod needs both the public
+                        // certificate and the private key.
                         SecretClassVolumeProvisionParts::PublicPrivate,
                     )
                     .with_pod_scope()