Update tests and docs

sbernauer · sbernauer · commit 9653f8c9d3a2 · 2026-02-13T11:33:54.000+01:00
diff --git a/docs/modules/hive/pages/usage-guide/derby-example.adoc b/docs/modules/hive/pages/usage-guide/derby-example.adoc
@@ -18,23 +18,12 @@ spec:
   image:
     productVersion: 4.2.0
   clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
+    metadataDatabase:
+      derby: {}
   metastore:
     roleGroups:
       default:
         replicas: 1
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hive-credentials
-type: Opaque
-stringData:
-  username: APP
-  password: mine
 ----
 
 WARNING: You should not use the `Derby` database in production. Derby stores data locally which does not work in high availability setups (multiple replicas) and all data is lost after Pod restarts.
@@ -72,10 +61,8 @@ spec:
   image:
     productVersion: 4.2.0
   clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/stackable/metastore_db;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
+    metadataDatabase:
+      derby: {}
     s3:
       inline:
         host: minio
@@ -107,15 +94,6 @@ metadata:
 stringData:
   accessKey: minio-access-key
   secretKey: minio-secret-key
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hive-credentials
-type: Opaque
-stringData:
-  username: APP
-  password: mine
 ----
 
 
@@ -153,10 +131,11 @@ spec:
   image:
     productVersion: 4.2.0
   clusterConfig:
-    database:
-      connString: jdbc:postgresql://hive-postgresql.default.svc.cluster.local:5432/hive
-      credentialsSecret: hive-credentials
-      dbType: postgres
+    metadataDatabase:
+      postgresql:
+        host: hive-postgresql.default.svc.cluster.local
+        database: hive
+        credentialsSecret: hive-credentials
   metastore:
     roleGroups:
       default:
diff --git a/examples/hive-opa-cluster.yaml b/examples/hive-opa-cluster.yaml
@@ -30,10 +30,11 @@ spec:
       opa:
         configMapName: opa
         package: hms
-    database:
-      connString: jdbc:postgresql://postgresql:5432/hive
-      credentialsSecret: hive-postgresql-credentials
-      dbType: postgres
+    metadataDatabase:
+      postgresql:
+        host: postgresql
+        database: hive
+        credentialsSecret: hive-postgresql-credentials
   metastore:
     roleGroups:
       default:
diff --git a/examples/simple-hive-cluster-postgres-s3.yaml b/examples/simple-hive-cluster-postgres-s3.yaml
@@ -30,10 +30,11 @@ spec:
   image:
     productVersion: 4.2.0
   clusterConfig:
-    database:
-      connString: jdbc:postgresql://hive-postgresql.default.svc.cluster.local:5432/hive
-      credentialsSecret: hive-credentials
-      dbType: postgres
+    metadataDatabase:
+      postgresql:
+        host: hive-postgresql.default.svc.cluster.local
+        database: hive
+        credentialsSecret: hive-credentials
     s3:
       inline:
         host: test-minio
diff --git a/examples/simple-hive-cluster.yaml b/examples/simple-hive-cluster.yaml
@@ -11,10 +11,8 @@ spec:
   image:
     productVersion: 4.2.0
   clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
+    metadataDatabase:
+      derby: {}
   metastore:
     roleGroups:
       default:
diff --git a/rust/operator-binary/src/config/jvm.rs b/rust/operator-binary/src/config/jvm.rs
@@ -109,10 +109,8 @@ mod tests {
           image:
             productVersion: 4.2.0
           clusterConfig:
-            database:
-              connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-              dbType: derby
-              credentialsSecret: mySecret
+            metadataDatabase:
+              derby: {}
           metastore:
             roleGroups:
               default:
@@ -144,10 +142,8 @@ mod tests {
           image:
             productVersion: 4.2.0
           clusterConfig:
-            database:
-              connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-              dbType: derby
-              credentialsSecret: mySecret
+            metadataDatabase:
+              derby: {}
           metastore:
             config:
               resources:
diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs
@@ -47,10 +47,8 @@ mod tests {
           image:
             productVersion: 4.2.0
           clusterConfig:
-            database:
-              connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-              dbType: derby
-              credentialsSecret: mySecret
+            metadataDatabase:
+              derby: {}
           metastore:
             roleGroups:
               default:
diff --git a/tests/templates/kuttl/cluster-operation/10-install-hive.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-hive.yaml.j2
@@ -13,10 +13,8 @@ spec:
 {% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
+    metadataDatabase:
+      derby: {}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
@@ -27,12 +25,3 @@ spec:
     roleGroups:
       default:
         replicas: 1
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hive-credentials
-type: Opaque
-stringData:
-  username: APP
-  password: mine
diff --git a/tests/templates/kuttl/cluster-operation/20-stop-hive.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-hive.yaml.j2
@@ -4,29 +4,6 @@ kind: HiveCluster
 metadata:
   name: test-hive
 spec:
-  image:
-{% if test_scenario['values']['hive-latest'].find(",") > 0 %}
-    custom: "{{ test_scenario['values']['hive-latest'].split(',')[1] }}"
-    productVersion: "{{ test_scenario['values']['hive-latest'].split(',')[0] }}"
-{% else %}
-    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
-{% endif %}
-    pullPolicy: IfNotPresent
-  clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
-{% if lookup('env', 'VECTOR_AGGREGATOR') %}
-    vectorAggregatorConfigMapName: vector-aggregator-discovery
-{% endif %}
   clusterOperation:
     stopped: true
     reconciliationPaused: false
-  metastore:
-    config:
-      logging:
-        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-    roleGroups:
-      default:
-        replicas: 1
diff --git a/tests/templates/kuttl/cluster-operation/30-pause-hive.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-pause-hive.yaml.j2
@@ -4,29 +4,6 @@ kind: HiveCluster
 metadata:
   name: test-hive
 spec:
-  image:
-{% if test_scenario['values']['hive-latest'].find(",") > 0 %}
-    custom: "{{ test_scenario['values']['hive-latest'].split(',')[1] }}"
-    productVersion: "{{ test_scenario['values']['hive-latest'].split(',')[0] }}"
-{% else %}
-    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
-{% endif %}
-    pullPolicy: IfNotPresent
-  clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
-{% if lookup('env', 'VECTOR_AGGREGATOR') %}
-    vectorAggregatorConfigMapName: vector-aggregator-discovery
-{% endif %}
   clusterOperation:
     stopped: false
     reconciliationPaused: true
-  metastore:
-    config:
-      logging:
-        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-    roleGroups:
-      default:
-        replicas: 1
diff --git a/tests/templates/kuttl/cluster-operation/40-restart-hive.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-restart-hive.yaml.j2
@@ -4,29 +4,6 @@ kind: HiveCluster
 metadata:
   name: test-hive
 spec:
-  image:
-{% if test_scenario['values']['hive-latest'].find(",") > 0 %}
-    custom: "{{ test_scenario['values']['hive-latest'].split(',')[1] }}"
-    productVersion: "{{ test_scenario['values']['hive-latest'].split(',')[0] }}"
-{% else %}
-    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
-{% endif %}
-    pullPolicy: IfNotPresent
-  clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
-{% if lookup('env', 'VECTOR_AGGREGATOR') %}
-    vectorAggregatorConfigMapName: vector-aggregator-discovery
-{% endif %}
   clusterOperation:
     stopped: false
     reconciliationPaused: false
-  metastore:
-    config:
-      logging:
-        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-    roleGroups:
-      default:
-        replicas: 1
diff --git a/tests/templates/kuttl/external-access/install-hive.yaml.j2 b/tests/templates/kuttl/external-access/install-hive.yaml.j2
@@ -13,10 +13,8 @@ spec:
 {% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
+    metadataDatabase:
+      derby: {}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
diff --git a/tests/templates/kuttl/kerberos-hdfs/60-install-hive.yaml.j2 b/tests/templates/kuttl/kerberos-hdfs/60-install-hive.yaml.j2
@@ -19,10 +19,11 @@ commands:
 {% endif %}
             pullPolicy: IfNotPresent
           clusterConfig:
-            database:
-              connString: jdbc:postgresql://postgresql:5432/hive
-              credentialsSecret: hive-credentials
-              dbType: postgres
+            metadataDatabase:
+              postgresql:
+                host: postgresql
+                database: hive
+                credentialsSecret: hive-credentials
             hdfs:
               configMap: hdfs
             authentication:
diff --git a/tests/templates/kuttl/kerberos-s3/60-install-hive.yaml.j2 b/tests/templates/kuttl/kerberos-s3/60-install-hive.yaml.j2
@@ -19,10 +19,11 @@ commands:
 {% endif %}
             pullPolicy: IfNotPresent
           clusterConfig:
-            database:
-              connString: jdbc:postgresql://postgresql:5432/hive
-              credentialsSecret: hive-credentials
-              dbType: postgres
+            metadataDatabase:
+              postgresql:
+                host: postgresql
+                database: hive
+                credentialsSecret: hive-credentials
             s3:
               reference: minio
             authentication:
diff --git a/tests/templates/kuttl/logging/04-install-hive.yaml.j2 b/tests/templates/kuttl/logging/04-install-hive.yaml.j2
@@ -47,10 +47,11 @@ spec:
 {% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
-    database:
-      connString: jdbc:postgresql://hive-postgresql:5432/hive
-      credentialsSecret: hive-credentials
-      dbType: postgres
+    metadataDatabase:
+      postgresql:
+        host: hive-postgresql
+        database: hive
+        credentialsSecret: hive-credentials
     vectorAggregatorConfigMapName: hive-vector-aggregator-discovery
   metastore:
     roleGroups:
diff --git a/tests/templates/kuttl/orphaned-resources/01-install-hive.yaml.j2 b/tests/templates/kuttl/orphaned-resources/01-install-hive.yaml.j2
@@ -13,10 +13,8 @@ spec:
 {% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
+    metadataDatabase:
+      derby: {}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
@@ -29,12 +27,3 @@ spec:
         replicas: 1
       remove:
         replicas: 1
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hive-credentials
-type: Opaque
-stringData:
-  username: APP
-  password: mine
diff --git a/tests/templates/kuttl/orphaned-resources/03-remove-role-group.yaml.j2 b/tests/templates/kuttl/orphaned-resources/03-remove-role-group.yaml.j2
@@ -4,19 +4,6 @@ kind: HiveCluster
 metadata:
   name: test-hive
 spec:
-  image:
-{% if test_scenario['values']['hive-latest'].find(",") > 0 %}
-    custom: "{{ test_scenario['values']['hive-latest'].split(',')[1] }}"
-    productVersion: "{{ test_scenario['values']['hive-latest'].split(',')[0] }}"
-{% else %}
-    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
-{% endif %}
-    pullPolicy: IfNotPresent
-  clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
   metastore:
     roleGroups:
       remove: null
diff --git a/tests/templates/kuttl/orphaned-resources/04-change-rolegroup.yaml b/tests/templates/kuttl/orphaned-resources/04-change-rolegroup.yaml
@@ -4,11 +4,6 @@ kind: HiveCluster
 metadata:
   name: test-hive
 spec:
-  clusterConfig:
-    database:
-      connString: jdbc:derby:;databaseName=/tmp/hive;create=true
-      credentialsSecret: hive-credentials
-      dbType: derby
   metastore:
     roleGroups:
       default: null
diff --git a/tests/templates/kuttl/resources/10-install-hive.yaml.j2 b/tests/templates/kuttl/resources/10-install-hive.yaml.j2
diff --git a/tests/templates/kuttl/upgrade/30-install-hive.yaml.j2 b/tests/templates/kuttl/upgrade/30-install-hive.yaml.j2
