Skip to content

Commit 26bcb6d

Browse files
lfranckemaltesander
lfrancke
and
maltesander
authored
Update supported versions for SDP 24.7 (#583)
* Update supported versions for SDP 24.7 * Allow using custom images in tests * Update changelog * Update changelog * Fix indentation * Fix typo in changelog * Fix changelog * fix templating in tests * fix changelog * remove 30.0.0 from tests and mark experimental * fix changelog * fix test definitions * remove debugging setting * fix internal secret name in oidc tests * bump product versions --------- Co-authored-by: Malte Sander <[email protected]> Co-authored-by: Malte Sander <[email protected]>
1 parent e0df07b commit 26bcb6d

21 files changed

+111
-13
lines changed

‎CHANGELOG.md

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

99
- Add support for specifying additional extensions to load ([#547], [#563]).
1010
- Add support for OIDC as authentication method ([#573]).
11+
- Support Apache Druid `30.0.0` as experimental version ([#583]).
1112

1213
### Changed
1314

1415
- Bump `stackable-operator` from `0.64.0` to `0.70.0` ([#585]).
1516
- Bump `product-config` from `0.6.0` to `0.7.0` ([#585]).
1617
- Bump other dependencies ([#587]).
17-
18-
[#585]: https://github.com/stackabletech/druid-operator/pull/585
19-
[#587]: https://github.com/stackabletech/druid-operator/pull/587
18+
- Deprecate support for Apache Druid `28.0.1` ([#583]).
2019

2120
### Fixed
2221

2322
- [BREAKING] Move the DB credentials `user` and `password` out of the CRD into a secret containing the keys `username` and `password` ([#557]).
24-
- Processing of corrupted log events fixed; If errors occur, the error
25-
messages are added to the log event ([#572]).
23+
- Processing of corrupted log events fixed; If errors occur, the error messages are added to the log event ([#572]).
24+
25+
### Removed
26+
27+
- Remove support for Apache Druid version 27.0.0 ([#583]).
2628

2729
[#547]: https://github.com/stackabletech/druid-operator/pull/547
2830
[#557]: https://github.com/stackabletech/druid-operator/pull/557
2931
[#563]: https://github.com/stackabletech/druid-operator/pull/563
3032
[#572]: https://github.com/stackabletech/druid-operator/pull/572
31-
[#573]: https://github.com/stackabletech/druid-operator/pull/573
33+
[#583]: https://github.com/stackabletech/druid-operator/pull/583
34+
[#585]: https://github.com/stackabletech/druid-operator/pull/585
35+
[#587]: https://github.com/stackabletech/druid-operator/pull/587
3236

3337
## [24.3.0] - 2024-03-20
3438

‎docs/modules/druid/partials/supported-versions.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
// This is a separate file, since it is used by both the direct Druid documentation, and the overarching
33
// Stackable Platform documentation.
44

5-
- 28.0.1
6-
- 27.0.0 (deprecated)
5+
- 30.0.0 (experimental)
6+
- 28.0.1 (deprecated)
77
- 26.0.0 (LTS)

‎tests/templates/kuttl/authorizer/04-install-druid.yaml.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ metadata:
1111
name: derby-druid
1212
spec:
1313
image:
14+
{% if test_scenario['values']['druid'].find(",") > 0 %}
15+
custom: "{{ test_scenario['values']['druid'].split(',')[1] }}"
16+
productVersion: "{{ test_scenario['values']['druid'].split(',')[0] }}"
17+
{% else %}
1418
productVersion: "{{ test_scenario['values']['druid'] }}"
19+
{% endif %}
1520
pullPolicy: IfNotPresent
1621
clusterConfig:
1722
authorization:

‎tests/templates/kuttl/cluster-operation/30-install-druid.yaml.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ metadata:
99
name: derby-druid
1010
spec:
1111
image:
12+
{% if test_scenario['values']['druid-latest'].find(",") > 0 %}
13+
custom: "{{ test_scenario['values']['druid-latest'].split(',')[1] }}"
14+
productVersion: "{{ test_scenario['values']['druid-latest'].split(',')[0] }}"
15+
{% else %}
1216
productVersion: "{{ test_scenario['values']['druid-latest'] }}"
17+
{% endif %}
1318
pullPolicy: IfNotPresent
1419
clusterConfig:
1520
deepStorage:

‎tests/templates/kuttl/cluster-operation/40-stop-druid.yaml.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ metadata:
99
name: derby-druid
1010
spec:
1111
image:
12+
{% if test_scenario['values']['druid-latest'].find(",") > 0 %}
13+
custom: "{{ test_scenario['values']['druid-latest'].split(',')[1] }}"
14+
productVersion: "{{ test_scenario['values']['druid-latest'].split(',')[0] }}"
15+
{% else %}
1216
productVersion: "{{ test_scenario['values']['druid-latest'] }}"
17+
{% endif %}
1318
clusterConfig:
1419
deepStorage:
1520
hdfs:

‎tests/templates/kuttl/cluster-operation/50-pause-druid.yaml.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ metadata:
99
name: derby-druid
1010
spec:
1111
image:
12+
{% if test_scenario['values']['druid-latest'].find(",") > 0 %}
13+
custom: "{{ test_scenario['values']['druid-latest'].split(',')[1] }}"
14+
productVersion: "{{ test_scenario['values']['druid-latest'].split(',')[0] }}"
15+
{% else %}
1216
productVersion: "{{ test_scenario['values']['druid-latest'] }}"
17+
{% endif %}
1318
clusterConfig:
1419
deepStorage:
1520
hdfs:

‎tests/templates/kuttl/cluster-operation/60-restart-druid.yaml.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ metadata:
99
name: derby-druid
1010
spec:
1111
image:
12+
{% if test_scenario['values']['druid-latest'].find(",") > 0 %}
13+
custom: "{{ test_scenario['values']['druid-latest'].split(',')[1] }}"
14+
productVersion: "{{ test_scenario['values']['druid-latest'].split(',')[0] }}"
15+
{% else %}
1216
productVersion: "{{ test_scenario['values']['druid-latest'] }}"
17+
{% endif %}
1318
clusterConfig:
1419
deepStorage:
1520
hdfs:

‎tests/templates/kuttl/hdfs-deep-storage/03-install-druid.yaml.j2

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ metadata:
1111
name: derby-druid
1212
spec:
1313
image:
14+
{% if test_scenario['values']['druid-latest'].find(",") > 0 %}
15+
custom: "{{ test_scenario['values']['druid-latest'].split(',')[1] }}"
16+
productVersion: "{{ test_scenario['values']['druid-latest'].split(',')[0] }}"
17+
{% else %}
1418
productVersion: "{{ test_scenario['values']['druid-latest'] }}"
19+
{% endif %}
1520
pullPolicy: IfNotPresent
1621
clusterConfig:
1722
deepStorage:
@@ -50,6 +55,12 @@ spec:
5055
replicas: 1
5156
middleManagers:
5257
config:
58+
resources:
59+
cpu:
60+
min: 400m
61+
max: 800m
62+
memory:
63+
limit: 4Gi
5364
logging:
5465
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
5566
roleGroups:

‎tests/templates/kuttl/ingestion-no-s3-ext/03-install-druid.yaml.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ metadata:
1111
name: derby-druid
1212
spec:
1313
image:
14+
{% if test_scenario['values']['druid-latest'].find(",") > 0 %}
15+
custom: "{{ test_scenario['values']['druid-latest'].split(',')[1] }}"
16+
productVersion: "{{ test_scenario['values']['druid-latest'].split(',')[0] }}"
17+
{% else %}
1418
productVersion: "{{ test_scenario['values']['druid-latest'] }}"
19+
{% endif %}
1520
pullPolicy: IfNotPresent
1621
clusterConfig:
1722
deepStorage:

‎tests/templates/kuttl/ingestion-s3-ext/03-install-druid.yaml.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ metadata:
1111
name: derby-druid
1212
spec:
1313
image:
14+
{% if test_scenario['values']['druid-latest'].find(",") > 0 %}
15+
custom: "{{ test_scenario['values']['druid-latest'].split(',')[1] }}"
16+
productVersion: "{{ test_scenario['values']['druid-latest'].split(',')[0] }}"
17+
{% else %}
1418
productVersion: "{{ test_scenario['values']['druid-latest'] }}"
19+
{% endif %}
1520
pullPolicy: IfNotPresent
1621
clusterConfig:
1722
deepStorage:

0 commit comments

Comments
 (0)