Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/modules/druid/examples/getting_started/druid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: simple-druid
spec:
image:
productVersion: 34.0.0
productVersion: 35.0.1
clusterConfig:
zookeeperConfigMapName: simple-druid-znode
deepStorage:
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/druid/examples/getting_started/druid.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: simple-druid
spec:
image:
productVersion: 34.0.0
productVersion: 35.0.1
clusterConfig:
zookeeperConfigMapName: simple-druid-znode
deepStorage:
Expand Down
4 changes: 2 additions & 2 deletions docs/modules/druid/partials/supported-versions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
// This is a separate file, since it is used by both the direct Druid documentation, and the overarching
// Stackable Platform documentation.

- 34.0.0
- 33.0.0 (deprecated)
- 35.0.1
- 34.0.0 (deprecated)
- 30.0.1 (LTS)
4 changes: 2 additions & 2 deletions rust/operator-binary/src/crd/resource.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ pub static COORDINATOR_RESOURCES: LazyLock<
pub static ROUTER_RESOURCES: LazyLock<ResourcesFragment<storage::DruidStorage, NoRuntimeLimits>> =
LazyLock::new(|| ResourcesFragment {
cpu: CpuLimitsFragment {
min: Some(Quantity("100m".to_owned())),
max: Some(Quantity("400m".to_owned())),
min: Some(Quantity("300m".to_owned())),
max: Some(Quantity("1200m".to_owned())),
Comment thread
Techassi marked this conversation as resolved.
},
memory: MemoryLimitsFragment {
limit: Some(Quantity("512Mi".to_owned())),
Expand Down
5 changes: 2 additions & 3 deletions tests/templates/kuttl/commons/healthcheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
)

druid_cluster_name = sys.argv[1]
namespace = sys.argv[2]

druid_role_ports = {
"broker": 8282,
Expand All @@ -24,9 +25,7 @@
}

for role, port in druid_role_ports.items():
url = (
f"https://{druid_cluster_name}-{role}-default-headless:{port}/status/health"
)
url = f"https://{druid_cluster_name}-{role}-default-headless.{namespace}.svc.cluster.local:{port}/status/health"
count = 1

# As this script is intended to be executed by Kuttl which is in charge of overall test timeouts it is ok
Expand Down
2 changes: 1 addition & 1 deletion tests/templates/kuttl/hdfs-deep-storage/05-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
commands:
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py derby-druid
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py derby-druid $NAMESPACE
timeout: 300
2 changes: 1 addition & 1 deletion tests/templates/kuttl/ingestion-no-s3-ext/05-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
commands:
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py derby-druid
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py derby-druid $NAMESPACE
timeout: 300
2 changes: 1 addition & 1 deletion tests/templates/kuttl/ingestion-s3-ext/05-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
commands:
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py derby-druid
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py derby-druid $NAMESPACE
timeout: 300
2 changes: 1 addition & 1 deletion tests/templates/kuttl/s3-deep-storage/11-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
commands:
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py druid-s3-deep-storage
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py druid-s3-deep-storage $NAMESPACE
timeout: 300
2 changes: 1 addition & 1 deletion tests/templates/kuttl/smoke/70-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
commands:
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py druid
- script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py druid $NAMESPACE
timeout: 300
4 changes: 2 additions & 2 deletions tests/test-definition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ dimensions:
- name: druid
values:
- 30.0.1
- 33.0.0
- 34.0.0
- 35.0.1
# To use a custom image, add a comma and the full name after the product version
# - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev
- name: druid-latest
values:
- 34.0.0
- 35.0.1
# To use a custom image, add a comma and the full name after the product version
# - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev
- name: zookeeper
Expand Down