Make necessary changes to reflect now private fns in op-rs due.

Author: soenkeliebau

Cargo.lock

@@ -4,7 +4,7 @@ use stackable_hdfs_crd::{
     HdfsCluster,
 };
 use stackable_operator::{
-    commons::rbac::service_account_name,
+    commons::rbac::build_rbac_resources,
     k8s_openapi::api::rbac::v1::{ClusterRoleBinding, Subject},
     kube::{
         api::{Patch, PatchParams},
@@ -15,6 +15,7 @@ use stackable_operator::{
         },
         Api, Client,
     },
+    kvp::Labels,
 };
 use tracing::{error, info};
 
@@ -41,16 +42,27 @@ pub async fn reconcile(
             )
         }
     }
+
     // Build a list of SubjectRef objects for all deployed HdfsClusters.
     // To do this we only need the metadata for that, as we only really
     // need name and namespace of the objects
     let subjects: Vec<Subject> = store
         .state()
         .into_iter()
-        .map(|object| object.metadata.clone())
-        .map(|meta| Subject {
+        .map(|object| {
+            (
+                object.metadata.clone(),
+                build_rbac_resources(&*object, APP_NAME, Labels::default())
+                    .expect("failed to get serviceAccount for object")
+                    .0
+                    .metadata
+                    .name
+                    .unwrap(),
+            )
+        })
+        .map(|(meta, sa_name)| Subject {
             kind: "ServiceAccount".to_string(),
-            name: service_account_name(APP_NAME),
+            name: sa_name,
             namespace: meta.namespace.clone(),
             ..Subject::default()
         })

rust/operator-binary/src/hdfs_clusterrolebinding_nodes_controller.rs

@@ -19,7 +19,7 @@ use stackable_operator::{
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
     commons::{
         product_image_selection::ResolvedProductImage,
-        rbac::{build_rbac_resources, service_account_name},
+        rbac::build_rbac_resources,
     },
     iter::reverse_if,
     k8s_openapi::{
@@ -50,6 +50,7 @@ use stackable_operator::{
     time::Duration,
     utils::cluster_info::KubernetesClusterInfo,
 };
+use stackable_operator::k8s_openapi::api::core::v1::ServiceAccount;
 use strum::{EnumDiscriminants, IntoEnumIterator, IntoStaticStr};
 
 use stackable_hdfs_crd::{
@@ -326,7 +327,8 @@ pub async fn reconcile_hdfs(
     .context(BuildRbacResourcesSnafu)?;
 
     cluster_resources
-        .add(client, rbac_sa)
+        // We clone here because we need to use rbac_sa further down
+        .add(client, rbac_sa.clone())
         .await
         .context(ApplyServiceAccountSnafu)?;
     cluster_resources
@@ -434,6 +436,7 @@ pub async fn reconcile_hdfs(
                 env_overrides,
                 &merged_config,
                 &namenode_podrefs,
+                &rbac_sa
             )?;
 
             let rg_service_name = rg_service.name_any();
@@ -818,6 +821,7 @@ fn rolegroup_statefulset(
     env_overrides: Option<&BTreeMap<String, String>>,
     merged_config: &AnyNodeConfig,
     namenode_podrefs: &[HdfsPodRef],
+    service_account: &ServiceAccount,
 ) -> HdfsOperatorResult<StatefulSet> {
     tracing::info!("Setting up StatefulSet for {:?}", rolegroup_ref);
 
@@ -837,7 +841,7 @@ fn rolegroup_statefulset(
     pb.metadata(pb_metadata)
         .image_pull_secrets_from_product_image(resolved_product_image)
         .affinity(&merged_config.affinity)
-        .service_account_name(service_account_name(APP_NAME))
+        .service_account_name(service_account.name_any())
         .security_context(
             PodSecurityContextBuilder::new()
                 .run_as_user(HDFS_UID)