Patch op-rs version to use one that fixes SUP-148.

Some minor changes needed to remove dependency on now private fn in op-rs.

Author: soenkeliebau

Cargo.lock

@@ -30,5 +30,8 @@ strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
 tracing = "0.1"
 
+[patch."https://github.com/stackabletech/operator-rs.git"]
+stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/SUP-148" }
+
 # [patch."https://github.com/stackabletech/operator-rs.git"]
 # stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }

Cargo.toml

@@ -35,7 +35,7 @@ use stackable_operator::{
     commons::{
         opa::OpaApiVersion,
         product_image_selection::ResolvedProductImage,
-        rbac::{build_rbac_resources, service_account_name},
+        rbac::build_rbac_resources,
         s3::{S3AccessStyle, S3ConnectionSpec, S3Error},
         tls_verification::TlsClientDetailsError,
     },
@@ -70,6 +70,8 @@ use stackable_operator::{
     },
     time::Duration,
 };
+use stackable_operator::k8s_openapi::api::core::v1::ServiceAccount;
+use stackable_operator::kube::ResourceExt;
 use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
@@ -488,7 +490,8 @@ pub async fn reconcile_druid(
     )
     .context(BuildRbacResourcesSnafu)?;
     cluster_resources
-        .add(client, rbac_sa)
+        // We clone rbac_sa because we need to reuse it below
+        .add(client, rbac_sa.clone())
         .await
         .context(ApplyServiceAccountSnafu)?;
     cluster_resources
@@ -559,6 +562,7 @@ pub async fn reconcile_druid(
                 s3_conn.as_ref(),
                 &druid_tls_security,
                 &druid_auth_config,
+                &rbac_sa,
             )?;
             cluster_resources
                 .add(client, rg_service)
@@ -916,6 +920,7 @@ fn build_rolegroup_statefulset(
     s3_conn: Option<&S3ConnectionSpec>,
     druid_tls_security: &DruidTlsSecurity,
     druid_auth_config: &Option<DruidAuthenticationConfig>,
+    service_account: &ServiceAccount,
 ) -> Result<StatefulSet> {
     // prepare container builder
     let prepare_container_name = Container::Prepare.to_string();
@@ -1119,7 +1124,7 @@ fn build_rolegroup_statefulset(
         .add_init_container(cb_prepare.build())
         .add_container(cb_druid.build())
         .metadata(metadata)
-        .service_account_name(service_account_name(APP_NAME))
+        .service_account_name(service_account.name_any())
         .security_context(
             PodSecurityContextBuilder::new()
                 .run_as_user(DRUID_UID)