stackabletech · maltesander · Oct 13, 2022 · Oct 13, 2022 · Oct 13, 2022 · Oct 13, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,13 +8,15 @@ All notable changes to this project will be documented in this file.
 
 - Cpu and memory limits are now configurable ([#298]).
 - Stale resources are now deleted ([#310]).
+- Support Druid 24.0.0 ([#317]).
 
 ### Changed
 
 - `operator-rs` `0.22.0` -> `0.25.2` ([#310])
 
 [#298]: https://github.com/stackabletech/druid-operator/pull/298
 [#310]: https://github.com/stackabletech/druid-operator/pull/310
+[#317]: https://github.com/stackabletech/druid-operator/pull/317
 
 ## [0.7.0] - 2022-09-06
 

diff --git a/docs/modules/ROOT/pages/usage.adoc b/docs/modules/ROOT/pages/usage.adoc
@@ -53,7 +53,7 @@ kind: DruidCluster
 metadata:
  name: simple-druid
 spec:
- version: 0.23.0-stackable0.1.0
+ version: 24.0.0-stackable0.1.0
  zookeeperConfigMapName: simple-zk
  metadataStorageDatabase:
  dbType: postgresql

diff --git a/docs/modules/ROOT/partials/supported-versions.adoc b/docs/modules/ROOT/partials/supported-versions.adoc
@@ -4,3 +4,4 @@
 
 - 0.22.1
 - 0.23.0
+- 24.0.0
diff --git a/docs/modules/getting_started/examples/code/druid.yaml b/docs/modules/getting_started/examples/code/druid.yaml
@@ -4,7 +4,7 @@ kind: DruidCluster
 metadata:
  name: simple-druid
 spec:
- version: 0.23.0-stackable0.1.0
+ version: 24.0.0-stackable0.1.0
  zookeeperConfigMapName: simple-druid-znode
  metadataStorageDatabase:
  dbType: derby

diff --git a/docs/modules/getting_started/examples/code/hdfs.yaml b/docs/modules/getting_started/examples/code/hdfs.yaml
@@ -4,7 +4,7 @@ kind: HdfsCluster
 metadata:
  name: simple-hdfs
 spec:
- version: 3.2.2-stackable0.5.0
+ version: 3.3.4-stackable0.1.0
  zookeeperConfigMapName: simple-hdfs-znode
  dfsReplication: 3
  log4j: |-

diff --git a/examples/psql-s3/psql-s3-druid-cluster.yaml b/examples/psql-s3/psql-s3-druid-cluster.yaml
@@ -47,7 +47,7 @@ kind: DruidCluster
 metadata:
  name: psql-s3-druid
 spec:
- version: 0.23.0-stackable0.1.0
+ version: 24.0.0-stackable0.1.0
  zookeeperConfigMapName: simple-druid-znode
  metadataStorageDatabase:
  dbType: postgresql

diff --git a/examples/psql/psql-hdfs-druid-cluster.yaml b/examples/psql/psql-hdfs-druid-cluster.yaml
@@ -65,7 +65,7 @@ kind: DruidCluster
 metadata:
  name: psql-druid
 spec:
- version: 0.23.0-stackable0.1.0
+ version: 24.0.0-stackable0.1.0
  zookeeperConfigMapName: psql-druid-znode
  metadataStorageDatabase:
  dbType: postgresql

diff --git a/tests/templates/kuttl/authorizer/00-install-zk.yaml.j2 b/tests/templates/kuttl/authorizer/00-install-zk.yaml.j2
@@ -10,7 +10,7 @@ spec:
  replicas: 1
  config:
  myidOffset: 10
- version: {{ test_scenario['values']['zookeeper'] }}
+ version: {{ test_scenario['values']['zookeeper-latest'] }}
  stopped: false
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1

diff --git a/tests/templates/kuttl/authorizer/03-assert.yaml b/tests/templates/kuttl/authorizer/03-assert.yaml
@@ -3,7 +3,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 metadata:
  name: install-druid
-timeout: 300
+timeout: 600
 ---
 apiVersion: apps/v1
 kind: StatefulSet

diff --git a/tests/templates/kuttl/hdfs-deep-storage/00-install-zk.yaml.j2 b/tests/templates/kuttl/hdfs-deep-storage/00-install-zk.yaml.j2
@@ -10,7 +10,7 @@ spec:
  replicas: 1
  config:
  myidOffset: 10
- version: {{ test_scenario['values']['zookeeper'] }}
+ version: {{ test_scenario['values']['zookeeper-latest'] }}
  stopped: false
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1

diff --git a/tests/templates/kuttl/hdfs-deep-storage/02-assert.yaml b/tests/templates/kuttl/hdfs-deep-storage/02-assert.yaml
@@ -3,7 +3,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 metadata:
  name: install-druid
-timeout: 300
+timeout: 600
 ---
 apiVersion: apps/v1
 kind: StatefulSet

diff --git a/tests/templates/kuttl/ingestion-no-s3-ext/00-install-zk.yaml.j2 b/tests/templates/kuttl/ingestion-no-s3-ext/00-install-zk.yaml.j2
@@ -10,7 +10,7 @@ spec:
  replicas: 1
  config:
  myidOffset: 10
- version: {{ test_scenario['values']['zookeeper'] }}
+ version: {{ test_scenario['values']['zookeeper-latest'] }}
  stopped: false
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1

diff --git a/tests/templates/kuttl/ingestion-no-s3-ext/02-assert.yaml b/tests/templates/kuttl/ingestion-no-s3-ext/02-assert.yaml
@@ -3,7 +3,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 metadata:
  name: install-druid
-timeout: 300
+timeout: 600
 ---
 apiVersion: apps/v1
 kind: StatefulSet

diff --git a/tests/templates/kuttl/ingestion-s3-ext/00-install-zk.yaml.j2 b/tests/templates/kuttl/ingestion-s3-ext/00-install-zk.yaml.j2
@@ -10,7 +10,7 @@ spec:
  replicas: 1
  config:
  myidOffset: 10
- version: {{ test_scenario['values']['zookeeper'] }}
+ version: {{ test_scenario['values']['zookeeper-latest'] }}
  stopped: false
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1

diff --git a/tests/templates/kuttl/ingestion-s3-ext/02-assert.yaml b/tests/templates/kuttl/ingestion-s3-ext/02-assert.yaml
@@ -3,7 +3,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 metadata:
  name: install-druid
-timeout: 300
+timeout: 600
 ---
 apiVersion: apps/v1
 kind: StatefulSet

diff --git a/tests/templates/kuttl/orphaned-resources/00-install-zk.yaml.j2 b/tests/templates/kuttl/orphaned-resources/00-install-zk.yaml.j2
@@ -10,7 +10,7 @@ spec:
  replicas: 1
  config:
  myidOffset: 10
- version: {{ test_scenario['values']['zookeeper'] }}
+ version: {{ test_scenario['values']['zookeeper-latest'] }}
  stopped: false
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1

diff --git a/tests/templates/kuttl/orphaned-resources/02-assert.yaml b/tests/templates/kuttl/orphaned-resources/02-assert.yaml
@@ -3,7 +3,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 metadata:
  name: install-druid
-timeout: 300
+timeout: 600
 ---
 apiVersion: apps/v1
 kind: StatefulSet

diff --git a/tests/templates/kuttl/s3-deep-storage/00-install-zk.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/00-install-zk.yaml.j2
@@ -10,7 +10,7 @@ spec:
  replicas: 1
  config:
  myidOffset: 10
- version: {{ test_scenario['values']['zookeeper'] }}
+ version: {{ test_scenario['values']['zookeeper-latest'] }}
  stopped: false
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1

diff --git a/tests/templates/kuttl/smoke/02-assert.yaml b/tests/templates/kuttl/smoke/02-assert.yaml
@@ -3,7 +3,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 metadata:
  name: install-druid
-timeout: 300
+timeout: 600
 ---
 apiVersion: apps/v1
 kind: StatefulSet

diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -4,6 +4,7 @@ dimensions:
  values:
  - 0.22.1-authorizer0.1.0-stackable0.2.0
  - 0.23.0-stackable0.1.0
+ - 24.0.0-stackable0.1.0
  - name: zookeeper
  values:
  - 3.7.0-stackable0.7.1
@@ -13,10 +14,10 @@ dimensions:
  - 3.8.0-stackable0.7.1
  - name: opa
  values:
- - 0.37.2-stackable0.2.0
+ - 0.41.0-stackable0.1.0
  - name: hadoop
  values:
- - 3.2.2-stackable0.5.0
+ - 3.3.4-stackable0.1.0
  - name: s3-use-tls
  values:
  - "true"
@@ -30,35 +31,35 @@ tests:
  - name: authorizer
  dimensions:
  - druid
- - zookeeper
+ - zookeeper-latest
  - opa
  - hadoop
  - name: ingestion-no-s3-ext
  dimensions:
  - druid
- - zookeeper
+ - zookeeper-latest
  - hadoop
  - name: ingestion-s3-ext
  dimensions:
  - druid
- - zookeeper
+ - zookeeper-latest
  - hadoop
  - name: s3-deep-storage
  dimensions:
  - druid
- - zookeeper
+ - zookeeper-latest
  - s3-use-tls
  - name: hdfs-deep-storage
  dimensions:
  - druid
  - hadoop
- - zookeeper
+ - zookeeper-latest
  - name: resources
  dimensions:
  - druid
  - zookeeper-latest
  - name: orphaned-resources
  dimensions:
  - druid
- - zookeeper
+ - zookeeper-latest
  - hadoop