chore: replace remaining metadataStorageDatabase occurances.

maltesander · maltesander · commit 6a31aefff15e · 2026-04-21T14:20:08.000+02:00
diff --git a/docs/modules/druid/examples/getting_started/druid.yaml b/docs/modules/druid/examples/getting_started/druid.yaml
@@ -12,12 +12,11 @@ spec:
       hdfs:
         configMapName: simple-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: postgresql
-      connString: jdbc:postgresql://postgresql-druid/druid
-      host: postgresql-druid
-      port: 5432
-      credentialsSecret: druid-db-credentials
+    metadataDatabase:
+      postgresql:
+        host: postgresql-druid
+        database: druid
+        credentialsSecretName: druid-db-credentials
   brokers:
     roleGroups:
       default:
diff --git a/docs/modules/druid/examples/getting_started/druid.yaml.j2 b/docs/modules/druid/examples/getting_started/druid.yaml.j2
@@ -12,12 +12,11 @@ spec:
       hdfs:
         configMapName: simple-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: postgresql
-      connString: jdbc:postgresql://postgresql-druid/druid
-      host: postgresql-druid
-      port: 5432
-      credentialsSecret: druid-db-credentials
+    metadataDatabase:
+      postgresql:
+        host: postgresql-druid
+        database: druid
+        credentialsSecretName: druid-db-credentials
   brokers:
     roleGroups:
       default:
diff --git a/rust/operator-binary/src/crd/authentication.rs b/rust/operator-binary/src/crd/authentication.rs
@@ -259,8 +259,7 @@ deepStorage:
     configMapName: druid-hdfs
     directory: /druid
 metadataDatabase:
-  derby:
-    location: localhost:1527/var/druid/metadata.db;create=true
+  derby: {}
 zookeeperConfigMapName: zk-config-map
     "#;
 
diff --git a/rust/operator-binary/src/crd/tls.rs b/rust/operator-binary/src/crd/tls.rs
@@ -41,8 +41,7 @@ deepStorage:
     configMapName: druid-hdfs
     directory: /druid
 metadataDatabase:
-  derby:
-    location: localhost:1527/var/druid/metadata.db;create=true
+  derby: {}
 zookeeperConfigMapName: zk-config-map
     "#;
 
diff --git a/tests/templates/kuttl/authorizer/04-install-druid.yaml.j2 b/tests/templates/kuttl/authorizer/04-install-druid.yaml.j2
@@ -27,11 +27,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/cluster-operation/30-install-druid.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-install-druid.yaml.j2
@@ -21,11 +21,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -20,11 +20,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -20,11 +20,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -20,11 +20,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/external-access/50_druid.yaml.j2 b/tests/templates/kuttl/external-access/50_druid.yaml.j2
@@ -13,12 +13,11 @@ spec:
 {% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
-    metadataStorageDatabase:
-      dbType: postgresql
-      connString: jdbc:postgresql://druid-postgresql/druid
-      host: druid-postgresql
-      port: 5432
-      credentialsSecret: druid-credentials
+    metadataDatabase:
+      postgresql:
+        host: druid-postgresql
+        database: druid
+        credentialsSecretName: druid-credentials
     deepStorage:
       hdfs:
         configMapName: druid-hdfs
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
@@ -23,11 +23,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -23,11 +23,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -29,11 +29,8 @@ spec:
           host: s3-de-central.profitbricks.com
           credentials:
             secretClass: s3-credentials-class
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -27,11 +27,8 @@ commands:
             hdfs:
               configMapName: druid-hdfs
               directory: /druid
-          metadataStorageDatabase:
-            dbType: derby
-            connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-            host: localhost
-            port: 1527
+          metadataDatabase:
+            derby: {}
           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
@@ -40,11 +40,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
     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
@@ -58,11 +58,8 @@ spec:
                         secretClass: minio-tls-certificates
 {% endif %}
         baseKey: deep-storage
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -23,11 +23,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -23,11 +23,8 @@ spec:
       hdfs:
         configMapName: druid-hdfs
         directory: /druid
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -17,11 +17,8 @@ spec:
       hdfs:
         configMapName: hdfs
         directory: /data
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
     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
@@ -27,11 +27,8 @@ spec:
                 host: minio-druid
                 port: 9000
                 accessStyle: Path
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -59,11 +59,8 @@ spec:
                         secretClass: minio-tls-certificates
 {% endif %}
         baseKey: deep-storage
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
@@ -83,11 +83,8 @@ spec:
                       caCert:
                         secretClass: minio-tls-certificates
         baseKey: deep-storage
-    metadataStorageDatabase:
-      dbType: derby
-      connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-      host: localhost
-      port: 1527
+    metadataDatabase:
+      derby: {}
 {% 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
