refactor: improve repo handling

Author: maltesander

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

@@ -1,6 +1,7 @@
 use std::{collections::BTreeMap, fmt::Write};
 
 use snafu::Snafu;
+use stackable_operator::k8s_openapi::api::core::v1::VolumeMount;
 use strum::{Display, EnumIter};
 
 use crate::security::oidc;
@@ -29,6 +30,21 @@ pub enum NifiRepository {
     State,
 }
 
+/// The repositories that are backed by a [`PersistentVolume`] and therefore need a volume mount
+/// in both the prepare and the nifi container.
+///
+/// [`NifiRepository::Filebased`] is intentionally excluded: it is only mounted conditionally for
+/// file-based authorization (see [`crate::security::authorization`]).
+///
+/// [`PersistentVolume`]: stackable_operator::k8s_openapi::api::core::v1::PersistentVolume
+pub const PERSISTENT_REPOSITORIES: [NifiRepository; 5] = [
+    NifiRepository::Flowfile,
+    NifiRepository::Database,
+    NifiRepository::Content,
+    NifiRepository::Provenance,
+    NifiRepository::State,
+];
+
 impl NifiRepository {
     pub fn repository(&self) -> String {
         format!("{}-repository", self)
@@ -37,6 +53,15 @@ impl NifiRepository {
     pub fn mount_path(&self) -> String {
         format!("{NIFI_PVC_STORAGE_DIRECTORY}/{}", self)
     }
+
+    /// The [`VolumeMount`] mounting this repository's volume into a container.
+    pub fn volume_mount(&self) -> VolumeMount {
+        VolumeMount {
+            name: self.repository(),
+            mount_path: self.mount_path(),
+            ..VolumeMount::default()
+        }
+    }
 }
 
 #[derive(Snafu, Debug)]

rust/operator-binary/src/controller.rs

@@ -70,7 +70,10 @@ use validate::NifiRoleGroupConfig;
 
 use crate::{
     OPERATOR_NAME,
-    config::{NIFI_CONFIG_DIRECTORY, NIFI_PYTHON_WORKING_DIRECTORY, NifiRepository},
+    config::{
+        NIFI_CONFIG_DIRECTORY, NIFI_PYTHON_WORKING_DIRECTORY, NifiRepository,
+        PERSISTENT_REPOSITORIES,
+    },
     crd::{
         APP_NAME, BALANCE_PORT, BALANCE_PORT_NAME, Container, HTTPS_PORT, HTTPS_PORT_NAME,
         METRICS_PORT, METRICS_PORT_NAME, NifiConfig, NifiNodeRoleConfig, NifiRole, NifiRoleType,
@@ -805,29 +808,10 @@ async fn build_node_rolegroup_statefulset(
         ])
         .add_env_vars(env_vars.clone())
         .args(vec![prepare_args.join(" && ")])
-        .add_volume_mount(
-            NifiRepository::Flowfile.repository(),
-            NifiRepository::Flowfile.mount_path(),
-        )
-        .context(AddVolumeMountSnafu)?
-        .add_volume_mount(
-            NifiRepository::Database.repository(),
-            NifiRepository::Database.mount_path(),
-        )
-        .context(AddVolumeMountSnafu)?
-        .add_volume_mount(
-            NifiRepository::Content.repository(),
-            NifiRepository::Content.mount_path(),
-        )
-        .context(AddVolumeMountSnafu)?
-        .add_volume_mount(
-            NifiRepository::Provenance.repository(),
-            NifiRepository::Provenance.mount_path(),
-        )
-        .context(AddVolumeMountSnafu)?
-        .add_volume_mount(
-            NifiRepository::State.repository(),
-            NifiRepository::State.mount_path(),
+        .add_volume_mounts(
+            PERSISTENT_REPOSITORIES
+                .iter()
+                .map(NifiRepository::volume_mount),
         )
         .context(AddVolumeMountSnafu)?
         .add_volume_mount("conf", "/conf")
@@ -891,29 +875,10 @@ async fn build_node_rolegroup_statefulset(
         .add_env_vars(env_vars)
         .add_volume_mount(KEYSTORE_VOLUME_NAME, KEYSTORE_NIFI_CONTAINER_MOUNT)
         .context(AddVolumeMountSnafu)?
-        .add_volume_mount(
-            NifiRepository::Flowfile.repository(),
-            NifiRepository::Flowfile.mount_path(),
-        )
-        .context(AddVolumeMountSnafu)?
-        .add_volume_mount(
-            NifiRepository::Database.repository(),
-            NifiRepository::Database.mount_path(),
-        )
-        .context(AddVolumeMountSnafu)?
-        .add_volume_mount(
-            NifiRepository::Content.repository(),
-            NifiRepository::Content.mount_path(),
-        )
-        .context(AddVolumeMountSnafu)?
-        .add_volume_mount(
-            NifiRepository::Provenance.repository(),
-            NifiRepository::Provenance.mount_path(),
-        )
-        .context(AddVolumeMountSnafu)?
-        .add_volume_mount(
-            NifiRepository::State.repository(),
-            NifiRepository::State.mount_path(),
+        .add_volume_mounts(
+            PERSISTENT_REPOSITORIES
+                .iter()
+                .map(NifiRepository::volume_mount),
         )
         .context(AddVolumeMountSnafu)?
         .add_volume_mount("activeconf", NIFI_CONFIG_DIRECTORY)