refactor: use v2 SecretName

Author: maltesander

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

@@ -19,6 +19,7 @@ use stackable_operator::{
     crd::authentication::core,
     k8s_openapi::api::core::v1::{Container, EnvVar, Volume, VolumeMount},
     kube::{ResourceExt, runtime::reflector::ObjectRef},
+    v2::types::kubernetes::SecretName,
 };
 use strum::EnumDiscriminants;
 use tracing::trace;
@@ -95,7 +96,7 @@ pub struct TrinoAuthenticationConfig {
     /// Additional side car container for the provided role
     sidecar_containers: HashMap<TrinoRole, Vec<Container>>,
     /// Secrets which can be hot-reloaded and should be excluded from the restart controller
-    hot_reloaded_secrets: BTreeSet<String>,
+    hot_reloaded_secrets: BTreeSet<SecretName>,
 }
 
 impl TrinoAuthenticationConfig {
@@ -371,12 +372,12 @@ impl TrinoAuthenticationConfig {
     }
 
     /// Retrieve all Secrets which can be hot-reloaded
-    pub fn hot_reloaded_secrets(&self) -> &BTreeSet<String> {
+    pub fn hot_reloaded_secrets(&self) -> &BTreeSet<SecretName> {
         &self.hot_reloaded_secrets
     }
 
     /// Add a Secret which can be hot-reloaded
-    pub fn add_hot_reloaded_secret(&mut self, secret_name: String) {
+    pub fn add_hot_reloaded_secret(&mut self, secret_name: SecretName) {
         self.hot_reloaded_secrets.insert(secret_name);
     }
 

rust/operator-binary/src/authentication/password/mod.rs

@@ -8,8 +8,12 @@
 //! - volume and volume mounts
 //! - extra containers and commands
 //!
+use std::str::FromStr;
+
 use snafu::{ResultExt, Snafu};
-use stackable_operator::commons::product_image_selection::ResolvedProductImage;
+use stackable_operator::{
+    commons::product_image_selection::ResolvedProductImage, v2::types::kubernetes::SecretName,
+};
 use tracing::trace;
 
 use crate::{
@@ -37,6 +41,11 @@ pub enum Error {
 
     #[snafu(display("failed to create LDAP Volumes and VolumeMounts"))]
     BuildPasswordFileUpdateContainer { source: file::Error },
+
+    #[snafu(display("failed to parse user credentials Secret name"))]
+    ParseSecretName {
+        source: stackable_operator::v2::macros::attributed_string_type::Error,
+    },
 }
 
 #[derive(Clone, Debug, Default)]
@@ -105,8 +114,10 @@ impl TrinoPasswordAuthentication {
                         FileAuthenticator::password_db_volume_mount(),
                     );
 
-                    password_authentication_config
-                        .add_hot_reloaded_secret(file_authenticator.secret_name());
+                    password_authentication_config.add_hot_reloaded_secret(
+                        SecretName::from_str(&file_authenticator.secret_name())
+                            .context(ParseSecretNameSnafu)?,
+                    );
                 }
                 TrinoPasswordAuthenticator::Ldap(ldap_authenticator) => {
                     let config_file_name = ldap_authenticator.config_file_name();

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

@@ -39,7 +39,7 @@ use stackable_operator::{
             statefulset::restarter_ignore_secret_annotations,
         },
         product_logging::framework::{ValidatedContainerLogConfigChoice, vector_container},
-        types::kubernetes::{ContainerName, SecretName, VolumeName},
+        types::kubernetes::{ContainerName, VolumeName},
     },
 };
 
@@ -105,11 +105,6 @@ pub enum Error {
         source: stackable_operator::kvp::KeyValuePairError<Infallible>,
     },
 
-    #[snafu(display("failed to parse hot-reloaded Secret name"))]
-    ParseSecretName {
-        source: stackable_operator::v2::macros::attributed_string_type::Error,
-    },
-
     #[snafu(display("failed to build Metadata"))]
     MetadataBuild {
         source: stackable_operator::builder::meta::Error,
@@ -451,14 +446,12 @@ pub fn build_rolegroup_statefulset(
     pod_template.merge_from(role.config.pod_overrides.clone());
     pod_template.merge_from(rolegroup.config.pod_overrides.clone());
 
-    let ignore_secrets = trino_authentication_config
-        .hot_reloaded_secrets()
-        .iter()
-        .map(|secret_name| SecretName::from_str(secret_name))
-        .collect::<std::result::Result<Vec<_>, _>>()
-        .context(ParseSecretNameSnafu)?;
-
-    let annotations = restarter_ignore_secret_annotations(ignore_secrets);
+    let annotations = restarter_ignore_secret_annotations(
+        trino_authentication_config
+            .hot_reloaded_secrets()
+            .iter()
+            .cloned(),
+    );
 
     Ok(StatefulSet {
         metadata: ObjectMetaBuilder::new()