chore: run linters, regenerate charts, update dependencies

maltesander · maltesander · commit 34263a99c3b4 · 2026-06-02T20:40:31.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git",
 
 anyhow = "1.0"
 built = { version = "0.8", features = ["chrono", "git2"] }
-clap = "4.5"
+clap = "4.6"
 const_format = "0.2"
 futures = { version = "0.3", features = ["compat"] }
 indoc = "2.0"
@@ -26,7 +26,7 @@ serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.9"
 strum = { version = "0.28", features = ["derive"] }
-tokio = { version = "1.40", features = ["full"] }
+tokio = { version = "1.52", features = ["full"] }
 tracing = "0.1"
 tracing-futures = { version = "0.2", features = ["futures-03"] }
 xml = "1.3"
diff --git a/extra/crds.yaml b/extra/crds.yaml
diff --git a/rust/operator-binary/src/config/mod.rs b/rust/operator-binary/src/config/mod.rs
@@ -2,22 +2,23 @@ use std::collections::BTreeMap;
 
 use stackable_operator::utils::cluster_info::KubernetesClusterInfo;
 
-use crate::config::writer::to_hadoop_xml;
-
-use crate::crd::{
-    HdfsPodRef,
-    constants::{
-        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_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,
-        PROMETHEUS_ENDPOINT_ENABLED, SERVICE_PORT_NAME_HTTP, SERVICE_PORT_NAME_HTTPS,
-        SERVICE_PORT_NAME_RPC,
+use crate::{
+    config::writer::to_hadoop_xml,
+    crd::{
+        HdfsPodRef,
+        constants::{
+            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_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, PROMETHEUS_ENDPOINT_ENABLED, SERVICE_PORT_NAME_HTTP,
+            SERVICE_PORT_NAME_HTTPS, SERVICE_PORT_NAME_RPC,
+        },
+        storage::{DataNodeStorageConfig, DataNodeStorageConfigInnerType},
+        v1alpha1,
     },
-    storage::{DataNodeStorageConfig, DataNodeStorageConfigInnerType},
-    v1alpha1,
 };
 
 pub mod jvm;
@@ -275,9 +276,7 @@ impl CoreSiteConfigBuilder {
     }
 }
 
-fn to_optional_values(
-    config: &BTreeMap<String, String>,
-) -> BTreeMap<String, Option<String>> {
+fn to_optional_values(config: &BTreeMap<String, String>) -> BTreeMap<String, Option<String>> {
     config
         .iter()
         .map(|(k, v)| (k.clone(), Some(v.clone())))
diff --git a/rust/operator-binary/src/config/writer.rs b/rust/operator-binary/src/config/writer.rs
@@ -121,7 +121,10 @@ mod tests {
     #[test]
     fn hadoop_xml_escapes_special_characters() {
         let rendered = xml(&[("k", Some("<a>&b"))]);
-        assert!(rendered.contains("<value>&lt;a&gt;&amp;b</value>"), "{rendered}");
+        assert!(
+            rendered.contains("<value>&lt;a&gt;&amp;b</value>"),
+            "{rendered}"
+        );
     }
 
     #[test]
diff --git a/rust/operator-binary/src/controller/build/properties/hdfs_site.rs b/rust/operator-binary/src/controller/build/properties/hdfs_site.rs
@@ -147,9 +147,7 @@ mod tests {
             "{xml}"
         );
         assert!(
-            xml.contains(
-                "<name>dfs.datanode.max.transfer.threads</name>\n    <value>8192</value>"
-            ),
+            xml.contains("<name>dfs.datanode.max.transfer.threads</name>\n    <value>8192</value>"),
             "{xml}"
         );
     }
diff --git a/rust/operator-binary/src/controller/build/properties/mod.rs b/rust/operator-binary/src/controller/build/properties/mod.rs
@@ -56,7 +56,10 @@ mod tests {
     fn file_names_match_the_hadoop_on_disk_names() {
         assert_eq!(ConfigFileName::HdfsSite.to_string(), "hdfs-site.xml");
         assert_eq!(ConfigFileName::CoreSite.to_string(), "core-site.xml");
-        assert_eq!(ConfigFileName::HadoopPolicy.to_string(), "hadoop-policy.xml");
+        assert_eq!(
+            ConfigFileName::HadoopPolicy.to_string(),
+            "hadoop-policy.xml"
+        );
         assert_eq!(ConfigFileName::SslServer.to_string(), "ssl-server.xml");
         assert_eq!(ConfigFileName::SslClient.to_string(), "ssl-client.xml");
         assert_eq!(ConfigFileName::Security.to_string(), "security.properties");
diff --git a/rust/operator-binary/src/controller/build/properties/ssl_client.rs b/rust/operator-binary/src/controller/build/properties/ssl_client.rs
@@ -69,7 +69,10 @@ mod tests {
 
     #[test]
     fn user_overrides_win_over_injected_defaults() {
-        let xml = build(true, config_overrides(&[("ssl.client.truststore.type", "jks")]));
+        let xml = build(
+            true,
+            config_overrides(&[("ssl.client.truststore.type", "jks")]),
+        );
         assert!(
             xml.contains("<name>ssl.client.truststore.type</name>\n    <value>jks</value>"),
             "{xml}"
diff --git a/rust/operator-binary/src/controller/build/properties/ssl_server.rs b/rust/operator-binary/src/controller/build/properties/ssl_server.rs
@@ -81,7 +81,10 @@ mod tests {
 
     #[test]
     fn user_overrides_win_over_injected_defaults() {
-        let xml = build(true, config_overrides(&[("ssl.server.keystore.type", "jks")]));
+        let xml = build(
+            true,
+            config_overrides(&[("ssl.server.keystore.type", "jks")]),
+        );
         assert!(
             xml.contains("<name>ssl.server.keystore.type</name>\n    <value>jks</value>"),
             "{xml}"
diff --git a/rust/operator-binary/src/controller/validate.rs b/rust/operator-binary/src/controller/validate.rs
@@ -108,7 +108,11 @@ pub fn validate_cluster(
 /// product-config `transform_all_roles_to_config` step.
 fn collect_role_group_overrides<C>(
     role: Option<&Role<C, v1alpha1::HdfsConfigOverrides, GenericRoleConfig, JavaCommonConfig>>,
-) -> Vec<(String, v1alpha1::HdfsConfigOverrides, BTreeMap<String, String>)> {
+) -> Vec<(
+    String,
+    v1alpha1::HdfsConfigOverrides,
+    BTreeMap<String, String>,
+)> {
     let Some(role) = role else {
         return Vec::new();
     };
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
@@ -569,7 +569,6 @@ impl v1alpha1::HdfsCluster {
         }
     }
 
-
     pub fn upgrade_state(&self) -> Result<Option<UpgradeState>, UpgradeStateError> {
         use upgrade_state_error::*;
         let Some(status) = self.status.as_ref() else {
diff --git a/rust/operator-binary/src/hdfs_controller.rs b/rust/operator-binary/src/hdfs_controller.rs
@@ -45,11 +45,11 @@ use strum::{EnumDiscriminants, IntoEnumIterator, IntoStaticStr};
 use crate::{
     OPERATOR_NAME, build_recommended_labels,
     config::writer::PropertiesWriterError,
+    container::{self, ContainerConfig},
     controller::build::properties::{
         ConfigFileName, core_site, hadoop_policy, hdfs_site, security_properties, ssl_client,
         ssl_server,
     },
-    container::{self, ContainerConfig},
     crd::{
         AnyNodeConfig, HdfsClusterStatus, HdfsNodeRole, HdfsPodRef, UpgradeState,
         UpgradeStateError, constants::*, v1alpha1,
@@ -611,10 +611,14 @@ fn rolegroup_config_map(
     )
     .context(BuildCoreSiteXmlSnafu)?;
     let hadoop_policy_xml = hadoop_policy::build(config_overrides.hadoop_policy_xml.clone());
-    let ssl_server_xml =
-        ssl_server::build(hdfs.has_https_enabled(), config_overrides.ssl_server_xml.clone());
-    let ssl_client_xml =
-        ssl_client::build(hdfs.has_https_enabled(), config_overrides.ssl_client_xml.clone());
+    let ssl_server_xml = ssl_server::build(
+        hdfs.has_https_enabled(),
+        config_overrides.ssl_server_xml.clone(),
+    );
+    let ssl_client_xml = ssl_client::build(
+        hdfs.has_https_enabled(),
+        config_overrides.ssl_client_xml.clone(),
+    );
 
     let mut builder = ConfigMapBuilder::new();
     builder
