From eff3e6b2d5ca1c8e2a590a9f3dbb2db8480f546d Mon Sep 17 00:00:00 2001
From: Stacky McStackface <github@stackable.de>
Date: Wed, 2 Apr 2025 15:06:10 +0000
Subject: [PATCH 1/6] chore: Generated commit to update templated files since
 the last template run up to
 stackabletech/operator-templating@f1f1a9e521ab29506e3ea4977df52277c4d161b0

Reference-to: stackabletech/operator-templating@f1f1a9e (Bump Rust to 1.85.0)
---
 .github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md | 8 ++++----
 .github/workflows/build.yml                            | 9 ++++++---
 .vscode/settings.json                                  | 7 +++++++
 rust-toolchain.toml                                    | 2 +-
 rustfmt.toml                                           | 6 +++++-
 5 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md b/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md
index 86537df2..f871fb97 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md
@@ -1,4 +1,4 @@
-# Bump Rust Dependencies for Stackable Release XX.(X)X
+# Bump Rust Dependencies for Stackable Release YY.M.X
 
 <!--
     Make sure to update the link in 'issues/.github/ISSUE_TEMPLATE/pre-release-operator-rust-deps.md'
@@ -32,7 +32,7 @@ Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
 
 ```[tasklist]
 ### Bump Rust Dependencies
-- [ ] Bump `stackable-operator` and friends.
-- [ ] Bump `product-version`.
-- [ ] Bump all other dependencies.
+- [ ] Bump `stackable-operator` and friends
+- [ ] Bump `product-config`
+- [ ] Bump all other dependencies
 ```
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6dfae3b1..59f25a95 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,8 @@ env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: '0'
   CARGO_PROFILE_DEV_DEBUG: '0'
-  RUST_TOOLCHAIN_VERSION: "1.84.1"
+  RUST_TOOLCHAIN_VERSION: "1.85.0"
+  RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2025-01-15"
   PYTHON_VERSION: "3.12"
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: "-D warnings"
@@ -136,9 +137,11 @@ jobs:
           submodules: recursive
       - uses: dtolnay/rust-toolchain@c5a29ddb4d9d194e7c84ec8c3fba61b1c31fee8c
         with:
-          toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
+          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
           components: rustfmt
-      - run: cargo fmt --all -- --check
+      - env:
+          RUST_TOOLCHAIN_VERSION: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
+        run: cargo "+$RUST_TOOLCHAIN_VERSION" fmt --all -- --check
 
   run_clippy:
     name: Run Clippy
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..ddcd8aac
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "rust-analyzer.rustfmt.overrideCommand": [
+        "rustfmt",
+        "+nightly-2025-01-15",
+        "--"
+    ],
+}
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e7cf0381..fb21da0f 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 # DO NOT EDIT, this file is generated by operator-templating
 [toolchain]
-channel = "1.84.1"
+channel = "1.85.0"
diff --git a/rustfmt.toml b/rustfmt.toml
index e25d3967..07217b21 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,5 +1,9 @@
 # This file includes unstable features, so you need to run "cargo +nightly fmt" to format your code.
 # It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nigthly formatter is prefered.
 
+# https://doc.rust-lang.org/nightly/edition-guide/rust-2024/rustfmt-style-edition.html
+style_edition = "2024"
 imports_granularity = "Crate"
-group_imports =  "StdExternalCrate"
+group_imports = "StdExternalCrate"
+reorder_impl_items = true
+use_field_init_shorthand = true

From 0ef84cf9a859dc6e745dc8c2195e48d8f0c3152e Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Wed, 2 Apr 2025 19:41:27 +0200
Subject: [PATCH 2/6] fix: rustfmt lint

---
 rust/operator-binary/src/config/jvm.rs        |   5 +-
 rust/operator-binary/src/config/mod.rs        |  11 +-
 rust/operator-binary/src/container.rs         | 107 +++++++---------
 rust/operator-binary/src/crd/affinity.rs      | 118 +++++++++---------
 rust/operator-binary/src/crd/mod.rs           |  42 ++++---
 rust/operator-binary/src/crd/storage.rs       |  74 +++++------
 rust/operator-binary/src/discovery.rs         |   5 +-
 rust/operator-binary/src/event.rs             |  14 ++-
 ...dfs_clusterrolebinding_nodes_controller.rs |   2 +-
 rust/operator-binary/src/hdfs_controller.rs   |  19 ++-
 rust/operator-binary/src/main.rs              |  24 ++--
 rust/operator-binary/src/operations/pdb.rs    |   4 +-
 rust/operator-binary/src/product_logging.rs   |   2 +-
 rust/operator-binary/src/security/kerberos.rs |   2 +-
 14 files changed, 208 insertions(+), 221 deletions(-)

diff --git a/rust/operator-binary/src/config/jvm.rs b/rust/operator-binary/src/config/jvm.rs
index 16c92fc4..11ba39b6 100644
--- a/rust/operator-binary/src/config/jvm.rs
+++ b/rust/operator-binary/src/config/jvm.rs
@@ -6,7 +6,7 @@ use stackable_operator::{
 };
 
 use crate::{
-    crd::{constants::JVM_SECURITY_PROPERTIES_FILE, v1alpha1, HdfsNodeRole},
+    crd::{HdfsNodeRole, constants::JVM_SECURITY_PROPERTIES_FILE, v1alpha1},
     security::kerberos::KERBEROS_CONTAINER_PATH,
 };
 
@@ -186,7 +186,8 @@ mod tests {
                 -Dhttps.proxyHost=proxy.my.corp \
                 -Djava.net.preferIPv4Stack=true \
                 -Xmx40000m \
-                -Dhttps.proxyPort=1234")
+                -Dhttps.proxyPort=1234"
+            )
         );
     }
 
diff --git a/rust/operator-binary/src/config/mod.rs b/rust/operator-binary/src/config/mod.rs
index 8d06dfef..6f8a6fb2 100644
--- a/rust/operator-binary/src/config/mod.rs
+++ b/rust/operator-binary/src/config/mod.rs
@@ -4,17 +4,18 @@ use product_config::writer::to_hadoop_xml;
 use stackable_operator::utils::cluster_info::KubernetesClusterInfo;
 
 use crate::crd::{
+    HdfsPodRef,
     constants::{
-        DEFAULT_JOURNAL_NODE_RPC_PORT, DEFAULT_NAME_NODE_HTTPS_PORT, DEFAULT_NAME_NODE_HTTP_PORT,
+        DEFAULT_JOURNAL_NODE_RPC_PORT, DEFAULT_NAME_NODE_HTTP_PORT, DEFAULT_NAME_NODE_HTTPS_PORT,
         DEFAULT_NAME_NODE_RPC_PORT, DFS_DATANODE_DATA_DIR, DFS_HA_NAMENODES,
-        DFS_JOURNALNODE_EDITS_DIR, DFS_JOURNALNODE_RPC_ADDRESS, DFS_NAMENODE_HTTPS_ADDRESS,
-        DFS_NAMENODE_HTTP_ADDRESS, DFS_NAMENODE_NAME_DIR, DFS_NAMENODE_RPC_ADDRESS,
-        DFS_NAMENODE_SHARED_EDITS_DIR, DFS_NAME_SERVICES, DFS_REPLICATION, FS_DEFAULT_FS,
+        DFS_JOURNALNODE_EDITS_DIR, DFS_JOURNALNODE_RPC_ADDRESS, DFS_NAME_SERVICES,
+        DFS_NAMENODE_HTTP_ADDRESS, DFS_NAMENODE_HTTPS_ADDRESS, DFS_NAMENODE_NAME_DIR,
+        DFS_NAMENODE_RPC_ADDRESS, DFS_NAMENODE_SHARED_EDITS_DIR, DFS_REPLICATION, FS_DEFAULT_FS,
         HA_ZOOKEEPER_QUORUM, JOURNALNODE_ROOT_DATA_DIR, NAMENODE_ROOT_DATA_DIR,
         SERVICE_PORT_NAME_HTTP, SERVICE_PORT_NAME_HTTPS, SERVICE_PORT_NAME_RPC,
     },
     storage::{DataNodeStorageConfig, DataNodeStorageConfigInnerType},
-    v1alpha1, HdfsPodRef,
+    v1alpha1,
 };
 
 pub mod jvm;
diff --git a/rust/operator-binary/src/container.rs b/rust/operator-binary/src/container.rs
index d0aff95c..e2a45821 100644
--- a/rust/operator-binary/src/container.rs
+++ b/rust/operator-binary/src/container.rs
@@ -17,6 +17,7 @@ use stackable_operator::{
     builder::{
         self,
         pod::{
+            PodBuilder,
             container::ContainerBuilder,
             resources::ResourceRequirementsBuilder,
             volume::{
@@ -24,7 +25,6 @@ use stackable_operator::{
                 ListenerReference, SecretFormat, SecretOperatorVolumeSourceBuilder,
                 SecretOperatorVolumeSourceBuilderError, VolumeBuilder, VolumeMountBuilder,
             },
-            PodBuilder,
         },
     },
     commons::product_image_selection::ResolvedProductImage,
@@ -36,19 +36,19 @@ use stackable_operator::{
         },
         apimachinery::pkg::util::intstr::IntOrString,
     },
-    kube::{core::ObjectMeta, ResourceExt},
+    kube::{ResourceExt, core::ObjectMeta},
     kvp::Labels,
     product_logging::{
         self,
         framework::{
-            create_vector_shutdown_file_command, remove_vector_shutdown_file_command, LoggingError,
+            LoggingError, create_vector_shutdown_file_command, remove_vector_shutdown_file_command,
         },
         spec::{
             ConfigMapLogConfig, ContainerLogConfig, ContainerLogConfigChoice,
             CustomContainerLogConfig,
         },
     },
-    utils::{cluster_info::KubernetesClusterInfo, COMMON_BASH_TRAP_FUNCTIONS},
+    utils::{COMMON_BASH_TRAP_FUNCTIONS, cluster_info::KubernetesClusterInfo},
 };
 use strum::{Display, EnumDiscriminants, IntoStaticStr};
 
@@ -58,6 +58,8 @@ use crate::{
         jvm::{construct_global_jvm_args, construct_role_specific_jvm_args},
     },
     crd::{
+        AnyNodeConfig, DataNodeContainer, HdfsNodeRole, HdfsPodRef, NameNodeContainer,
+        UpgradeState,
         constants::{
             DATANODE_ROOT_DATA_DIR_PREFIX, DEFAULT_DATA_NODE_METRICS_PORT,
             DEFAULT_JOURNAL_NODE_METRICS_PORT, DEFAULT_NAME_NODE_METRICS_PORT, LISTENER_VOLUME_DIR,
@@ -69,8 +71,7 @@ use crate::{
             SERVICE_PORT_NAME_RPC, STACKABLE_ROOT_DATA_DIR,
         },
         storage::DataNodeStorageConfig,
-        v1alpha1, AnyNodeConfig, DataNodeContainer, HdfsNodeRole, HdfsPodRef, NameNodeContainer,
-        UpgradeState,
+        v1alpha1,
     },
     product_logging::{
         FORMAT_NAMENODES_LOG4J_CONFIG_FILE, FORMAT_ZOOKEEPER_LOG4J_CONFIG_FILE,
@@ -104,10 +105,9 @@ pub enum Error {
         role: String,
     },
 
-    #[snafu(
-        display("could not determine any ContainerConfig actions for {container_name:?}. Container not recognized."
-        )
-    )]
+    #[snafu(display(
+        "could not determine any ContainerConfig actions for {container_name:?}. Container not recognized."
+    ))]
     UnrecognizedContainerName { container_name: String },
 
     #[snafu(display("invalid container name {name:?}"))]
@@ -191,22 +191,20 @@ pub enum ContainerConfig {
 }
 
 impl ContainerConfig {
-    // volumes
-    pub const STACKABLE_LOG_VOLUME_MOUNT_NAME: &'static str = "log";
     pub const DATA_VOLUME_MOUNT_NAME: &'static str = "data";
-    pub const HDFS_CONFIG_VOLUME_MOUNT_NAME: &'static str = "hdfs-config";
-
-    const HDFS_LOG_VOLUME_MOUNT_NAME: &'static str = "hdfs-log-config";
-    const ZKFC_CONFIG_VOLUME_MOUNT_NAME: &'static str = "zkfc-config";
-    const ZKFC_LOG_VOLUME_MOUNT_NAME: &'static str = "zkfc-log-config";
     const FORMAT_NAMENODES_CONFIG_VOLUME_MOUNT_NAME: &'static str = "format-namenodes-config";
     const FORMAT_NAMENODES_LOG_VOLUME_MOUNT_NAME: &'static str = "format-namenodes-log-config";
     const FORMAT_ZOOKEEPER_CONFIG_VOLUME_MOUNT_NAME: &'static str = "format-zookeeper-config";
     const FORMAT_ZOOKEEPER_LOG_VOLUME_MOUNT_NAME: &'static str = "format-zookeeper-log-config";
+    const HADOOP_HOME: &'static str = "/stackable/hadoop";
+    pub const HDFS_CONFIG_VOLUME_MOUNT_NAME: &'static str = "hdfs-config";
+    const HDFS_LOG_VOLUME_MOUNT_NAME: &'static str = "hdfs-log-config";
+    // volumes
+    pub const STACKABLE_LOG_VOLUME_MOUNT_NAME: &'static str = "log";
     const WAIT_FOR_NAMENODES_CONFIG_VOLUME_MOUNT_NAME: &'static str = "wait-for-namenodes-config";
     const WAIT_FOR_NAMENODES_LOG_VOLUME_MOUNT_NAME: &'static str = "wait-for-namenodes-log-config";
-
-    const HADOOP_HOME: &'static str = "/stackable/hadoop";
+    const ZKFC_CONFIG_VOLUME_MOUNT_NAME: &'static str = "zkfc-config";
+    const ZKFC_LOG_VOLUME_MOUNT_NAME: &'static str = "zkfc-log-config";
 
     /// Add all main, side and init containers as well as required volumes to the pod builder.
     #[allow(clippy::too_many_arguments)]
@@ -802,7 +800,9 @@ wait_for_termination $!
 
     // Command to export `KERBEROS_REALM` env var to default real from krb5.conf, e.g. `CLUSTER.LOCAL`
     fn export_kerberos_real_env_var_command() -> String {
-        format!("export KERBEROS_REALM=$(grep -oP 'default_realm = \\K.*' {KERBEROS_CONTAINER_PATH}/krb5.conf)\n")
+        format!(
+            "export KERBEROS_REALM=$(grep -oP 'default_realm = \\K.*' {KERBEROS_CONTAINER_PATH}/krb5.conf)\n"
+        )
     }
 
     /// Command to `kinit` a ticket using the principal created for the specified hdfs role
@@ -869,52 +869,37 @@ wait_for_termination $!
         // See https://github.com/stackabletech/hdfs-operator/issues/138 for details
         if let ContainerConfig::Hdfs { role, .. } = self {
             let role_opts_name = role.hadoop_opts_env_var_for_role().to_string();
-            env.insert(
-                role_opts_name.clone(),
-                EnvVar {
-                    name: role_opts_name,
-                    value: Some(self.build_hadoop_opts(hdfs, role_group, resources)?),
-                    ..EnvVar::default()
-                },
-            );
+            env.insert(role_opts_name.clone(), EnvVar {
+                name: role_opts_name,
+                value: Some(self.build_hadoop_opts(hdfs, role_group, resources)?),
+                ..EnvVar::default()
+            });
         }
 
-        env.insert(
-            "HADOOP_OPTS".to_string(),
-            EnvVar {
-                name: "HADOOP_OPTS".to_string(),
-                value: Some(construct_global_jvm_args(hdfs.has_kerberos_enabled())),
-                ..EnvVar::default()
-            },
-        );
+        env.insert("HADOOP_OPTS".to_string(), EnvVar {
+            name: "HADOOP_OPTS".to_string(),
+            value: Some(construct_global_jvm_args(hdfs.has_kerberos_enabled())),
+            ..EnvVar::default()
+        });
         if hdfs.has_kerberos_enabled() {
-            env.insert(
-                "KRB5_CONFIG".to_string(),
-                EnvVar {
-                    name: "KRB5_CONFIG".to_string(),
-                    value: Some(format!("{KERBEROS_CONTAINER_PATH}/krb5.conf")),
-                    ..EnvVar::default()
-                },
-            );
-            env.insert(
-                "KRB5_CLIENT_KTNAME".to_string(),
-                EnvVar {
-                    name: "KRB5_CLIENT_KTNAME".to_string(),
-                    value: Some(format!("{KERBEROS_CONTAINER_PATH}/keytab")),
-                    ..EnvVar::default()
-                },
-            );
+            env.insert("KRB5_CONFIG".to_string(), EnvVar {
+                name: "KRB5_CONFIG".to_string(),
+                value: Some(format!("{KERBEROS_CONTAINER_PATH}/krb5.conf")),
+                ..EnvVar::default()
+            });
+            env.insert("KRB5_CLIENT_KTNAME".to_string(), EnvVar {
+                name: "KRB5_CLIENT_KTNAME".to_string(),
+                value: Some(format!("{KERBEROS_CONTAINER_PATH}/keytab")),
+                ..EnvVar::default()
+            });
         }
 
         // Needed for the `containerdebug` process to log it's tracing information to.
-        env.insert(
-            "CONTAINERDEBUG_LOG_DIRECTORY".to_string(),
-            EnvVar {
-                name: "CONTAINERDEBUG_LOG_DIRECTORY".to_string(),
-                value: Some(format!("{STACKABLE_LOG_DIR}/containerdebug")),
-                value_from: None,
-            },
-        );
+        env.insert("CONTAINERDEBUG_LOG_DIRECTORY".to_string(), EnvVar {
+            name: "CONTAINERDEBUG_LOG_DIRECTORY".to_string(),
+            value: Some(format!("{STACKABLE_LOG_DIR}/containerdebug")),
+            value_from: None,
+        });
 
         // Overrides need to come last
         let mut env_override_vars: BTreeMap<String, EnvVar> =
@@ -1457,6 +1442,7 @@ impl ContainerVolumeDirs {
     pub fn config_mount(&self) -> &str {
         self.config_mount.as_str()
     }
+
     pub fn config_mount_name(&self) -> &str {
         self.config_mount_name.as_str()
     }
@@ -1464,6 +1450,7 @@ impl ContainerVolumeDirs {
     pub fn log_mount(&self) -> &str {
         self.log_mount.as_str()
     }
+
     pub fn log_mount_name(&self) -> &str {
         self.log_mount_name.as_str()
     }
diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs
index 05f86f9f..6e169f62 100644
--- a/rust/operator-binary/src/crd/affinity.rs
+++ b/rust/operator-binary/src/crd/affinity.rs
@@ -1,11 +1,11 @@
 use stackable_operator::{
     commons::affinity::{
-        affinity_between_cluster_pods, affinity_between_role_pods, StackableAffinityFragment,
+        StackableAffinityFragment, affinity_between_cluster_pods, affinity_between_role_pods,
     },
     k8s_openapi::api::core::v1::{PodAffinity, PodAntiAffinity},
 };
 
-use crate::crd::{constants::APP_NAME, HdfsNodeRole};
+use crate::crd::{HdfsNodeRole, constants::APP_NAME};
 
 pub fn get_affinity(cluster_name: &str, role: &HdfsNodeRole) -> StackableAffinityFragment {
     StackableAffinityFragment {
@@ -41,7 +41,7 @@ mod test {
         },
     };
 
-    use crate::crd::{v1alpha1, HdfsNodeRole};
+    use crate::crd::{HdfsNodeRole, v1alpha1};
 
     #[rstest]
     #[case(HdfsNodeRole::Journal)]
@@ -74,64 +74,58 @@ spec:
         let hdfs: v1alpha1::HdfsCluster = serde_yaml::from_str(input).unwrap();
         let merged_config = role.merged_config(&hdfs, "default").unwrap();
 
-        assert_eq!(
-            merged_config.affinity,
-            StackableAffinity {
-                pod_affinity: Some(PodAffinity {
-                    preferred_during_scheduling_ignored_during_execution: Some(vec![
-                        WeightedPodAffinityTerm {
-                            pod_affinity_term: PodAffinityTerm {
-                                label_selector: Some(LabelSelector {
-                                    match_expressions: None,
-                                    match_labels: Some(BTreeMap::from([
-                                        ("app.kubernetes.io/name".to_string(), "hdfs".to_string(),),
-                                        (
-                                            "app.kubernetes.io/instance".to_string(),
-                                            "simple-hdfs".to_string(),
-                                        ),
-                                    ]))
-                                }),
-                                namespace_selector: None,
-                                namespaces: None,
-                                topology_key: "kubernetes.io/hostname".to_string(),
-                                ..PodAffinityTerm::default()
-                            },
-                            weight: 20
-                        }
-                    ]),
-                    required_during_scheduling_ignored_during_execution: None,
-                }),
-                pod_anti_affinity: Some(PodAntiAffinity {
-                    preferred_during_scheduling_ignored_during_execution: Some(vec![
-                        WeightedPodAffinityTerm {
-                            pod_affinity_term: PodAffinityTerm {
-                                label_selector: Some(LabelSelector {
-                                    match_expressions: None,
-                                    match_labels: Some(BTreeMap::from([
-                                        ("app.kubernetes.io/name".to_string(), "hdfs".to_string(),),
-                                        (
-                                            "app.kubernetes.io/instance".to_string(),
-                                            "simple-hdfs".to_string(),
-                                        ),
-                                        (
-                                            "app.kubernetes.io/component".to_string(),
-                                            role.to_string(),
-                                        )
-                                    ]))
-                                }),
-                                namespace_selector: None,
-                                namespaces: None,
-                                topology_key: "kubernetes.io/hostname".to_string(),
-                                ..PodAffinityTerm::default()
-                            },
-                            weight: 70
-                        }
-                    ]),
-                    required_during_scheduling_ignored_during_execution: None,
-                }),
-                node_affinity: None,
-                node_selector: None,
-            }
-        );
+        assert_eq!(merged_config.affinity, StackableAffinity {
+            pod_affinity: Some(PodAffinity {
+                preferred_during_scheduling_ignored_during_execution: Some(vec![
+                    WeightedPodAffinityTerm {
+                        pod_affinity_term: PodAffinityTerm {
+                            label_selector: Some(LabelSelector {
+                                match_expressions: None,
+                                match_labels: Some(BTreeMap::from([
+                                    ("app.kubernetes.io/name".to_string(), "hdfs".to_string(),),
+                                    (
+                                        "app.kubernetes.io/instance".to_string(),
+                                        "simple-hdfs".to_string(),
+                                    ),
+                                ]))
+                            }),
+                            namespace_selector: None,
+                            namespaces: None,
+                            topology_key: "kubernetes.io/hostname".to_string(),
+                            ..PodAffinityTerm::default()
+                        },
+                        weight: 20
+                    }
+                ]),
+                required_during_scheduling_ignored_during_execution: None,
+            }),
+            pod_anti_affinity: Some(PodAntiAffinity {
+                preferred_during_scheduling_ignored_during_execution: Some(vec![
+                    WeightedPodAffinityTerm {
+                        pod_affinity_term: PodAffinityTerm {
+                            label_selector: Some(LabelSelector {
+                                match_expressions: None,
+                                match_labels: Some(BTreeMap::from([
+                                    ("app.kubernetes.io/name".to_string(), "hdfs".to_string(),),
+                                    (
+                                        "app.kubernetes.io/instance".to_string(),
+                                        "simple-hdfs".to_string(),
+                                    ),
+                                    ("app.kubernetes.io/component".to_string(), role.to_string(),)
+                                ]))
+                            }),
+                            namespace_selector: None,
+                            namespaces: None,
+                            topology_key: "kubernetes.io/hostname".to_string(),
+                            ..PodAffinityTerm::default()
+                        },
+                        weight: 70
+                    }
+                ]),
+                required_during_scheduling_ignored_during_execution: None,
+            }),
+            node_affinity: None,
+            node_selector: None,
+        });
     }
 }
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
index 3783a662..a6ea5769 100644
--- a/rust/operator-binary/src/crd/mod.rs
+++ b/rust/operator-binary/src/crd/mod.rs
@@ -31,7 +31,7 @@ use stackable_operator::{
         api::core::v1::{Pod, PodTemplateSpec},
         apimachinery::pkg::api::resource::Quantity,
     },
-    kube::{runtime::reflector::ObjectRef, CustomResource, ResourceExt},
+    kube::{CustomResource, ResourceExt, runtime::reflector::ObjectRef},
     kvp::{LabelError, Labels},
     product_config_utils::{Configuration, Error as ConfigError},
     product_logging::{
@@ -54,13 +54,13 @@ use crate::crd::{
     affinity::get_affinity,
     constants::{
         APP_NAME, CORE_SITE_XML, DEFAULT_DATA_NODE_DATA_PORT,
-        DEFAULT_DATA_NODE_GRACEFUL_SHUTDOWN_TIMEOUT, DEFAULT_DATA_NODE_HTTPS_PORT,
-        DEFAULT_DATA_NODE_HTTP_PORT, DEFAULT_DATA_NODE_IPC_PORT, DEFAULT_DATA_NODE_METRICS_PORT,
+        DEFAULT_DATA_NODE_GRACEFUL_SHUTDOWN_TIMEOUT, DEFAULT_DATA_NODE_HTTP_PORT,
+        DEFAULT_DATA_NODE_HTTPS_PORT, DEFAULT_DATA_NODE_IPC_PORT, DEFAULT_DATA_NODE_METRICS_PORT,
         DEFAULT_DFS_REPLICATION_FACTOR, DEFAULT_JOURNAL_NODE_GRACEFUL_SHUTDOWN_TIMEOUT,
-        DEFAULT_JOURNAL_NODE_HTTPS_PORT, DEFAULT_JOURNAL_NODE_HTTP_PORT,
+        DEFAULT_JOURNAL_NODE_HTTP_PORT, DEFAULT_JOURNAL_NODE_HTTPS_PORT,
         DEFAULT_JOURNAL_NODE_METRICS_PORT, DEFAULT_JOURNAL_NODE_RPC_PORT, DEFAULT_LISTENER_CLASS,
-        DEFAULT_NAME_NODE_GRACEFUL_SHUTDOWN_TIMEOUT, DEFAULT_NAME_NODE_HTTPS_PORT,
-        DEFAULT_NAME_NODE_HTTP_PORT, DEFAULT_NAME_NODE_METRICS_PORT, DEFAULT_NAME_NODE_RPC_PORT,
+        DEFAULT_NAME_NODE_GRACEFUL_SHUTDOWN_TIMEOUT, DEFAULT_NAME_NODE_HTTP_PORT,
+        DEFAULT_NAME_NODE_HTTPS_PORT, DEFAULT_NAME_NODE_METRICS_PORT, DEFAULT_NAME_NODE_RPC_PORT,
         DFS_REPLICATION, HADOOP_POLICY_XML, HDFS_SITE_XML, JVM_SECURITY_PROPERTIES_FILE,
         LISTENER_VOLUME_NAME, SERVICE_PORT_NAME_DATA, SERVICE_PORT_NAME_HTTP,
         SERVICE_PORT_NAME_HTTPS, SERVICE_PORT_NAME_IPC, SERVICE_PORT_NAME_METRICS,
@@ -804,6 +804,7 @@ pub enum AnyNodeConfig {
 
 impl Deref for AnyNodeConfig {
     type Target = CommonNodeConfig;
+
     fn deref(&self) -> &Self::Target {
         match self {
             AnyNodeConfig::Name(node) => &node.common,
@@ -822,6 +823,7 @@ impl AnyNodeConfig {
             None
         }
     }
+
     pub fn as_datanode(&self) -> Option<&DataNodeConfig> {
         if let Self::Data(node) = self {
             Some(node)
@@ -829,6 +831,7 @@ impl AnyNodeConfig {
             None
         }
     }
+
     pub fn as_journalnode(&self) -> Option<&JournalNodeConfig> {
         if let Self::Journal(node) = self {
             Some(node)
@@ -846,6 +849,7 @@ impl AnyNodeConfig {
             AnyNodeConfig::Journal(node) => node.logging.for_container(&JournalNodeContainer::Hdfs),
         }
     }
+
     pub fn vector_logging(&self) -> Cow<ContainerLogConfig> {
         match &self {
             AnyNodeConfig::Name(node) => node.logging.for_container(&NameNodeContainer::Vector),
@@ -855,6 +859,7 @@ impl AnyNodeConfig {
             }
         }
     }
+
     pub fn vector_logging_enabled(&self) -> bool {
         match self {
             AnyNodeConfig::Name(node) => node.logging.enable_vector_agent,
@@ -862,6 +867,7 @@ impl AnyNodeConfig {
             AnyNodeConfig::Journal(node) => node.logging.enable_vector_agent,
         }
     }
+
     pub fn requested_secret_lifetime(&self) -> Option<Duration> {
         match self {
             AnyNodeConfig::Name(node) => node.common.requested_secret_lifetime,
@@ -1096,7 +1102,9 @@ pub enum UpgradeState {
 #[derive(Debug, Snafu)]
 #[snafu(module)]
 pub enum UpgradeStateError {
-    #[snafu(display("requested version {requested_version:?} while still upgrading from {deployed_version:?} to {upgrading_version:?}, please finish the upgrade or downgrade first"))]
+    #[snafu(display(
+        "requested version {requested_version:?} while still upgrading from {deployed_version:?} to {upgrading_version:?}, please finish the upgrade or downgrade first"
+    ))]
     InvalidCrossgrade {
         requested_version: String,
         deployed_version: String,
@@ -1309,18 +1317,15 @@ impl DataNodeConfigFragment {
                     limit: Some(Quantity("512Mi".to_owned())),
                     runtime_limits: NoRuntimeLimitsFragment {},
                 },
-                storage: BTreeMap::from([(
-                    "data".to_string(),
-                    DataNodePvcFragment {
-                        pvc: PvcConfigFragment {
-                            capacity: Some(Quantity("10Gi".to_owned())),
-                            storage_class: None,
-                            selectors: None,
-                        },
-                        count: Some(1),
-                        hdfs_storage_type: Some(HdfsStorageType::default()),
+                storage: BTreeMap::from([("data".to_string(), DataNodePvcFragment {
+                    pvc: PvcConfigFragment {
+                        capacity: Some(Quantity("10Gi".to_owned())),
+                        storage_class: None,
+                        selectors: None,
                     },
-                )]),
+                    count: Some(1),
+                    hdfs_storage_type: Some(HdfsStorageType::default()),
+                })]),
             },
             logging: product_logging::spec::default_logging(),
             listener_class: Some(DEFAULT_LISTENER_CLASS.to_string()),
@@ -1416,6 +1421,7 @@ pub struct JournalNodeConfig {
 
 impl JournalNodeConfigFragment {
     const DEFAULT_JOURNAL_NODE_SECRET_LIFETIME: Duration = Duration::from_days_unchecked(1);
+
     pub fn default_config(cluster_name: &str, role: &HdfsNodeRole) -> Self {
         Self {
             resources: ResourcesFragment {
diff --git a/rust/operator-binary/src/crd/storage.rs b/rust/operator-binary/src/crd/storage.rs
index 7353405a..317730dc 100644
--- a/rust/operator-binary/src/crd/storage.rs
+++ b/rust/operator-binary/src/crd/storage.rs
@@ -198,18 +198,15 @@ mod test {
     #[test]
     pub fn test_datanode_storage_defaults() {
         let data_node_storage = DataNodeStorageConfig {
-            pvcs: BTreeMap::from([(
-                "data".to_string(),
-                DataNodePvc {
-                    pvc: PvcConfig {
-                        capacity: Some(Quantity("5Gi".to_owned())),
-                        storage_class: None,
-                        selectors: None,
-                    },
-                    count: 1,
-                    hdfs_storage_type: HdfsStorageType::default(),
+            pvcs: BTreeMap::from([("data".to_string(), DataNodePvc {
+                pvc: PvcConfig {
+                    capacity: Some(Quantity("5Gi".to_owned())),
+                    storage_class: None,
+                    selectors: None,
                 },
-            )]),
+                count: 1,
+                hdfs_storage_type: HdfsStorageType::default(),
+            })]),
         };
 
         let pvcs = data_node_storage.build_pvcs();
@@ -239,36 +236,30 @@ mod test {
     pub fn test_datanode_storage_multiple_storage_types() {
         let data_node_storage = DataNodeStorageConfig {
             pvcs: BTreeMap::from([
-                (
-                    "hdd".to_string(),
-                    DataNodePvc {
-                        pvc: PvcConfig {
-                            capacity: Some(Quantity("12Ti".to_owned())),
-                            storage_class: Some("hdd-storage-class".to_string()),
-                            selectors: Some(LabelSelector {
-                                match_expressions: None,
-                                match_labels: Some(BTreeMap::from([(
-                                    "foo".to_string(),
-                                    "bar".to_string(),
-                                )])),
-                            }),
-                        },
-                        count: 8,
-                        hdfs_storage_type: HdfsStorageType::Disk,
+                ("hdd".to_string(), DataNodePvc {
+                    pvc: PvcConfig {
+                        capacity: Some(Quantity("12Ti".to_owned())),
+                        storage_class: Some("hdd-storage-class".to_string()),
+                        selectors: Some(LabelSelector {
+                            match_expressions: None,
+                            match_labels: Some(BTreeMap::from([(
+                                "foo".to_string(),
+                                "bar".to_string(),
+                            )])),
+                        }),
                     },
-                ),
-                (
-                    "ssd".to_string(),
-                    DataNodePvc {
-                        pvc: PvcConfig {
-                            capacity: Some(Quantity("2Ti".to_owned())),
-                            storage_class: Some("premium-ssd".to_string()),
-                            selectors: None,
-                        },
-                        count: 4,
-                        hdfs_storage_type: HdfsStorageType::Ssd,
+                    count: 8,
+                    hdfs_storage_type: HdfsStorageType::Disk,
+                }),
+                ("ssd".to_string(), DataNodePvc {
+                    pvc: PvcConfig {
+                        capacity: Some(Quantity("2Ti".to_owned())),
+                        storage_class: Some("premium-ssd".to_string()),
+                        selectors: None,
                     },
-                ),
+                    count: 4,
+                    hdfs_storage_type: HdfsStorageType::Ssd,
+                }),
             ]),
         };
         let pvcs = data_node_storage.build_pvcs();
@@ -295,6 +286,9 @@ mod test {
                 ..PersistentVolumeClaimSpec::default()
             })
         );
-        assert_eq!(datanode_data_dir, "[DISK]/stackable/data/hdd/datanode,[DISK]/stackable/data/hdd-1/datanode,[DISK]/stackable/data/hdd-2/datanode,[DISK]/stackable/data/hdd-3/datanode,[DISK]/stackable/data/hdd-4/datanode,[DISK]/stackable/data/hdd-5/datanode,[DISK]/stackable/data/hdd-6/datanode,[DISK]/stackable/data/hdd-7/datanode,[SSD]/stackable/data/ssd/datanode,[SSD]/stackable/data/ssd-1/datanode,[SSD]/stackable/data/ssd-2/datanode,[SSD]/stackable/data/ssd-3/datanode")
+        assert_eq!(
+            datanode_data_dir,
+            "[DISK]/stackable/data/hdd/datanode,[DISK]/stackable/data/hdd-1/datanode,[DISK]/stackable/data/hdd-2/datanode,[DISK]/stackable/data/hdd-3/datanode,[DISK]/stackable/data/hdd-4/datanode,[DISK]/stackable/data/hdd-5/datanode,[DISK]/stackable/data/hdd-6/datanode,[DISK]/stackable/data/hdd-7/datanode,[SSD]/stackable/data/ssd/datanode,[SSD]/stackable/data/ssd-1/datanode,[SSD]/stackable/data/ssd-2/datanode,[SSD]/stackable/data/ssd-3/datanode"
+        )
     }
 }
diff --git a/rust/operator-binary/src/discovery.rs b/rust/operator-binary/src/discovery.rs
index dc09b5e4..0614a6e2 100644
--- a/rust/operator-binary/src/discovery.rs
+++ b/rust/operator-binary/src/discovery.rs
@@ -3,7 +3,7 @@ use stackable_operator::{
     builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
     commons::product_image_selection::ResolvedProductImage,
     k8s_openapi::api::core::v1::ConfigMap,
-    kube::{runtime::reflector::ObjectRef, ResourceExt},
+    kube::{ResourceExt, runtime::reflector::ObjectRef},
     utils::cluster_info::KubernetesClusterInfo,
 };
 
@@ -11,8 +11,9 @@ use crate::{
     build_recommended_labels,
     config::{CoreSiteConfigBuilder, HdfsSiteConfigBuilder},
     crd::{
+        HdfsNodeRole, HdfsPodRef,
         constants::{CORE_SITE_XML, HDFS_SITE_XML},
-        v1alpha1, HdfsNodeRole, HdfsPodRef,
+        v1alpha1,
     },
     security::kerberos,
 };
diff --git a/rust/operator-binary/src/event.rs b/rust/operator-binary/src/event.rs
index e0b65f58..053502e4 100644
--- a/rust/operator-binary/src/event.rs
+++ b/rust/operator-binary/src/event.rs
@@ -6,7 +6,7 @@ use stackable_operator::{
 use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
-    crd::{v1alpha1, HdfsNodeRole},
+    crd::{HdfsNodeRole, v1alpha1},
     hdfs_controller::Ctx,
 };
 
@@ -57,11 +57,17 @@ pub fn build_invalid_replica_message(
     let min_replicas = role.min_replicas();
 
     if replicas < min_replicas {
-        Some(format!("{role_name}: only has {replicas} replicas configured, it is strongly recommended to use at least [{min_replicas}]"))
+        Some(format!(
+            "{role_name}: only has {replicas} replicas configured, it is strongly recommended to use at least [{min_replicas}]"
+        ))
     } else if !role.replicas_can_be_even() && replicas % 2 == 0 {
-        Some(format!("{role_name}: currently has an even number of replicas [{replicas}], but should always have an odd number to ensure quorum"))
+        Some(format!(
+            "{role_name}: currently has an even number of replicas [{replicas}], but should always have an odd number to ensure quorum"
+        ))
     } else if !role.replicas_can_be_even() && replicas < dfs_replication as u16 {
-        Some(format!("{role_name}: HDFS replication factor [{dfs_replication}] is configured greater than data node replicas [{replicas}]"))
+        Some(format!(
+            "{role_name}: HDFS replication factor [{dfs_replication}] is configured greater than data node replicas [{replicas}]"
+        ))
     } else {
         None
     }
diff --git a/rust/operator-binary/src/hdfs_clusterrolebinding_nodes_controller.rs b/rust/operator-binary/src/hdfs_clusterrolebinding_nodes_controller.rs
index 7faad530..c963ea17 100644
--- a/rust/operator-binary/src/hdfs_clusterrolebinding_nodes_controller.rs
+++ b/rust/operator-binary/src/hdfs_clusterrolebinding_nodes_controller.rs
@@ -3,13 +3,13 @@ use stackable_operator::{
     commons::rbac::build_rbac_resources,
     k8s_openapi::api::rbac::v1::{ClusterRoleBinding, Subject},
     kube::{
+        Api, Client, ResourceExt,
         api::{Patch, PatchParams},
         core::PartialObjectMeta,
         runtime::{
             reflector::{ObjectRef, Store},
             watcher,
         },
-        Api, Client, ResourceExt,
     },
     kvp::Labels,
 };
diff --git a/rust/operator-binary/src/hdfs_controller.rs b/rust/operator-binary/src/hdfs_controller.rs
index f124209c..ccf5f52b 100644
--- a/rust/operator-binary/src/hdfs_controller.rs
+++ b/rust/operator-binary/src/hdfs_controller.rs
@@ -5,34 +5,34 @@ use std::{
 
 use const_format::concatcp;
 use product_config::{
-    types::PropertyNameKind,
-    writer::{to_hadoop_xml, to_java_properties_string, PropertiesWriterError},
     ProductConfigManager,
+    types::PropertyNameKind,
+    writer::{PropertiesWriterError, to_hadoop_xml, to_java_properties_string},
 };
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     builder::{
         configmap::ConfigMapBuilder,
         meta::ObjectMetaBuilder,
-        pod::{security::PodSecurityContextBuilder, PodBuilder},
+        pod::{PodBuilder, security::PodSecurityContextBuilder},
     },
     client::Client,
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
     commons::{product_image_selection::ResolvedProductImage, rbac::build_rbac_resources},
     iter::reverse_if,
     k8s_openapi::{
+        DeepMerge,
         api::{
             apps::v1::{StatefulSet, StatefulSetSpec},
             core::v1::{ConfigMap, Service, ServiceAccount, ServicePort, ServiceSpec},
         },
         apimachinery::pkg::apis::meta::v1::LabelSelector,
-        DeepMerge,
     },
     kube::{
+        Resource, ResourceExt,
         api::ObjectMeta,
-        core::{error_boundary, DeserializeGuard},
+        core::{DeserializeGuard, error_boundary},
         runtime::{controller::Action, events::Recorder, reflector::ObjectRef},
-        Resource, ResourceExt,
     },
     kvp::{Label, LabelError, Labels},
     logging::controller::ReconcilerError,
@@ -51,12 +51,12 @@ use stackable_operator::{
 use strum::{EnumDiscriminants, IntoEnumIterator, IntoStaticStr};
 
 use crate::{
-    build_recommended_labels,
+    OPERATOR_NAME, build_recommended_labels,
     config::{CoreSiteConfigBuilder, HdfsSiteConfigBuilder},
     container::{self, ContainerConfig, TLS_STORE_DIR, TLS_STORE_PASSWORD},
     crd::{
-        constants::*, v1alpha1, AnyNodeConfig, HdfsClusterStatus, HdfsNodeRole, HdfsPodRef,
-        UpgradeState, UpgradeStateError,
+        AnyNodeConfig, HdfsClusterStatus, HdfsNodeRole, HdfsPodRef, UpgradeState,
+        UpgradeStateError, constants::*, v1alpha1,
     },
     discovery::{self, build_discovery_configmap},
     event::{build_invalid_replica_message, publish_warning_event},
@@ -66,7 +66,6 @@ use crate::{
     },
     product_logging::{extend_role_group_config_map, resolve_vector_aggregator_address},
     security::{self, kerberos, opa::HdfsOpaConfig},
-    OPERATOR_NAME,
 };
 
 pub const RESOURCE_MANAGER_HDFS_CONTROLLER: &str = "hdfs-operator-hdfs-controller";
diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs
index 93b0ab4a..7012f8e0 100644
--- a/rust/operator-binary/src/main.rs
+++ b/rust/operator-binary/src/main.rs
@@ -1,10 +1,11 @@
 use std::sync::Arc;
 
-use clap::{crate_description, crate_version, Parser};
-use futures::{pin_mut, StreamExt};
+use clap::{Parser, crate_description, crate_version};
+use futures::{StreamExt, pin_mut};
 use hdfs_controller::HDFS_FULL_CONTROLLER_NAME;
 use product_config::ProductConfigManager;
 use stackable_operator::{
+    YamlSchema,
     cli::{Command, ProductOperatorRun},
     client::{self, Client},
     k8s_openapi::api::{
@@ -12,24 +13,24 @@ use stackable_operator::{
         core::v1::{ConfigMap, Service},
     },
     kube::{
+        Api,
         api::PartialObjectMeta,
         core::DeserializeGuard,
         runtime::{
+            Controller,
             events::{Recorder, Reporter},
-            reflector, watcher, Controller,
+            reflector, watcher,
         },
-        Api,
     },
     kvp::ObjectLabels,
     logging::controller::report_controller_reconciled,
     namespace::WatchNamespace,
     shared::yaml::SerializeOptions,
-    YamlSchema,
 };
 use tracing::info_span;
 use tracing_futures::Instrument;
 
-use crate::crd::{constants::APP_NAME, v1alpha1, HdfsCluster};
+use crate::crd::{HdfsCluster, constants::APP_NAME, v1alpha1};
 
 mod config;
 mod container;
@@ -102,13 +103,10 @@ pub async fn create_controller(
 ) {
     let (store, store_w) = reflector::store();
 
-    let hdfs_event_recorder = Arc::new(Recorder::new(
-        client.as_kube_client(),
-        Reporter {
-            controller: HDFS_FULL_CONTROLLER_NAME.to_string(),
-            instance: None,
-        },
-    ));
+    let hdfs_event_recorder = Arc::new(Recorder::new(client.as_kube_client(), Reporter {
+        controller: HDFS_FULL_CONTROLLER_NAME.to_string(),
+        instance: None,
+    }));
 
     // The topology provider will need to build label information by querying kubernetes nodes and this
     // requires the clusterrole 'hdfs-clusterrole-nodes': this is bound to each deployed HDFS cluster
diff --git a/rust/operator-binary/src/operations/pdb.rs b/rust/operator-binary/src/operations/pdb.rs
index e6265775..c54e4f72 100644
--- a/rust/operator-binary/src/operations/pdb.rs
+++ b/rust/operator-binary/src/operations/pdb.rs
@@ -7,9 +7,9 @@ use stackable_operator::{
 };
 
 use crate::{
-    crd::{constants::APP_NAME, v1alpha1, HdfsNodeRole},
-    hdfs_controller::RESOURCE_MANAGER_HDFS_CONTROLLER,
     OPERATOR_NAME,
+    crd::{HdfsNodeRole, constants::APP_NAME, v1alpha1},
+    hdfs_controller::RESOURCE_MANAGER_HDFS_CONTROLLER,
 };
 
 #[derive(Snafu, Debug)]
diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs
index a411024d..9135f955 100644
--- a/rust/operator-binary/src/product_logging.rs
+++ b/rust/operator-binary/src/product_logging.rs
@@ -14,7 +14,7 @@ use stackable_operator::{
     role_utils::RoleGroupRef,
 };
 
-use crate::crd::{v1alpha1, AnyNodeConfig, DataNodeContainer, NameNodeContainer};
+use crate::crd::{AnyNodeConfig, DataNodeContainer, NameNodeContainer, v1alpha1};
 
 #[derive(Snafu, Debug)]
 pub enum Error {
diff --git a/rust/operator-binary/src/security/kerberos.rs b/rust/operator-binary/src/security/kerberos.rs
index 7b26a6cd..c960d913 100644
--- a/rust/operator-binary/src/security/kerberos.rs
+++ b/rust/operator-binary/src/security/kerberos.rs
@@ -1,6 +1,6 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
-    kube::{runtime::reflector::ObjectRef, ResourceExt},
+    kube::{ResourceExt, runtime::reflector::ObjectRef},
     utils::cluster_info::KubernetesClusterInfo,
 };
 

From 3b057ebb87ed9997db4fbc73db5d702a633ace36 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Wed, 2 Apr 2025 20:48:51 +0200
Subject: [PATCH 3/6] ci: use nightly toolchain for cargo udeps

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59f25a95..a59eb27f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,7 +55,7 @@ jobs:
           submodules: recursive
       - uses: dtolnay/rust-toolchain@c5a29ddb4d9d194e7c84ec8c3fba61b1c31fee8c
         with:
-          toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
+          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
       - uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
         with:
           key: udeps

From 2262af4494cd5cf3ba24024500707392304ff24f Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Wed, 2 Apr 2025 21:02:41 +0200
Subject: [PATCH 4/6] ci: use nightly toolchain for cargo udeps

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a59eb27f..81b13cb7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
           key: udeps
           cache-all-crates: "true"
       - uses: stackabletech/cargo-install-action@cargo-udeps
-      - run: cargo udeps --workspace --all-targets
+      - run: cargo "+$RUST_NIGHTLY_TOOLCHAIN_VERSION" udeps --workspace --all-targets
 
   # This job evaluates the github environment to determine why this action is running and selects the appropriate
   # target repository for published Helm charts based on this.

From 35c79c5609ee4b46e1c85601223375f22550ab31 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Thu, 3 Apr 2025 13:40:32 +0200
Subject: [PATCH 5/6] Revert "ci: use nightly toolchain for cargo udeps"

This reverts commit 2262af4494cd5cf3ba24024500707392304ff24f.
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 81b13cb7..a59eb27f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
           key: udeps
           cache-all-crates: "true"
       - uses: stackabletech/cargo-install-action@cargo-udeps
-      - run: cargo "+$RUST_NIGHTLY_TOOLCHAIN_VERSION" udeps --workspace --all-targets
+      - run: cargo udeps --workspace --all-targets
 
   # This job evaluates the github environment to determine why this action is running and selects the appropriate
   # target repository for published Helm charts based on this.

From b43f6f70963177b4c12cee36d8b04d1d17824f3d Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Thu, 3 Apr 2025 13:40:32 +0200
Subject: [PATCH 6/6] Revert "ci: use nightly toolchain for cargo udeps"

This reverts commit 3b057ebb87ed9997db4fbc73db5d702a633ace36.
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a59eb27f..59f25a95 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,7 +55,7 @@ jobs:
           submodules: recursive
       - uses: dtolnay/rust-toolchain@c5a29ddb4d9d194e7c84ec8c3fba61b1c31fee8c
         with:
-          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
+          toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
       - uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
         with:
           key: udeps