Skip to content

Commit 480443d

Browse files
authored
chore: Bump kube, k8s_openapi and stackable-operator (#369)
* chore: Bump kube, k8s_openapi and stackable-operator Jaeger get the hell out of here! * chore: Apply 2024 formatting * chore: Update generated docs * ci: Bump Rust toolchain to 1.85.0 squash me * ci: Remove duplicate checks * chore: Update Nix files * ci: Bump cargo-udeps to 0.1.55 * ci: Use nightly Rust toolchain for pre-commit workflow * chore: Bump stackable-operator to 0.92.0
1 parent fd6aa6e commit 480443d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3417
-1349
lines changed

.github/workflows/pr_cockpit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
- "go.sum"
1616

1717
env:
18-
RUST_VERSION: 1.83.0
18+
RUST_VERSION: 1.85.0
1919
GO_VERSION: '^1.22.5'
2020
CARGO_TERM_COLOR: always
2121
CARGO_INCREMENTAL: "0"

.github/workflows/pr_general.yml

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Pull Request General
44
on: workflow_call
55

66
env:
7-
RUST_VERSION: 1.83.0
7+
RUST_VERSION: 1.85.0
88
GO_VERSION: '^1.22.5'
99
CARGO_TERM_COLOR: always
1010
CARGO_INCREMENTAL: "0"
@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
key: udeps
4444
cache-all-crates: "true"
45-
- run: cargo install --locked cargo-udeps@0.1.50
45+
- run: cargo install --locked cargo-udeps@0.1.55
4646
- run: cargo udeps --workspace
4747

4848
run_cargodeny:
@@ -63,62 +63,6 @@ jobs:
6363
with:
6464
command: check ${{ matrix.checks }}
6565

66-
run_rustfmt:
67-
name: Run Rustfmt
68-
runs-on: ubuntu-latest
69-
steps:
70-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
71-
with:
72-
submodules: recursive
73-
- uses: dtolnay/rust-toolchain@0e66bd3e6b38ec0ad5312288c83e47c143e6b09e # v1
74-
with:
75-
toolchain: ${{ env.RUST_VERSION }}
76-
components: rustfmt
77-
- run: cargo fmt --all -- --check
78-
79-
run_clippy:
80-
name: Run Clippy
81-
runs-on: ubuntu-latest
82-
steps:
83-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
84-
with:
85-
submodules: recursive
86-
87-
- uses: dtolnay/rust-toolchain@0e66bd3e6b38ec0ad5312288c83e47c143e6b09e # v1
88-
with:
89-
toolchain: ${{ env.RUST_VERSION }}
90-
components: clippy
91-
92-
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
93-
with:
94-
go-version: ${{ env.GO_VERSION }}
95-
96-
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
97-
with:
98-
key: clippy
99-
100-
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
101-
with:
102-
node-version: 18
103-
cache: yarn
104-
105-
- run: yarn install --frozen-lockfile
106-
- name: Run clippy action to produce annotations
107-
env:
108-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
109-
uses: giraffate/clippy-action@94e9bd8deab2618756ec5380f12eb35bcb0a88ca
110-
if: env.GITHUB_TOKEN != null
111-
with:
112-
clippy_flags: --all-targets -- -D warnings
113-
github_token: ${{ secrets.GITHUB_TOKEN }}
114-
reporter: "github-pr-check"
115-
116-
- name: Run clippy manually without annotations
117-
env:
118-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
119-
if: env.GITHUB_TOKEN == null
120-
run: cargo clippy --all-targets -- -D warnings
121-
12266
run_rustdoc:
12367
name: Run RustDoc
12468
runs-on: ubuntu-latest
@@ -179,8 +123,6 @@ jobs:
179123
needs:
180124
- run_udeps
181125
- run_cargodeny
182-
- run_clippy
183-
- run_rustfmt
184126
- run_rustdoc
185127
- run_tests
186128
runs-on: ubuntu-latest

.github/workflows/pr_pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
CARGO_TERM_COLOR: always
9-
RUST_TOOLCHAIN_VERSION: "1.83.0"
9+
RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
1010
HADOLINT_VERSION: "v1.17.6"
1111
NIX_VERSION: "2.25.2"
1212

.github/workflows/pr_stackablectl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- "extra/**"
1515

1616
env:
17-
RUST_VERSION: 1.83.0
17+
RUST_VERSION: 1.85.0
1818
GO_VERSION: '^1.22.5'
1919
CARGO_TERM_COLOR: always
2020
CARGO_INCREMENTAL: "0"

.github/workflows/release_stackablectl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- "stackablectl-[0-9]+.[0-9]+.[0-9]+**"
88

99
env:
10-
RUST_VERSION: 1.83.0
10+
RUST_VERSION: 1.85.0
1111
CARGO_TERM_COLOR: always
1212
CARGO_INCREMENTAL: "0"
1313
CARGO_PROFILE_DEV_DEBUG: "0"

.pre-commit-config.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ repos:
2020
- repo: https://github.com/doublify/pre-commit-rust
2121
rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
2222
hooks:
23-
- id: fmt
24-
args: ["--all", "--", "--check"]
2523
- id: clippy
2624
args: ["--all-targets", "--all-features", "--", "-D", "warnings"]
2725

@@ -101,3 +99,11 @@ repos:
10199
entry: make regenerate-nix
102100
stages: [pre-commit, pre-merge-commit, manual]
103101
pass_filenames: false
102+
103+
- id: cargo-rustfmt
104+
name: cargo-rustfmt
105+
language: system
106+
# Pinning to a specific rustc version, so that we get consistent formatting
107+
entry: cargo +nightly-2025-01-15 fmt --all -- --check
108+
stages: [pre-commit]
109+
pass_filenames: false

.vscode/settings.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
{
2-
"rust-analyzer.showUnlinkedFileNotification": false
2+
"rust-analyzer.showUnlinkedFileNotification": false,
3+
"rust-analyzer.cargo.features": "all",
4+
"rust-analyzer.rustfmt.overrideCommand": [
5+
"rustfmt",
6+
"+nightly-2025-01-15",
7+
"--edition",
8+
"2024",
9+
"--"
10+
],
311
}

0 commit comments

Comments
 (0)