Merge branch 'main' into feature/rolegroup-svc-names

Author: Maleware

.cargo/config.toml

@@ -0,0 +1,2 @@
+[alias]
+xtask = "run --package xtask --"

.gitattributes

@@ -1,2 +1,3 @@
+crates/stackable-operator/crds/*.yaml linguist-generated
 *.stderr linguist-generated
 *.snap linguist-generated

.github/ISSUE_TEMPLATE/release-workspace-members.md

@@ -1,7 +1,7 @@
 ---
 name: Pre-Release Workspace Member Updates and Releases
 about: This template can be used to track the updates and releases of all workspace members leading up to the next Stackable release
-title: "chore: Update and release workspace members"
+title: "chore: Update and release workspace members for Stackable Release YY.M.X"
 labels: ['epic']
 assignees: ''
 ---
@@ -11,7 +11,7 @@ assignees: ''
     This was created by an issue template: https://github.com/stackabletech/operator-rs/issues/new/choose.
 -->
 
-## Update and Release Workspace Members for Stackable Release XX.(X)X
+Part of stackabletech/issues#xxx.
 
 > [!NOTE]
 > During a Stackable release we update all dependencies in the `operator-rs`
@@ -21,15 +21,12 @@ assignees: ''
 
 Replace the items in the task lists below with the applicable Pull Requests
 
-```[tasklist]
-### Tasks
 - [ ] Update Rust version and workflow actions, see below for more details.
 - [ ] Update Rust dependencies, see below for more details.
 - [ ] Adjust and then verify crate versions using `.scripts/verify_crate_versions.sh`.
 - [ ] Push the release tags using `.scripts/tag_and_push_release.sh`.
-```
 
-### Update Rust Version and Workflow Actions
+## Update Rust Version and Workflow Actions
 
 > [!NOTE]
 > The PR is usually titled: `chore: Bump Rust version and workflow actions`
@@ -45,7 +42,7 @@ Replace the items in the task lists below with the applicable Pull Requests
    make sure that the `cargo-udeps` action is up-to-date, otherwise the CI might
    report errors.
 
-### Update Rust Dependencies
+## Update Rust Dependencies
 
 > [!NOTE]
 > This PR is usually titled: `chore: Bump Rust dependencies`
@@ -59,7 +56,7 @@ Replace the items in the task lists below with the applicable Pull Requests
        override the dependency.
 5. Add a changelog entry if required.
 
-### Adjust and Verify Crate Versions
+## Adjust and Verify Crate Versions
 
 > [!WARNING]
 > Currently, all workspace members use `0.X.Y` versions. This means we can

.github/pull_request_template.md

@@ -7,24 +7,24 @@
 - Not all of these items are applicable to all PRs, the author should update this template to only leave the boxes in that are relevant
 - Please make sure all these things are done and tick the boxes
 
-```[tasklist]
-# Author
+### Author
+
 - [ ] Changes are OpenShift compatible
 - [ ] CRD changes approved
+- [ ] CRD documentation for all fields, following the [style guide](https://docs.stackable.tech/home/nightly/contributor/docs/style-guide).
 - [ ] Integration tests passed (for non trivial changes)
-```
+- [ ] Changes need to be "offline" compatible
+
+### Reviewer
 
-```[tasklist]
-# Reviewer
 - [ ] Code contains useful comments
+- [ ] Code contains useful logging statements
 - [ ] (Integration-)Test cases added
-- [ ] Documentation added or updated
+- [ ] Documentation added or updated. Follows the [style guide](https://docs.stackable.tech/home/nightly/contributor/docs/style-guide).
 - [ ] Changelog updated
 - [ ] Cargo.toml only contains references to git tags (not specific commits or branches)
-```
 
-```[tasklist]
-# Acceptance
+### Acceptance
+
 - [ ] Feature Tracker has been updated
 - [ ] Proper release label has been added
-```

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
-      - uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
         with:
           key: udeps
       - run: cargo install --locked [email protected]
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: EmbarkStudios/cargo-deny-action@4de59db63a066737e557c2c4dd3d1f70206de781 # v2.0.10
+      - uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
         with:
           command: check ${{ matrix.checks }}
 
@@ -75,7 +75,7 @@ jobs:
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
           components: rustfmt
-      - uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
         with:
           key: doc
       - run: cargo doc --document-private-items
@@ -96,10 +96,11 @@ jobs:
           # for our cases.
           # See: https://github.com/dtolnay/trybuild/issues/236#issuecomment-1620950759
           components: rust-src
-      - uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
         with:
           key: test
-      - run: cargo test --all-features
+      - run: cargo test --no-default-features --workspace
+      - run: cargo test --all-features --workspace
 
   tests_passed:
     name: All tests passed

.github/workflows/pr_pre-commit.yaml

@@ -3,10 +3,11 @@ name: pre-commit
 
 on:
   pull_request:
+  merge_group:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
+  RUST_TOOLCHAIN_VERSION: "nightly-2025-05-26"
 
 permissions: {}
 
@@ -18,7 +19,7 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
-      - uses: stackabletech/actions/run-pre-commit@2d3d7ddad981ae09901d45a0f6bf30c2658b1b78 # v0.7.0
+      - uses: stackabletech/actions/run-pre-commit@4bfd3b65f22af597fe784599c077dc34bf5894a7 # v0.8.0
         with:
           rust: ${{ env.RUST_TOOLCHAIN_VERSION }}
           # rust-src is required for trybuild stderr output comparison to work

.pre-commit-config.yaml

@@ -4,26 +4,21 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # 4.6.0
+    rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # 5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: detect-aws-credentials
         args: ["--allow-missing-credentials"]
       - id: detect-private-key
 
-  - repo: https://github.com/doublify/pre-commit-rust
-    rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
-    hooks:
-      - id: clippy
-        args: ["--all-targets", "--", "-D", "warnings"]
   - repo: https://github.com/adrienverge/yamllint
-    rev: 81e9f98ffd059efe8aa9c1b1a42e5cce61b640c6 # 1.35.1
+    rev: 79a6b2b1392eaf49cdd32ac4f14be1a809bbd8f7 # 1.37.1
     hooks:
       - id: yamllint
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: f295829140d25717bc79368d3f966fc1f67a824f # 0.41.0
+    rev: 192ad822316c3a22fb3d3cc8aa6eafa0b8488360 # 0.45.0
     hooks:
       - id: markdownlint
 
@@ -34,7 +29,7 @@ repos:
         args: ["--severity=info"]
 
   - repo: https://github.com/rhysd/actionlint
-    rev: 62dc61a45fc95efe8c800af7a557ab0b9165d63b # 1.7.1
+    rev: 03d0035246f3e81f36aed592ffb4bebf33a03106 # 1.7.7
     hooks:
       - id: actionlint
 
@@ -52,10 +47,27 @@ repos:
         stages: [pre-commit, pre-merge-commit, manual]
         pass_filenames: false
 
-      - id: rustfmt
-        name: rustfmt
+      - id: cargo-rustfmt
+        name: cargo-rustfmt
         language: system
         # Pinning to a specific rustc version, so that we get consistent formatting
-        entry: cargo +nightly-2025-01-15 fmt --all -- --check
-        stages: [pre-commit]
+        entry: cargo +nightly-2025-05-26 fmt --all -- --check
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$
+
+      - id: cargo-clippy
+        name: cargo-clippy
+        language: system
+        entry: cargo clippy --all-targets -- -D warnings
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$
+
+      - id: crd-preview
+        name: crd-preview
+        language: system
+        entry: cargo xtask crd preview
+        stages: [pre-commit, pre-merge-commit]
         pass_filenames: false
+        files: \.rs$

.scripts/verify_crate_versions.sh

@@ -12,6 +12,10 @@ set -euo pipefail
 # stackable-webhook-0.3.1
 
 for CRATE in $(find ./crates/ -mindepth 2 -name Cargo.toml -print0 | xargs -0 -n 1 dirname | xargs -n 1 basename | sort); do
+    if [ "$CRATE" = "xtask" ]; then
+        continue # Skip xtask binary, because it is not published and only used for internal tooling
+    fi
+
     # Get the version in Cargo.toml
     CRATE_VERSION=$(grep 'version' "./crates/$CRATE/Cargo.toml" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
     [ -n "$CRATE_VERSION" ] || (
@@ -40,7 +44,6 @@ for CRATE in $(find ./crates/ -mindepth 2 -name Cargo.toml -print0 | xargs -0 -n
             echo "Ensure the version in ./crates/$CRATE/Cargo.toml matches the version in ./crates/$ASSOCIATED_CRATE/Cargo.toml" >&2
             exit 23
         )
-
     else
         # Get the latest documented version from the CHANGELOG.md
         CHANGELOG_VERSION=$(grep -oE '\[[0-9]+\.[0-9]+\.[0-9]+\]' "./crates/$CRATE/CHANGELOG.md" | head -1 | tr -d '[]')

.vscode/settings.json

@@ -1,8 +1,9 @@
 {
   "rust-analyzer.cargo.features": "all",
+  "rust-analyzer.imports.granularity.group": "crate",
   "rust-analyzer.rustfmt.overrideCommand": [
     "rustfmt",
-    "+nightly-2025-01-15",
+    "+nightly-2025-05-26",
     "--"
-  ],
+  ]
 }

.yamllint.yaml

@@ -7,3 +7,6 @@ rules:
     check-keys: false
   comments:
     min-spaces-from-content: 1  # Needed due to https://github.com/adrienverge/yamllint/issues/443
+  indentation:
+    ignore:
+      crates/stackable-operator/crds/*.yaml