refactor: Make the DaemonSet builder take a ServiceAccount name

Author: maltesander

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

@@ -30,12 +30,11 @@ use stackable_operator::{
             apps::v1::{DaemonSet, DaemonSetSpec, DaemonSetUpdateStrategy, RollingUpdateDaemonSet},
             core::v1::{
                 EmptyDirVolumeSource, EnvVarSource, HTTPGetAction, ObjectFieldSelector, Probe,
-                ResourceRequirements, SecretVolumeSource, ServiceAccount,
+                ResourceRequirements, SecretVolumeSource,
             },
         },
         apimachinery::pkg::{apis::meta::v1::LabelSelector, util::intstr::IntOrString},
     },
-    kube::ResourceExt,
     memory::{BinaryMultiple, MemoryQuantity},
     product_logging::{
         self,
@@ -245,7 +244,7 @@ pub fn build_server_rolegroup_daemonset(
     role_group: &OpaRoleGroupConfig,
     opa_bundle_builder_image: &str,
     user_info_fetcher_image: &str,
-    service_account: &ServiceAccount,
+    service_account_name: &str,
     cluster_info: &KubernetesClusterInfo,
 ) -> Result<DaemonSet> {
     let resolved_product_image = &cluster.image;
@@ -405,7 +404,7 @@ pub fn build_server_rolegroup_daemonset(
                 .build(),
         )
         .context(AddVolumeSnafu)?
-        .service_account_name(service_account.name_any())
+        .service_account_name(service_account_name)
         .security_context(PodSecurityContextBuilder::new().fs_group(1000).build());
 
     if let Some(tls) = &cluster.cluster_config.tls {
@@ -847,12 +846,7 @@ fn build_prepare_start_command(
 #[cfg(test)]
 mod tests {
     use serde_json::json;
-    use stackable_operator::{
-        commons::networking::DomainName,
-        k8s_openapi::{
-            api::core::v1::ServiceAccount, apimachinery::pkg::apis::meta::v1::ObjectMeta,
-        },
-    };
+    use stackable_operator::commons::networking::DomainName;
 
     use super::*;
     use crate::{
@@ -865,16 +859,6 @@ mod tests {
         }
     }
 
-    fn service_account() -> ServiceAccount {
-        ServiceAccount {
-            metadata: ObjectMeta {
-                name: Some("test-opa-serviceaccount".to_owned()),
-                ..Default::default()
-            },
-            ..Default::default()
-        }
-    }
-
     fn build(cluster: &ValidatedCluster) -> DaemonSet {
         let (role_group_name, role_group) = cluster.role_group_configs[&OpaRole::Server]
             .iter()
@@ -886,7 +870,7 @@ mod tests {
             role_group,
             "bundle-builder-image",
             "user-info-fetcher-image",
-            &service_account(),
+            "test-opa-serviceaccount",
             &cluster_info(),
         )
         .expect("the daemonset should build")

rust/operator-binary/src/opa_controller.rs

@@ -228,7 +228,7 @@ pub async fn reconcile_opa(
             rolegroup,
             &ctx.opa_bundle_builder_image,
             &ctx.user_info_fetcher_image,
-            &rbac_sa,
+            &rbac_sa.name_any(),
             &ctx.cluster_info,
         )
         .with_context(|_| BuildRoleGroupDaemonSetSnafu {