Skip to content

Commit b99db68

Browse files
committed
merge main
2 parents 366a972 + 2aa8392 commit b99db68

File tree

27 files changed

+1811
-508
lines changed

27 files changed

+1811
-508
lines changed

.github/workflows/build.yml

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- "renovate/**"
1515
tags:
1616
- '[0-9][0-9].[0-9]+.[0-9]+'
17+
- '[0-9][0-9].[0-9]+.[0-9]+-rc[0-9]+'
1718
pull_request:
1819
merge_group:
1920
schedule:
@@ -25,7 +26,7 @@ env:
2526
CARGO_TERM_COLOR: always
2627
CARGO_INCREMENTAL: '0'
2728
CARGO_PROFILE_DEV_DEBUG: '0'
28-
RUST_TOOLCHAIN_VERSION: "1.81.0"
29+
RUST_TOOLCHAIN_VERSION: "1.82.0"
2930
RUSTFLAGS: "-D warnings"
3031
RUSTDOCFLAGS: "-D warnings"
3132
RUST_LOG: "info"
@@ -344,9 +345,22 @@ jobs:
344345
with:
345346
crate: cargo-edit
346347
bin: cargo-set-version
347-
- name: Update version if PR
348-
if: ${{ github.event_name == 'pull_request' }}
349-
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
348+
- name: Update version if PR against main branch
349+
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
350+
env:
351+
PR_NUMBER: ${{ github.event.pull_request.number }}
352+
run: |
353+
PR_VERSION="0.0.0-pr${PR_NUMBER}"
354+
cargo set-version --offline --workspace "$PR_VERSION"
355+
- name: Update version if PR against non-main branch
356+
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
357+
if: ${{ github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release-') }}
358+
env:
359+
PR_NUMBER: ${{ github.event.pull_request.number }}
360+
run: |
361+
MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
362+
PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
363+
cargo set-version --offline --workspace "$PR_VERSION"
350364
351365
# Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
352366
# default value in the makefile if called from this action, but not otherwise (i.e. when called locally).
@@ -410,9 +424,22 @@ jobs:
410424
with:
411425
crate: cargo-edit
412426
bin: cargo-set-version
413-
- name: Update version if PR
414-
if: ${{ github.event_name == 'pull_request' }}
415-
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
427+
- name: Update version if PR against main branch
428+
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
429+
env:
430+
PR_NUMBER: ${{ github.event.pull_request.number }}
431+
run: |
432+
PR_VERSION="0.0.0-pr${PR_NUMBER}"
433+
cargo set-version --offline --workspace "$PR_VERSION"
434+
- name: Update version if PR against non-main branch
435+
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
436+
if: ${{ github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release-') }}
437+
env:
438+
PR_NUMBER: ${{ github.event.pull_request.number }}
439+
run: |
440+
MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
441+
PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
442+
cargo set-version --offline --workspace "$PR_VERSION"
416443
- name: Build manifest list
417444
run: |
418445
# Creating manifest list

.github/workflows/integration-test.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,23 @@ env:
1414
TEST_PARAMETER: ${{ inputs.test-parameter }}
1515

1616
on:
17-
schedule:
17+
# schedule:
1818
# At 00:00 on Sunday. See: https://crontab.guru/#0_0_*_*_0
19-
- cron: "0 0 * * 0"
19+
# - cron: "0 0 * * 0"
2020
workflow_dispatch:
2121
inputs:
2222
test-platform:
2323
description: |
24-
The test platform to run on (kind doesn't support `arm64`)
24+
The test platform to run on
2525
required: true
2626
type: choice
2727
options:
28-
- kind-1.31.0
29-
- kind-1.30.3
28+
- kind-1.31.2
29+
- kind-1.30.6
30+
- rke2-1.31.2
31+
- rke2-1.30.6
32+
- k3s-1.31.2
33+
- k3s-1.30.6
3034
- aks-1.29
3135
- aks-1.28
3236
- aks-1.27
@@ -41,7 +45,8 @@ on:
4145
- okd-4.13
4246
test-architecture:
4347
description: |
44-
The architecture the tests will run on
48+
The architecture the tests will run on. Consult the run-integration-test action README for
49+
more details on supported architectures for each distribution
4550
required: true
4651
type: choice
4752
options:
@@ -81,7 +86,7 @@ jobs:
8186

8287
- name: Run Integration Test
8388
id: test
84-
uses: stackabletech/actions/run-integration-test@5b66858af3597c4ea34f9b33664b8034a1d28427 # v0.3.0
89+
uses: stackabletech/actions/run-integration-test@5901c3b1455488820c4be367531e07c3c3e82538 # v0.4.0
8590
with:
8691
test-platform: ${{ env.TEST_PLATFORM }}-${{ env.TEST_ARCHITECTURE }}
8792
test-run: ${{ env.TEST_RUN }}

.github/workflows/pr_pre-commit.yaml

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.81.0"
9+
RUST_TOOLCHAIN_VERSION: "1.82.0"
1010
HADOLINT_VERSION: "v2.12.0"
1111
PYTHON_VERSION: "3.12"
1212

CHANGELOG.md

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

77
### Added
88

9+
- The lifetime of auto generated TLS certificates is now configurable with the role and roleGroup
10+
config property `requestedSecretLifetime`. This helps reducing frequent Pod restarts ([#660]).
11+
- Run a `containerdebug` process in the background of each "druid" container to collect debugging information ([#667]).
12+
13+
### Fixed
14+
15+
- Fix OIDC endpoint construction in case the `rootPath` does have a trailing slash ([#656]).
16+
- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be
17+
deployed in one namespace. Existing Stacklets will use the newly created ServiceAccounts after
18+
restart ([#657]).
19+
20+
[#656]: https://github.com/stackabletech/druid-operator/pull/656
21+
[#657]: https://github.com/stackabletech/druid-operator/pull/657
22+
[#660]: https://github.com/stackabletech/druid-operator/pull/660
23+
[#667]: https://github.com/stackabletech/druid-operator/pull/667
24+
25+
## [24.11.0] - 2024-11-18
26+
27+
### Added
28+
929
- The operator can now run on Kubernetes clusters using a non-default cluster domain.
1030
Use the env var `KUBERNETES_CLUSTER_DOMAIN` or the operator Helm chart property `kubernetesClusterDomain` to set a non-default cluster domain ([#637]).
1131

0 commit comments

Comments
 (0)