Skip to content

Commit fd2994d

Browse files
committed
chore: Merge branch 'main' into feat/crd-previews
2 parents 75df5c1 + 93cfab5 commit fd2994d

File tree

80 files changed

+2218
-907
lines changed

Some content is hidden

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

80 files changed

+2218
-907
lines changed

.github/pull_request_template.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@
77
- 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
88
- Please make sure all these things are done and tick the boxes
99

10-
```[tasklist]
11-
# Author
10+
### Author
11+
1212
- [ ] Changes are OpenShift compatible
1313
- [ ] CRD changes approved
14+
- [ ] CRD documentation for all fields, following the [style guide](https://docs.stackable.tech/home/nightly/contributor/docs/style-guide).
1415
- [ ] Integration tests passed (for non trivial changes)
15-
```
16+
- [ ] Changes need to be "offline" compatible
17+
18+
### Reviewer
1619

17-
```[tasklist]
18-
# Reviewer
1920
- [ ] Code contains useful comments
21+
- [ ] Code contains useful logging statements
2022
- [ ] (Integration-)Test cases added
21-
- [ ] Documentation added or updated
23+
- [ ] Documentation added or updated. Follows the [style guide](https://docs.stackable.tech/home/nightly/contributor/docs/style-guide).
2224
- [ ] Changelog updated
2325
- [ ] Cargo.toml only contains references to git tags (not specific commits or branches)
24-
```
2526

26-
```[tasklist]
27-
# Acceptance
27+
### Acceptance
28+
2829
- [ ] Feature Tracker has been updated
2930
- [ ] Proper release label has been added
30-
```

.github/workflows/pr_pre-commit.yaml

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

88
env:
99
CARGO_TERM_COLOR: always
10-
RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
10+
RUST_TOOLCHAIN_VERSION: "nightly-2025-05-26"
1111

1212
permissions: {}
1313

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ default_language_version:
44

55
repos:
66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # 4.6.0
7+
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # 5.0.0
88
hooks:
99
- id: trailing-whitespace
1010
- id: end-of-file-fixer
@@ -13,12 +13,12 @@ repos:
1313
- id: detect-private-key
1414

1515
- repo: https://github.com/adrienverge/yamllint
16-
rev: 81e9f98ffd059efe8aa9c1b1a42e5cce61b640c6 # 1.35.1
16+
rev: 79a6b2b1392eaf49cdd32ac4f14be1a809bbd8f7 # 1.37.1
1717
hooks:
1818
- id: yamllint
1919

2020
- repo: https://github.com/igorshubovych/markdownlint-cli
21-
rev: f295829140d25717bc79368d3f966fc1f67a824f # 0.41.0
21+
rev: 192ad822316c3a22fb3d3cc8aa6eafa0b8488360 # 0.45.0
2222
hooks:
2323
- id: markdownlint
2424

@@ -29,7 +29,7 @@ repos:
2929
args: ["--severity=info"]
3030

3131
- repo: https://github.com/rhysd/actionlint
32-
rev: 62dc61a45fc95efe8c800af7a557ab0b9165d63b # 1.7.1
32+
rev: 03d0035246f3e81f36aed592ffb4bebf33a03106 # 1.7.7
3333
hooks:
3434
- id: actionlint
3535

@@ -51,7 +51,7 @@ repos:
5151
name: cargo-rustfmt
5252
language: system
5353
# Pinning to a specific rustc version, so that we get consistent formatting
54-
entry: cargo +nightly-2025-01-15 fmt --all -- --check
54+
entry: cargo +nightly-2025-05-26 fmt --all -- --check
5555
stages: [pre-commit, pre-merge-commit]
5656
pass_filenames: false
5757
files: \.rs$

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"rust-analyzer.cargo.features": "all",
33
"rust-analyzer.rustfmt.overrideCommand": [
44
"rustfmt",
5-
"+nightly-2025-01-15",
5+
"+nightly-2025-05-26",
66
"--"
7-
],
7+
]
88
}

Cargo.lock

Lines changed: 49 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ json-patch = "4.0.0"
3434
k8s-openapi = { version = "0.25.0", default-features = false, features = ["schemars", "v1_33"] }
3535
# We use rustls instead of openssl for easier portability, e.g. so that we can build stackablectl without the need to vendor (build from source) openssl
3636
# We use ring instead of aws-lc-rs, as this currently fails to build in "make run-dev"
37-
kube = { version = "1.0.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls", "ring"] }
37+
kube = { version = "1.1.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls", "ring"] }
3838
opentelemetry = "0.29.1"
3939
opentelemetry_sdk = { version = "0.29.0", features = ["rt-tokio"] }
4040
opentelemetry-appender-tracing = "0.29.1"

crates/k8s-version/src/api_version/serde.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ impl<'de> Deserialize<'de> for ApiVersion {
1111
{
1212
struct ApiVersionVisitor;
1313

14-
impl<'de> Visitor<'de> for ApiVersionVisitor {
14+
impl Visitor<'_> for ApiVersionVisitor {
1515
type Value = ApiVersion;
1616

1717
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

crates/k8s-version/src/level/serde.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ impl<'de> Deserialize<'de> for Level {
1111
{
1212
struct LevelVisitor;
1313

14-
impl<'de> Visitor<'de> for LevelVisitor {
14+
impl Visitor<'_> for LevelVisitor {
1515
type Value = Level;
1616

1717
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

crates/k8s-version/src/version/serde.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ impl<'de> Deserialize<'de> for Version {
1111
{
1212
struct VersionVisitor;
1313

14-
impl<'de> Visitor<'de> for VersionVisitor {
14+
impl Visitor<'_> for VersionVisitor {
1515
type Value = Version;
1616

1717
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

0 commit comments

Comments
 (0)