Skip to content

Commit 4be2c23

Browse files
committed
merge main and fix conflicts
2 parents e658036 + e6c5ab5 commit 4be2c23

17 files changed

Lines changed: 52 additions & 410 deletions

File tree

.github/ISSUE_TEMPLATE/new_version.md

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

.github/ISSUE_TEMPLATE/normal-issue.md

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

.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
3232
### Bump Rust Dependencies
3333

3434
- [ ] Bump `stackable-operator` and friends
35-
- [ ] Bump `product-config`
3635
- [ ] Bump all other dependencies

.github/workflows/general_daily_security.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,10 @@ jobs:
2020
with:
2121
persist-credentials: false
2222
- uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
23+
# Build against stable because cargo-audit sometimes depends on things
24+
# that require a newer Rust version than our pinned toolchain. This does
25+
# not influence the result, so it should be safe.
26+
env:
27+
RUSTUP_TOOLCHAIN: stable
2328
with:
2429
token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
assembles all relevant Kubernetes resources before anything is applied ([#776]).
99
- The RBAC ServiceAccount and RoleBinding are now built with the operator-rs `v2::rbac`
1010
functions and carry the full set of recommended labels ([#782]).
11+
- Bump stackable-operator to 0.114.0 ([#786]).
1112

1213
[#776]: https://github.com/stackabletech/hbase-operator/pull/776
1314
[#782]: https://github.com/stackabletech/hbase-operator/pull/782
15+
[#786]: https://github.com/stackabletech/hbase-operator/pull/786
1416

1517
## [26.7.0] - 2026-07-21
1618

Cargo.lock

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

0 commit comments

Comments
 (0)