fix: use derby references to network client

maltesander · maltesander · commit 0cd6ccb2c0d8 · 2026-04-21T15:08:26.000+02:00
diff --git a/rust/operator-binary/src/crd/authentication.rs b/rust/operator-binary/src/crd/authentication.rs
@@ -259,7 +259,8 @@ deepStorage:
     configMapName: druid-hdfs
     directory: /druid
 metadataDatabase:
-  derby: {}
+  derby:
+    location: "//localhost:1527/var/druid/metadata.db"
 zookeeperConfigMapName: zk-config-map
     "#;
 
diff --git a/rust/operator-binary/src/crd/tls.rs b/rust/operator-binary/src/crd/tls.rs
@@ -41,7 +41,8 @@ deepStorage:
     configMapName: druid-hdfs
     directory: /druid
 metadataDatabase:
-  derby: {}
+  derby:
+    location: "//localhost:1527/var/druid/metadata.db"
 zookeeperConfigMapName: zk-config-map
     "#;
 
diff --git a/rust/operator-binary/src/druid_controller.rs b/rust/operator-binary/src/druid_controller.rs
@@ -715,7 +715,7 @@ fn build_rolegroup_config_map(
         .spec
         .cluster_config
         .metadata_database
-        .jdbc_connection_details("METADATA")
+        .jdbc_connection_details("metadata")
         .context(InvalidMetadataDatabaseConnectionSnafu)?;
 
     for (property_name_kind, config) in rolegroup_config {
@@ -775,6 +775,7 @@ fn build_rolegroup_config_map(
                             .to_string(),
                     ),
                 );
+
                 if let Some(EnvVar {
                     name: username_env_name,
                     ..
@@ -785,6 +786,7 @@ fn build_rolegroup_config_map(
                         Some(format!("${{env:{username_env_name}}}",)),
                     );
                 }
+
                 if let Some(EnvVar {
                     name: password_env_name,
                     ..
@@ -976,7 +978,7 @@ fn build_rolegroup_statefulset(
         .spec
         .cluster_config
         .metadata_database
-        .jdbc_connection_details("METADATA")
+        .jdbc_connection_details("metadata")
         .context(InvalidMetadataDatabaseConnectionSnafu)?;
 
     let mut main_container_commands = role.main_container_prepare_commands(s3_conn);
diff --git a/tests/templates/kuttl/cluster-operation/30-install-druid.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-install-druid.yaml.j2
@@ -22,7 +22,8 @@ spec:
         configMapName: druid-hdfs
         directory: /druid
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/cluster-operation/40-stop-druid.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-stop-druid.yaml.j2
@@ -21,7 +21,8 @@ spec:
         configMapName: druid-hdfs
         directory: /druid
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/cluster-operation/50-pause-druid.yaml.j2 b/tests/templates/kuttl/cluster-operation/50-pause-druid.yaml.j2
@@ -21,7 +21,8 @@ spec:
         configMapName: druid-hdfs
         directory: /druid
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/cluster-operation/60-restart-druid.yaml.j2 b/tests/templates/kuttl/cluster-operation/60-restart-druid.yaml.j2
@@ -21,7 +21,8 @@ spec:
         configMapName: druid-hdfs
         directory: /druid
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/hdfs-deep-storage/03-install-druid.yaml.j2 b/tests/templates/kuttl/hdfs-deep-storage/03-install-druid.yaml.j2
@@ -24,7 +24,8 @@ spec:
         configMapName: druid-hdfs
         directory: /druid
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/ingestion-no-s3-ext/03-install-druid.yaml.j2 b/tests/templates/kuttl/ingestion-no-s3-ext/03-install-druid.yaml.j2
@@ -24,7 +24,8 @@ spec:
         configMapName: druid-hdfs
         directory: /druid
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/ingestion-s3-ext/03-install-druid.yaml.j2 b/tests/templates/kuttl/ingestion-s3-ext/03-install-druid.yaml.j2
@@ -30,7 +30,8 @@ spec:
           credentials:
             secretClass: s3-credentials-class
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/ldap/13-install-druid.yaml.j2 b/tests/templates/kuttl/ldap/13-install-druid.yaml.j2
@@ -28,7 +28,8 @@ commands:
               configMapName: druid-hdfs
               directory: /druid
           metadataDatabase:
-            derby: {}
+            derby:
+              location: "//localhost:1527/var/druid/metadata.db"
           zookeeperConfigMapName: druid-znode
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
           vectorAggregatorConfigMapName: vector-aggregator-discovery
diff --git a/tests/templates/kuttl/logging/05-install-druid.yaml.j2 b/tests/templates/kuttl/logging/05-install-druid.yaml.j2
@@ -41,7 +41,8 @@ spec:
         configMapName: druid-hdfs
         directory: /druid
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
     vectorAggregatorConfigMapName: druid-vector-aggregator-discovery
     zookeeperConfigMapName: druid-znode
   brokers:
diff --git a/tests/templates/kuttl/oidc/40_druid.yaml.j2 b/tests/templates/kuttl/oidc/40_druid.yaml.j2
@@ -59,7 +59,8 @@ spec:
 {% endif %}
         baseKey: deep-storage
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/orphaned-resources/03-install-druid.yaml.j2 b/tests/templates/kuttl/orphaned-resources/03-install-druid.yaml.j2
@@ -24,7 +24,8 @@ spec:
         configMapName: druid-hdfs
         directory: /druid
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/orphaned-resources/04-update-druid.yaml.j2 b/tests/templates/kuttl/orphaned-resources/04-update-druid.yaml.j2
@@ -24,7 +24,8 @@ spec:
         configMapName: druid-hdfs
         directory: /druid
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/overrides/20-install-druid.yaml.j2 b/tests/templates/kuttl/overrides/20-install-druid.yaml.j2
@@ -18,7 +18,8 @@ spec:
         configMapName: hdfs
         directory: /data
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
     tls: null
     zookeeperConfigMapName: druid-znode
   brokers:
diff --git a/tests/templates/kuttl/resources/30-install-druid.yaml.j2 b/tests/templates/kuttl/resources/30-install-druid.yaml.j2
@@ -28,7 +28,8 @@ spec:
                 port: 9000
                 accessStyle: Path
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2
@@ -60,7 +60,8 @@ spec:
 {% endif %}
         baseKey: deep-storage
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/tls/04-install-druid.yaml.j2 b/tests/templates/kuttl/tls/04-install-druid.yaml.j2
@@ -84,7 +84,8 @@ spec:
                         secretClass: minio-tls-certificates
         baseKey: deep-storage
     metadataDatabase:
-      derby: {}
+      derby:
+        location: "//localhost:1527/var/druid/metadata.db"
 {% if test_scenario['values']['tls-mode'] == 'internal-and-server-tls' or test_scenario['values']['tls-mode'] == 'internal-and-server-tls-and-tls-client-auth' %}
     tls:
       serverAndInternalSecretClass: druid-tls
