Skip to content

Commit cbcf8d5

Browse files
committed
Merge branch 'main' into feature/listenerclass-loadbalancerclass
2 parents b063e17 + 799d340 commit cbcf8d5

File tree

38 files changed

+1209
-983
lines changed

38 files changed

+1209
-983
lines changed

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Pre-Release Workspace Member Updates and Releases
33
about: This template can be used to track the updates and releases of all workspace members leading up to the next Stackable release
4-
title: "chore: Update and release workspace members"
4+
title: "chore: Update and release workspace members for Stackable Release YY.M.X"
55
labels: ['epic']
66
assignees: ''
77
---
@@ -11,7 +11,7 @@ assignees: ''
1111
This was created by an issue template: https://github.com/stackabletech/operator-rs/issues/new/choose.
1212
-->
1313

14-
## Update and Release Workspace Members for Stackable Release XX.(X)X
14+
Part of stackabletech/issues#xxx.
1515

1616
> [!NOTE]
1717
> During a Stackable release we update all dependencies in the `operator-rs`
@@ -21,15 +21,12 @@ assignees: ''
2121
2222
Replace the items in the task lists below with the applicable Pull Requests
2323

24-
```[tasklist]
25-
### Tasks
2624
- [ ] Update Rust version and workflow actions, see below for more details.
2725
- [ ] Update Rust dependencies, see below for more details.
2826
- [ ] Adjust and then verify crate versions using `.scripts/verify_crate_versions.sh`.
2927
- [ ] Push the release tags using `.scripts/tag_and_push_release.sh`.
30-
```
3128

32-
### Update Rust Version and Workflow Actions
29+
## Update Rust Version and Workflow Actions
3330

3431
> [!NOTE]
3532
> 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
4542
make sure that the `cargo-udeps` action is up-to-date, otherwise the CI might
4643
report errors.
4744

48-
### Update Rust Dependencies
45+
## Update Rust Dependencies
4946

5047
> [!NOTE]
5148
> 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
5956
override the dependency.
6057
5. Add a changelog entry if required.
6158

62-
### Adjust and Verify Crate Versions
59+
## Adjust and Verify Crate Versions
6360

6461
> [!WARNING]
6562
> Currently, all workspace members use `0.X.Y` versions. This means we can

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: dtolnay/rust-toolchain@master
3939
with:
4040
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
41-
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
41+
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
4242
with:
4343
key: udeps
4444
- run: cargo install --locked [email protected]
@@ -60,7 +60,7 @@ jobs:
6060
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6161
with:
6262
persist-credentials: false
63-
- uses: EmbarkStudios/cargo-deny-action@4de59db63a066737e557c2c4dd3d1f70206de781 # v2.0.10
63+
- uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
6464
with:
6565
command: check ${{ matrix.checks }}
6666

@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
7777
components: rustfmt
78-
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
78+
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
7979
with:
8080
key: doc
8181
- run: cargo doc --document-private-items
@@ -96,7 +96,7 @@ jobs:
9696
# for our cases.
9797
# See: https://github.com/dtolnay/trybuild/issues/236#issuecomment-1620950759
9898
components: rust-src
99-
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
99+
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
100100
with:
101101
key: test
102102
- run: cargo test --all-features

.github/workflows/pr_pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
persist-credentials: false
2020
fetch-depth: 0
21-
- uses: stackabletech/actions/run-pre-commit@2d3d7ddad981ae09901d45a0f6bf30c2658b1b78 # v0.7.0
21+
- uses: stackabletech/actions/run-pre-commit@4bfd3b65f22af597fe784599c077dc34bf5894a7 # v0.8.0
2222
with:
2323
rust: ${{ env.RUST_TOOLCHAIN_VERSION }}
2424
# rust-src is required for trybuild stderr output comparison to work

crates/stackable-operator/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ All notable changes to this project will be documented in this file.
88

99
- Added `ListenerClass.spec.loadBalancerClass` field ([#986]).
1010

11+
### Changed
12+
13+
- BREAKING: Version common CRD structs and enums ([#968]).
14+
- All CRD-related types and function now reside in the `stackable_operator::crd` module.
15+
- Each CRD-related struct and enum has been versioned. The initial version is `v1alpha1`.
16+
- The `static` authentication provider must now be imported using `r#static`.
17+
- Import are now more granular in general.
18+
19+
[#968]: https://github.com/stackabletech/operator-rs/pull/968
1120
[#986]: https://github.com/stackabletech/operator-rs/pull/986
1221

1322
## [0.92.0] - 2025-04-14

crates/stackable-operator/src/cluster_resources.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ use crate::{
3232
client::{Client, GetApi},
3333
commons::{
3434
cluster_operation::ClusterOperation,
35-
listener::Listener,
3635
resources::{
3736
ComputeResource, LIMIT_REQUEST_RATIO_CPU, LIMIT_REQUEST_RATIO_MEMORY,
3837
ResourceRequirementsExt, ResourceRequirementsType,
3938
},
4039
},
40+
crd::listener,
4141
kvp::{
4242
Label, LabelError, Labels,
4343
consts::{K8S_APP_INSTANCE_KEY, K8S_APP_MANAGED_BY_KEY, K8S_APP_NAME_KEY},
@@ -205,7 +205,7 @@ impl ClusterResource for Service {}
205205
impl ClusterResource for ServiceAccount {}
206206
impl ClusterResource for RoleBinding {}
207207
impl ClusterResource for PodDisruptionBudget {}
208-
impl ClusterResource for Listener {}
208+
impl ClusterResource for listener::v1alpha1::Listener {}
209209

210210
impl ClusterResource for Job {
211211
fn pod_spec(&self) -> Option<&PodSpec> {
@@ -646,7 +646,7 @@ impl ClusterResources {
646646
self.delete_orphaned_resources_of_kind::<ServiceAccount>(client),
647647
self.delete_orphaned_resources_of_kind::<RoleBinding>(client),
648648
self.delete_orphaned_resources_of_kind::<PodDisruptionBudget>(client),
649-
self.delete_orphaned_resources_of_kind::<Listener>(client),
649+
self.delete_orphaned_resources_of_kind::<listener::v1alpha1::Listener>(client),
650650
)?;
651651

652652
Ok(())

crates/stackable-operator/src/commons/authentication/mod.rs

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)