fix: remove optional EnvVarSet, fix comments

Author: maltesander

rust/operator-binary/src/container.rs

@@ -219,7 +219,7 @@ impl ContainerConfig {
         rolegroup_ref: &RoleGroupRef<v1alpha1::HdfsCluster>,
         resolved_product_image: &ResolvedProductImage,
         merged_config: &AnyNodeConfig,
-        env_overrides: Option<&EnvVarSet>,
+        env_overrides: &EnvVarSet,
         zk_config_map_name: &str,
         namenode_podrefs: &[HdfsPodRef],
         labels: &Labels,
@@ -473,7 +473,7 @@ impl ContainerConfig {
         rolegroup_ref: &RoleGroupRef<v1alpha1::HdfsCluster>,
         resolved_product_image: &ResolvedProductImage,
         zookeeper_config_map_name: &str,
-        env_overrides: Option<&EnvVarSet>,
+        env_overrides: &EnvVarSet,
         merged_config: &AnyNodeConfig,
         labels: &Labels,
     ) -> Result<Container, Error> {
@@ -535,7 +535,7 @@ impl ContainerConfig {
         role_group: &str,
         resolved_product_image: &ResolvedProductImage,
         zookeeper_config_map_name: &str,
-        env_overrides: Option<&EnvVarSet>,
+        env_overrides: &EnvVarSet,
         namenode_podrefs: &[HdfsPodRef],
         merged_config: &AnyNodeConfig,
         labels: &Labels,
@@ -875,7 +875,7 @@ impl ContainerConfig {
         role: &HdfsNodeRole,
         role_group: &str,
         zookeeper_config_map_name: &str,
-        env_overrides: Option<&EnvVarSet>,
+        env_overrides: &EnvVarSet,
         resources: Option<&ResourceRequirements>,
     ) -> Result<Vec<EnvVar>, Error> {
         // Maps env var name to env var object. This allows env_overrides to work
@@ -971,8 +971,7 @@ impl ContainerConfig {
 
         // Overrides need to come last
         let mut env_override_vars: BTreeMap<String, EnvVar> = env_overrides
-            .cloned()
-            .unwrap_or_default()
+            .clone()
             .into_iter()
             .map(|env_var| (env_var.name.clone(), env_var))
             .collect();

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

@@ -22,6 +22,17 @@ pub mod build;
 pub mod dereference;
 pub mod validate;
 
+/// The local-`framework` [`RoleGroupConfig`](crate::framework::role_utils::RoleGroupConfig)
+/// specialised for HDFS: the validated config is the per-role [`AnyNodeConfig`],
+/// the product-specific common config is [`JavaCommonConfig`] (whose JVM-argument
+/// merge is fallible, hence the vendored framework variant), and the config
+/// overrides are [`v1alpha1::HdfsConfigOverrides`].
+pub type ValidatedRoleGroupConfig = crate::framework::role_utils::RoleGroupConfig<
+    AnyNodeConfig,
+    stackable_operator::role_utils::JavaCommonConfig,
+    v1alpha1::HdfsConfigOverrides,
+>;
+
 /// The validated cluster: proves that config merging and validation succeeded
 /// for every role and role group before any resources are created. Placed in the
 /// controller so that subsequent steps that reference this struct only depend on
@@ -175,12 +186,13 @@ impl Resource for ValidatedCluster {
 /// longer need the raw `HdfsCluster` to render config.
 #[derive(Clone, Debug)]
 pub struct ValidatedClusterConfig {
-    pub dfs_replication: u8,
     /// The authentication config, if configured. Its presence enables both Kerberos
     /// and HTTPS; it also carries the TLS and Kerberos secret class names.
     pub authentication: Option<AuthenticationConfig>,
     /// The resolved OPA authorization config, if authorization is configured.
     pub authorization: Option<HdfsOpaConfig>,
+    /// The replication factor.
+    pub dfs_replication: u8,
     pub rack_awareness: Option<String>,
 }
 
@@ -190,9 +202,9 @@ impl ValidatedClusterConfig {
         authorization: Option<HdfsOpaConfig>,
     ) -> ValidatedClusterConfig {
         ValidatedClusterConfig {
-            dfs_replication: hdfs.spec.cluster_config.dfs_replication,
             authentication: hdfs.authentication_config().cloned(),
             authorization,
+            dfs_replication: hdfs.spec.cluster_config.dfs_replication,
             rack_awareness: hdfs.rackawareness_config(),
         }
     }
@@ -203,20 +215,3 @@ impl ValidatedClusterConfig {
 pub struct ValidatedRoleConfig {
     pub pdb: stackable_operator::commons::pdb::PdbConfig,
 }
-
-/// Per-rolegroup configuration: the merged CRD config plus the merged
-/// (role <- role group) `configOverrides`, `envOverrides`, `cliOverrides` and
-/// `podOverrides`.
-///
-/// This is the local-`framework` [`RoleGroupConfig`](crate::framework::role_utils::RoleGroupConfig)
-/// specialised for HDFS: the validated config is the per-role [`AnyNodeConfig`],
-/// the product-specific common config is [`JavaCommonConfig`] (whose JVM-argument
-/// merge is fallible, hence the vendored framework variant), and the config
-/// overrides are [`v1alpha1::HdfsConfigOverrides`]. The `replicas` field is used
-/// to derive the per-pod [`HdfsPodRef`]s via [`ValidatedCluster::pod_refs`] and
-/// `env_overrides` is the typed [`EnvVarSet`](stackable_operator::v2::builder::pod::container::EnvVarSet).
-pub type ValidatedRoleGroupConfig = crate::framework::role_utils::RoleGroupConfig<
-    AnyNodeConfig,
-    stackable_operator::role_utils::JavaCommonConfig,
-    v1alpha1::HdfsConfigOverrides,
->;

rust/operator-binary/src/hdfs_controller.rs

@@ -455,7 +455,7 @@ fn rolegroup_statefulset(
 
     let image = &validated.image;
     let merged_config = &rolegroup_config.config;
-    let env_overrides = Some(&rolegroup_config.env_overrides);
+    let env_overrides = &rolegroup_config.env_overrides;
 
     // Pod references for all namenodes across all role groups, needed to wire up the
     // init containers of this role group.
@@ -627,7 +627,7 @@ spec:
             &rolegroup_ref,
             resolved_product_image,
             merged_config,
-            Some(env_overrides),
+            env_overrides,
             &hdfs.spec.cluster_config.zookeeper_config_map_name,
             &[],
             &Labels::new(),