Move variables out

Author: sbernauer

crates/stackable-operator/src/builder/pod/container.rs

@@ -300,6 +300,12 @@ impl ContainerBuilder {
     }
 
     pub fn build(&self) -> Container {
+        let volume_mounts = if self.volume_mounts.is_empty() {
+            None
+        } else {
+            Some(self.volume_mounts.values().cloned().collect())
+        };
+
         Container {
             args: self.args.clone(),
             command: self.command.clone(),
@@ -309,11 +315,7 @@ impl ContainerBuilder {
             resources: self.resources.clone(),
             name: self.name.clone(),
             ports: self.container_ports.clone(),
-            volume_mounts: if self.volume_mounts.is_empty() {
-                None
-            } else {
-                Some(self.volume_mounts.clone().into_values().collect())
-            },
+            volume_mounts,
             readiness_probe: self.readiness_probe.clone(),
             liveness_probe: self.liveness_probe.clone(),
             startup_probe: self.startup_probe.clone(),

crates/stackable-operator/src/builder/pod/mod.rs

@@ -560,6 +560,12 @@ impl PodBuilder {
     }
 
     fn build_spec(&self) -> PodSpec {
+        let volumes = if self.volumes.is_empty() {
+            None
+        } else {
+            Some(self.volumes.values().cloned().collect())
+        };
+
         let pod_spec = PodSpec {
             containers: self.containers.clone(),
             host_network: self.host_network,
@@ -573,11 +579,7 @@ impl PodBuilder {
             }),
             security_context: self.security_context.clone(),
             tolerations: self.tolerations.clone(),
-            volumes: if self.volumes.is_empty() {
-                None
-            } else {
-                Some(self.volumes.clone().into_values().collect())
-            },
+            volumes,
             // Legacy feature for ancient Docker images
             // In practice, this just causes a bunch of unused environment variables that may conflict with other uses,
             // such as https://github.com/stackabletech/spark-operator/pull/256.