Merge remote-tracking branch 'origin/main' into spike/secret-op-volume-request-parts

sbernauer · sbernauer · commit b25dd59289de · 2026-03-05T08:44:47.000+01:00
diff --git a/.github/workflows/daily_security.yml b/.github/workflows/daily_security.yml
@@ -12,7 +12,7 @@ jobs:
   audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml
@@ -7,19 +7,19 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_TOOLCHAIN_VERSION: "nightly-2025-10-23"
+  RUST_TOOLCHAIN_VERSION: "nightly-2026-02-24"
 
 permissions: {}
 
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           fetch-depth: 0
-      - uses: stackabletech/actions/run-pre-commit@75e0756966dea229d697165bfd06ba79abcda72c # v0.10.3
+      - uses: stackabletech/actions/run-pre-commit@c34dbb4f27b274736c7d2edc6f6f30a03d03edf5 # v0.12.2
         with:
           rust: ${{ env.RUST_TOOLCHAIN_VERSION }}
           # rust-src is required for trybuild stderr output comparison to work
diff --git a/.github/workflows/pr_security-checks.yml b/.github/workflows/pr_security-checks.yml
@@ -8,7 +8,7 @@ env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: "0"
   CARGO_PROFILE_DEV_DEBUG: "0"
-  RUST_TOOLCHAIN_VERSION: "1.89.0"
+  RUST_TOOLCHAIN_VERSION: "1.93.0"
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: "-D warnings"
   RUST_LOG: "info"
@@ -23,16 +23,16 @@ jobs:
     env:
       RUSTC_BOOTSTRAP: 1
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: dtolnay/rust-toolchain@master
+      - uses: dtolnay/rust-toolchain@efa25f7f19611383d5b0ccf2d1c8914531636bf9
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
           key: udeps
-      - run: cargo install --locked cargo-udeps@0.1.59
+      - run: cargo install --locked cargo-udeps@0.1.60
       - run: cargo udeps --all-targets --all-features
 
   cargo-deny:
@@ -48,12 +48,12 @@ jobs:
     continue-on-error: ${{ matrix.checks == 'advisories' }}
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: dtolnay/rust-toolchain@master
+      - uses: dtolnay/rust-toolchain@efa25f7f19611383d5b0ccf2d1c8914531636bf9
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
-      - uses: EmbarkStudios/cargo-deny-action@76cd80eb775d7bbbd2d80292136d74d39e1b4918 # v2.0.14
+      - uses: EmbarkStudios/cargo-deny-action@3fd3802e88374d3fe9159b834c7714ec57d6c979 # v2.0.15
         with:
           command: check ${{ matrix.checks }}
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -13,7 +13,7 @@ on:
       - crates/**
 
 env:
-  RUST_TOOLCHAIN_VERSION: "1.89.0"
+  RUST_TOOLCHAIN_VERSION: "1.93.0"
 
 permissions: {}
 
@@ -22,11 +22,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
-      - uses: dtolnay/rust-toolchain@master
+      - uses: dtolnay/rust-toolchain@efa25f7f19611383d5b0ccf2d1c8914531636bf9
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -50,7 +50,7 @@ repos:
       - id: cargo-doc
         name: cargo-doc
         language: system
-        entry: cargo doc --document-private-items
+        entry: cargo doc --no-deps --document-private-items
         stages: [pre-commit, pre-merge-commit]
         pass_filenames: false
         files: \.rs$|Cargo\.(toml|lock)
@@ -75,7 +75,7 @@ repos:
         name: cargo-rustfmt
         language: system
         # Pinning to a specific rustc version, so that we get consistent formatting
-        entry: cargo +nightly-2025-10-23 fmt --all -- --check
+        entry: cargo +nightly-2026-02-24 fmt --all -- --check
         stages: [pre-commit, pre-merge-commit]
         pass_filenames: false
         files: \.rs$
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,7 @@
   "rust-analyzer.imports.granularity.group": "crate",
   "rust-analyzer.rustfmt.overrideCommand": [
     "rustfmt",
-    "+nightly-2025-10-23",
+    "+nightly-2026-02-24",
     "--edition",
     "2024",
     "--"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ async-trait = "0.1.89"
 axum = { version = "0.8.1", features = ["http2"] }
 clap = { version = "4.5.17", features = ["derive", "cargo", "env"] }
 const_format = "0.2.33"
+# Cannot be updated until x509-cert uses a newer version
 const-oid = { version = "0.9.6", features = ["db"] }
 convert_case = "0.11.0"
 convert_case_extras = "0.2.0"
@@ -52,6 +53,7 @@ pin-project = "1.1.5"
 prettyplease = "0.2.22"
 proc-macro2 = "1.0.86"
 quote = "1.0.37"
+# Cannot be updated until x509-cert uses a newer version
 rand = "0.9.0"
 rand_core = "0.6.4"
 regex = "1.10.6"
@@ -67,7 +69,7 @@ sha2 = { version = "0.10.8", features = ["oid"] }
 signature = "2.2.0"
 snafu = "0.8.4"
 stackable-operator-derive = { path = "stackable-operator-derive" }
-strum = { version = "0.27.1", features = ["derive"] }
+strum = { version = "0.28.0", features = ["derive"] }
 syn = "2.0.77"
 tempfile = "3.12.0"
 time = { version = "0.3.36" }
diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.106.2] - 2026-02-26
+
+### Changed
+
+- Bump strum to 0.28.0 ([#1160]).
+
+[#1160]: https://github.com/stackabletech/operator-rs/pull/1160
+
 ## [0.106.1] - 2026-02-17
 
 ### Fixed
diff --git a/crates/stackable-operator/Cargo.toml b/crates/stackable-operator/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "stackable-operator"
 description = "Stackable Operator Framework"
-version = "0.106.1"
+version = "0.106.2"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
diff --git a/crates/stackable-operator/src/cli/product_config.rs b/crates/stackable-operator/src/cli/product_config.rs
@@ -76,6 +76,12 @@ impl ProductConfigPath {
     }
 }
 
+// NOTE (@Techassi): This attribute should ideally be applied to the unit test function, but rstest
+// currently doesn't forward it correctly.
+#[allow(
+    clippy::unwrap_in_result,
+    reason = "We allow unwraps/expects in this function which returns Result, because the Result doesn't (and shouldn't) capture these errors."
+)]
 #[cfg(test)]
 mod tests {
     use std::fs::File;
diff --git a/crates/stackable-operator/src/cluster_resources.rs b/crates/stackable-operator/src/cluster_resources.rs
@@ -25,7 +25,6 @@ use k8s_openapi::{
 use kube::{Resource, ResourceExt};
 use serde::{Serialize, de::DeserializeOwned};
 use snafu::{OptionExt, ResultExt, Snafu};
-use strum::Display;
 use tracing::{debug, info, warn};
 
 use crate::{
@@ -124,7 +123,7 @@ pub trait ClusterResource:
 /// The [`ClusterResourceApplyStrategy`] defines how to handle resources applied by the operators.
 /// This can be default behavior (apply_patch), only retrieving resources (get) for cluster status
 /// purposes or doing nothing.
-#[derive(Debug, Display, Eq, PartialEq)]
+#[derive(Debug, Eq, PartialEq, strum::Display)]
 pub enum ClusterResourceApplyStrategy {
     /// Default strategy. Resources a applied via the [`Client::apply_patch`] client method.
     Default,
diff --git a/crates/stackable-operator/src/commons/product_image_selection.rs b/crates/stackable-operator/src/commons/product_image_selection.rs
@@ -89,9 +89,8 @@ pub struct ResolvedProductImage {
     pub pull_secrets: Option<Vec<LocalObjectReference>>,
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, AsRefStr)]
 #[serde(rename = "PascalCase")]
-#[derive(AsRefStr)]
 /// We default to `Always`, as we use floating tags for our release lines.
 /// This means the tag 23.4 starts of pointing to the same image 23.4.0 does, but switches to 23.4.1 after the releases of 23.4.1.
 ///
diff --git a/crates/stackable-operator/src/commons/resources.rs b/crates/stackable-operator/src/commons/resources.rs
@@ -86,7 +86,6 @@ use k8s_openapi::{
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use snafu::{ResultExt, Snafu};
-use strum::Display;
 
 use crate::{
     config::{
@@ -374,7 +373,7 @@ impl<T, K> Into<ResourceRequirements> for Resources<T, K> {
 /// [`ResourceRequirementsType`] describes the available resource requirement
 /// types. The user can set limits, requests and claims. This enum makes it
 /// possible to check if containers set one or more of these types.
-#[derive(Copy, Clone, Debug, Display, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, strum::Display)]
 #[strum(serialize_all = "lowercase")]
 pub enum ResourceRequirementsType {
     Requests,
@@ -386,7 +385,7 @@ pub enum ResourceRequirementsType {
     // Claims,
 }
 
-#[derive(Copy, Clone, Debug, Display, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, strum::Display)]
 #[strum(serialize_all = "lowercase")]
 pub enum ComputeResource {
     Cpu,
diff --git a/crates/stackable-shared/src/time/duration.rs b/crates/stackable-shared/src/time/duration.rs
@@ -337,10 +337,9 @@ impl Duration {
     /// not recommended to use the function to construct [`Duration`]s from user provided input.
     /// Instead, use [`Duration::from_str`] to parse human-readable duration strings.
     pub const fn from_minutes_unchecked(minutes: u64) -> Self {
-        let millis = match minutes.checked_mul(DurationUnit::Minutes.millis()) {
-            Some(millis) => millis,
-            None => panic!("overflow in Duration::from_minutes"),
-        };
+        let millis = minutes
+            .checked_mul(DurationUnit::Minutes.millis())
+            .expect("overflow in Duration::from_minutes");
         Self::from_millis(millis)
     }
 
@@ -352,10 +351,9 @@ impl Duration {
     /// not recommended to use the function to construct [`Duration`]s from user provided input.
     /// Instead, use [`Duration::from_str`] to parse human-readable duration strings.
     pub const fn from_hours_unchecked(hours: u64) -> Self {
-        let millis = match hours.checked_mul(DurationUnit::Hours.millis()) {
-            Some(millis) => millis,
-            None => panic!("overflow in Duration::from_hours"),
-        };
+        let millis = hours
+            .checked_mul(DurationUnit::Hours.millis())
+            .expect("overflow in Duration::from_hours");
         Self::from_millis(millis)
     }
 
@@ -367,10 +365,9 @@ impl Duration {
     /// not recommended to use the function to construct [`Duration`]s from user provided input.
     /// Instead, use [`Duration::from_str`] to parse human-readable duration strings.
     pub const fn from_days_unchecked(days: u64) -> Self {
-        let millis = match days.checked_mul(DurationUnit::Days.millis()) {
-            Some(millis) => millis,
-            None => panic!("overflow in Duration::from_days"),
-        };
+        let millis = days
+            .checked_mul(DurationUnit::Days.millis())
+            .expect("overflow in Duration::from_days");
         Self::from_millis(millis)
     }
 }
diff --git a/crates/xtask/src/crd/dummy.rs b/crates/xtask/src/crd/dummy.rs
@@ -10,7 +10,7 @@ use stackable_operator::{
     status::condition::ClusterCondition,
     versioned::versioned,
 };
-use strum::{Display, EnumIter};
+use strum::EnumIter;
 
 #[versioned(
     version(name = "v1alpha1"),
@@ -89,14 +89,14 @@ pub mod versioned {
         Clone,
         Debug,
         Deserialize,
-        Display,
         Eq,
         EnumIter,
         JsonSchema,
         Ord,
         PartialEq,
         PartialOrd,
         Serialize,
+        strum::Display,
     )]
     #[serde(rename_all = "kebab-case")]
     #[strum(serialize_all = "kebab-case")]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.89.0"
+channel = "1.93.0"
 profile = "default"
