refactor: Don't modify ContainerBuilder after it has been build (#838)

* fix: propagate auth volumeMounts to nifi container

* remove nifi container from auth config mount

* move code to previous place

* bump url crate version

* Update rust/operator-binary/src/controller.rs

Co-authored-by: Sebastian Bernauer <[email protected]>

---------

Co-authored-by: Sebastian Bernauer <[email protected]>

Author: xeniape

Cargo.lock

@@ -31,7 +31,7 @@ snafu = "0.8"
 strum = { version = "0.27", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
 tracing = "0.1"
-url = { version = "2.5.2" }
+url = { version = "2.5.7" }
 xml-rs = "0.8"
 
 # [patch."https://github.com/stackabletech/operator-rs.git"]

Cargo.nix

@@ -1064,11 +1064,12 @@ async fn build_node_rolegroup_statefulset(
         );
 
     let nifi_container_name = Container::Nifi.to_string();
-    let mut container_builder = ContainerBuilder::new(&nifi_container_name).with_context(|_| {
-        IllegalContainerNameSnafu {
-            container_name: nifi_container_name,
-        }
-    })?;
+    let mut container_nifi_builder =
+        ContainerBuilder::new(&nifi_container_name).with_context(|_| {
+            IllegalContainerNameSnafu {
+                container_name: nifi_container_name,
+            }
+        })?;
 
     let nifi_args = vec![formatdoc! {"
             {COMMON_BASH_TRAP_FUNCTIONS}
@@ -1084,7 +1085,7 @@ async fn build_node_rolegroup_statefulset(
     create_vector_shutdown_file_command =
         create_vector_shutdown_file_command(STACKABLE_LOG_DIR),
     }];
-    let container_nifi = container_builder
+    let container_nifi = container_nifi_builder
         .image_from_product_image(resolved_product_image)
         .command(vec![
             "/bin/bash".to_string(),
@@ -1226,6 +1227,8 @@ async fn build_node_rolegroup_statefulset(
 
     // We want to add nifi container first for easier defaulting into this container
     pod_builder.add_container(container_nifi.build());
+    // After calling `build()` the ContainerBuilder shouldn't be used anymore, so we drop it
+    drop(container_nifi_builder);
 
     for container in git_sync_resources.git_sync_containers.iter().cloned() {
         pod_builder.add_container(container);
@@ -1294,10 +1297,7 @@ async fn build_node_rolegroup_statefulset(
     }
 
     authentication_config
-        .add_volumes_and_mounts(
-            &mut pod_builder,
-            vec![&mut container_prepare, container_nifi],
-        )
+        .add_volumes_and_mounts(&mut pod_builder, vec![&mut container_prepare])
         .context(AddAuthVolumesSnafu)?;
 
     let metadata = ObjectMetaBuilder::new()