chore: Merge remote-tracking branch 'origin/main' into feat/stackable-telemetry

Author: NickLarsenNZ

.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,7 @@
+{
+    "rust-analyzer.rustfmt.overrideCommand": [
+        "rustfmt",
+        "+nightly-2025-01-15",
+        "--"
+    ],
+}

deny.toml

@@ -29,15 +29,6 @@ ignore = [
     #
     # TODO: Remove after https://github.com/kube-rs/kube/pull/1652 is merged
     "RUSTSEC-2024-0384",
-
-    # https://rustsec.org/advisories/RUSTSEC-2025-0012
-    # "backoff" is unmainted.
-    #
-    # Upstream (kube) has switched to backon in 0.99.0, and an upgrade is scheduled on our end. In the meantime,
-    # this is a very low-severity problem.
-    #
-    # TODO: Remove after upgrading to kube 0.99.
-    "RUSTSEC-2025-0012",
 ]
 
 [bans]

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"

rust/bundle-builder/src/main.rs

@@ -4,12 +4,13 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use axum::{extract::State, http, response::IntoResponse, routing::get, Router};
+use axum::{Router, extract::State, http, response::IntoResponse, routing::get};
 use clap::Parser;
 use flate2::write::GzEncoder;
 use futures::{
+    FutureExt, StreamExt, TryFutureExt,
     future::{self, BoxFuture},
-    pin_mut, FutureExt, StreamExt, TryFutureExt,
+    pin_mut,
 };
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{

rust/operator-binary/src/controller.rs

@@ -6,24 +6,24 @@ use std::{
 
 use const_format::concatcp;
 use indoc::formatdoc;
-use product_config::{types::PropertyNameKind, ProductConfigManager};
+use product_config::{ProductConfigManager, types::PropertyNameKind};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_opa_operator::crd::{
-    user_info_fetcher, v1alpha1, APP_NAME, DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT, OPERATOR_NAME,
+    APP_NAME, DEFAULT_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT, OPERATOR_NAME, user_info_fetcher, v1alpha1,
 };
 use stackable_operator::{
     builder::{
         self,
         configmap::ConfigMapBuilder,
         meta::ObjectMetaBuilder,
         pod::{
+            PodBuilder,
             container::{ContainerBuilder, FieldPathEnvVar},
             resources::ResourceRequirementsBuilder,
             security::PodSecurityContextBuilder,
             volume::VolumeBuilder,
-            PodBuilder,
         },
     },
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
@@ -34,6 +34,7 @@ use stackable_operator::{
         tls_verification::TlsClientDetailsError,
     },
     k8s_openapi::{
+        DeepMerge,
         api::{
             apps::v1::{DaemonSet, DaemonSetSpec},
             core::v1::{
@@ -42,12 +43,11 @@ use stackable_operator::{
             },
         },
         apimachinery::pkg::{apis::meta::v1::LabelSelector, util::intstr::IntOrString},
-        DeepMerge,
     },
     kube::{
-        core::{error_boundary, DeserializeGuard},
-        runtime::{controller::Action, reflector::ObjectRef},
         Resource as KubeResource, ResourceExt,
+        core::{DeserializeGuard, error_boundary},
+        runtime::{controller::Action, reflector::ObjectRef},
     },
     kvp::{Label, LabelError, Labels, ObjectLabels},
     logging::controller::ReconcilerError,
@@ -56,7 +56,7 @@ use stackable_operator::{
     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::{
             AppenderConfig, AutomaticContainerLogConfig, ContainerLogConfig,
@@ -77,7 +77,7 @@ use crate::{
     discovery::{self, build_discovery_configmaps},
     operations::graceful_shutdown::add_graceful_shutdown_config,
     product_logging::{
-        extend_role_group_config_map, resolve_vector_aggregator_address, BundleBuilderLogLevel,
+        BundleBuilderLogLevel, extend_role_group_config_map, resolve_vector_aggregator_address,
     },
 };
 
@@ -787,11 +787,9 @@ fn build_server_rolegroup_daemonset(
             "pipefail".to_string(),
             "-c".to_string(),
         ])
-        .args(vec![build_prepare_start_command(
-            merged_config,
-            &prepare_container_name,
-        )
-        .join(" && ")])
+        .args(vec![
+            build_prepare_start_command(merged_config, &prepare_container_name).join(" && "),
+        ])
         .add_volume_mount(BUNDLES_VOLUME_NAME, BUNDLES_DIR)
         .context(AddVolumeMountSnafu)?
         .add_volume_mount(LOG_VOLUME_NAME, STACKABLE_LOG_DIR)

rust/operator-binary/src/discovery.rs

@@ -4,11 +4,11 @@ use stackable_operator::{
     builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
     commons::product_image_selection::ResolvedProductImage,
     k8s_openapi::api::core::v1::{ConfigMap, Service},
-    kube::{runtime::reflector::ObjectRef, Resource, ResourceExt},
+    kube::{Resource, ResourceExt, runtime::reflector::ObjectRef},
     utils::cluster_info::KubernetesClusterInfo,
 };
 
-use crate::controller::{build_recommended_labels, APP_PORT};
+use crate::controller::{APP_PORT, build_recommended_labels};
 
 #[derive(Snafu, Debug)]
 pub enum Error {

rust/operator-binary/src/main.rs

@@ -3,26 +3,27 @@ use std::sync::Arc;
 use clap::Parser;
 use futures::StreamExt;
 use product_config::ProductConfigManager;
-use stackable_opa_operator::crd::{v1alpha1, OpaCluster, APP_NAME, OPERATOR_NAME};
+use stackable_opa_operator::crd::{APP_NAME, OPERATOR_NAME, OpaCluster, v1alpha1};
 use stackable_operator::{
+    YamlSchema,
     cli::{Command, ProductOperatorRun},
     client::{self, Client},
     k8s_openapi::api::{
         apps::v1::DaemonSet,
         core::v1::{ConfigMap, Service},
     },
     kube::{
+        Api,
         core::DeserializeGuard,
         runtime::{
+            Controller,
             events::{Recorder, Reporter},
-            watcher, Controller,
+            watcher,
         },
-        Api,
     },
     logging::controller::report_controller_reconciled,
     namespace::WatchNamespace,
     shared::yaml::SerializeOptions,
-    YamlSchema,
 };
 
 use crate::controller::OPA_FULL_CONTROLLER_NAME;
@@ -128,13 +129,10 @@ async fn create_controller(
         .owns(configmaps_api, watcher::Config::default())
         .owns(services_api, watcher::Config::default());
 
-    let event_recorder = Arc::new(Recorder::new(
-        client.as_kube_client(),
-        Reporter {
-            controller: OPA_FULL_CONTROLLER_NAME.to_string(),
-            instance: None,
-        },
-    ));
+    let event_recorder = Arc::new(Recorder::new(client.as_kube_client(), Reporter {
+        controller: OPA_FULL_CONTROLLER_NAME.to_string(),
+        instance: None,
+    }));
     controller
         .run(
             controller::reconcile_opa,

rust/operator-binary/src/operations/graceful_shutdown.rs

@@ -1,5 +1,5 @@
 use snafu::{ResultExt, Snafu};
-use stackable_opa_operator::crd::{v1alpha1, SERVER_GRACEFUL_SHUTDOWN_SAFETY_OVERHEAD};
+use stackable_opa_operator::crd::{SERVER_GRACEFUL_SHUTDOWN_SAFETY_OVERHEAD, v1alpha1};
 use stackable_operator::builder::pod::PodBuilder;
 
 #[derive(Debug, Snafu)]