main merge

Author: razvan

.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
 ```

.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

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "rust-analyzer.rustfmt.overrideCommand": [
+        "rustfmt",
+        "+nightly-2025-01-15",
+        "--edition",
+        "2024",
+        "--"
+    ],
+}

deploy/helm/spark-k8s-operator/configs/properties.yaml

@@ -1,3 +1,3 @@
 # DO NOT EDIT, this file is generated by operator-templating
 [toolchain]
-channel = "1.84.1"
+channel = "1.85.0"

rust-toolchain.toml

@@ -5,9 +5,9 @@ use stackable_operator::{
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
     commons::rbac::build_rbac_resources,
     kube::{
-        core::{error_boundary, DeserializeGuard},
-        runtime::controller::Action,
         Resource, ResourceExt,
+        core::{DeserializeGuard, error_boundary},
+        runtime::controller::Action,
     },
     logging::controller::ReconcilerError,
     status::condition::{
@@ -18,12 +18,12 @@ use stackable_operator::{
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
 
-use super::crd::{v1alpha1, CONNECT_CONTROLLER_NAME};
+use super::crd::{CONNECT_CONTROLLER_NAME, v1alpha1};
 use crate::{
+    Ctx,
     connect::{common, crd::SparkConnectServerStatus, executor, server},
     crd::constants::{APP_NAME, OPERATOR_NAME, SPARK_IMAGE_BASE_NAME},
     product_logging::{self, resolve_vector_aggregator_address},
-    Ctx,
 };
 
 #[derive(Snafu, Debug, EnumDiscriminants)]

rust/operator-binary/src/connect/controller.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     commons::{
-        affinity::{affinity_between_role_pods, StackableAffinity, StackableAffinityFragment},
+        affinity::{StackableAffinity, StackableAffinityFragment, affinity_between_role_pods},
         cluster_operation::ClusterOperation,
         product_image_selection::ProductImage,
         resources::{

rust/operator-binary/src/connect/crd.rs

@@ -6,24 +6,24 @@ use stackable_operator::{
         self,
         configmap::ConfigMapBuilder,
         meta::ObjectMetaBuilder,
-        pod::{container::ContainerBuilder, volume::VolumeBuilder, PodBuilder},
+        pod::{PodBuilder, container::ContainerBuilder, volume::VolumeBuilder},
     },
     commons::{
         product_image_selection::ResolvedProductImage,
         resources::{CpuLimits, MemoryLimits, Resources},
     },
     k8s_openapi::{
-        api::core::v1::{ConfigMap, EnvVar, PodTemplateSpec},
         DeepMerge,
+        api::core::v1::{ConfigMap, EnvVar, PodTemplateSpec},
     },
-    kube::{runtime::reflector::ObjectRef, ResourceExt},
+    kube::{ResourceExt, runtime::reflector::ObjectRef},
     product_logging::framework::calculate_log_volume_size_limit,
     role_utils::RoleGroupRef,
 };
 
 use super::{
-    common::{object_name, SparkConnectRole},
-    crd::{SparkConnectContainer, DUMMY_SPARK_CONNECT_GROUP_NAME},
+    common::{SparkConnectRole, object_name},
+    crd::{DUMMY_SPARK_CONNECT_GROUP_NAME, SparkConnectContainer},
 };
 use crate::{
     connect::{common, crd::v1alpha1},

rust/operator-binary/src/connect/executor.rs

@@ -7,12 +7,13 @@ use stackable_operator::{
         configmap::ConfigMapBuilder,
         meta::ObjectMetaBuilder,
         pod::{
-            container::ContainerBuilder, resources::ResourceRequirementsBuilder,
-            volume::VolumeBuilder, PodBuilder,
+            PodBuilder, container::ContainerBuilder, resources::ResourceRequirementsBuilder,
+            volume::VolumeBuilder,
         },
     },
     commons::product_image_selection::ResolvedProductImage,
     k8s_openapi::{
+        DeepMerge,
         api::{
             apps::v1::{Deployment, DeploymentSpec},
             core::v1::{
@@ -21,20 +22,19 @@ use stackable_operator::{
             },
         },
         apimachinery::pkg::apis::meta::v1::LabelSelector,
-        DeepMerge,
     },
-    kube::{runtime::reflector::ObjectRef, ResourceExt},
+    kube::{ResourceExt, runtime::reflector::ObjectRef},
     kvp::{Label, Labels},
-    product_logging::framework::{calculate_log_volume_size_limit, vector_container, LoggingError},
+    product_logging::framework::{LoggingError, calculate_log_volume_size_limit, vector_container},
     role_utils::RoleGroupRef,
 };
 
 use crate::{
     connect::{
-        common::{self, object_name, SparkConnectRole},
+        common::{self, SparkConnectRole, object_name},
         crd::{
-            v1alpha1, SparkConnectContainer, CONNECT_GRPC_PORT, CONNECT_UI_PORT,
-            DUMMY_SPARK_CONNECT_GROUP_NAME,
+            CONNECT_GRPC_PORT, CONNECT_UI_PORT, DUMMY_SPARK_CONNECT_GROUP_NAME,
+            SparkConnectContainer, v1alpha1,
         },
     },
     crd::constants::{

rust/operator-binary/src/connect/server.rs

@@ -1,5 +1,5 @@
 use stackable_operator::{
-    commons::affinity::{affinity_between_role_pods, StackableAffinityFragment},
+    commons::affinity::{StackableAffinityFragment, affinity_between_role_pods},
     k8s_openapi::api::core::v1::PodAntiAffinity,
 };