Adapt to breaking hive changes (#364)

# Description

Adapted docs, examples and tests to breaking Hive changes in stackabletech/hive-operator#291



Co-authored-by: Malte Sander <malte.sander.it@gmail.com>

Author: maltesander

CHANGELOG.md

@@ -13,12 +13,13 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - Updated stackable image versions ([#340]).
-- `operator-rs` `0.25.0` -> `0.30.1` ([#344], [#360]).
+- `operator-rs` `0.25.0` -> `0.30.2` ([#344], [#360], [#364]).
 - LDAP integration tests create all resources in their namespace and not some in the default namespace ([#344]).
 - Don't run init container as root and avoid chmod and chowning ([#353]).
 - [BREAKING]: Use Product image selection instead of version. `spec.version` has been replaced by `spec.image` ([#356]).
 - [BREAKING]: Removed tools image for init container and replaced with Trino product image. This means the latest stackable version has to be used in the product image selection ([#357])
 - [BREAKING]: Use `user` and `password` Secret keys for LDAP bind credentials Secrets, instead of env var names ([#362])
+- Adapted examples and tests to Hive CRD changes ([#364]).
 
 ### Fixed
 
@@ -36,6 +37,7 @@ All notable changes to this project will be documented in this file.
 [#358]: https://github.com/stackabletech/trino-operator/pull/358
 [#360]: https://github.com/stackabletech/trino-operator/pull/360
 [#362]: https://github.com/stackabletech/trino-operator/pull/362
+[#364]: https://github.com/stackabletech/trino-operator/pull/364
 
 ## [0.8.0] - 2022-11-07
 

docs/modules/usage_guide/examples/code/trino-insecure.yaml

@@ -39,13 +39,13 @@ spec:
   image:
     productVersion: 3.1.3
     stackableVersion: 0.2.0
+  clusterConfig:
+    database:
+      connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
+      user: APP
+      password: mine
+      dbType: derby
   metastore:
     roleGroups:
       default:
         replicas: 1
-        config:
-          database:
-            connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
-            user: APP
-            password: mine
-            dbType: derby

docs/modules/usage_guide/examples/code/trino-secure-internal-tls.yaml

@@ -69,13 +69,13 @@ spec:
   image:
     productVersion: 3.1.3
     stackableVersion: 0.2.0
+  clusterConfig:
+    database:
+      connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
+      user: APP
+      password: mine
+      dbType: derby
   metastore:
     roleGroups:
       default:
         replicas: 1
-        config:
-          database:
-            connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
-            user: APP
-            password: mine
-            dbType: derby

docs/modules/usage_guide/examples/code/trino-secure-tls-only.yaml

@@ -55,13 +55,13 @@ spec:
   image:
     productVersion: 3.1.3
     stackableVersion: 0.2.0
+  clusterConfig:
+    database:
+      connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
+      user: APP
+      password: mine
+      dbType: derby
   metastore:
     roleGroups:
       default:
         replicas: 1
-        config:
-          database:
-            connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
-            user: APP
-            password: mine
-            dbType: derby

docs/modules/usage_guide/examples/code/trino-secure-tls.yaml

@@ -69,13 +69,13 @@ spec:
   image:
     productVersion: 3.1.3
     stackableVersion: 0.2.0
+  clusterConfig:
+    database:
+      connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
+      user: APP
+      password: mine
+      dbType: derby
   metastore:
     roleGroups:
       default:
         replicas: 1
-        config:
-          database:
-            connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
-            user: APP
-            password: mine
-            dbType: derby

examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml

@@ -107,13 +107,13 @@ spec:
   image:
     productVersion: 3.1.3
     stackableVersion: 0.2.0
+  clusterConfig:
+    database:
+      connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
+      user: APP
+      password: mine
+      dbType: derby
   metastore:
     roleGroups:
       default:
         replicas: 1
-        config:
-          database:
-            connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
-            user: APP
-            password: mine
-            dbType: derby

examples/simple-trino-cluster-hive-ha-s3.yaml

@@ -45,18 +45,18 @@ spec:
   image:
     productVersion: 3.1.3
     stackableVersion: 0.2.0
+  clusterConfig:
+    database:
+      connString: jdbc:postgresql://hive-postgresql:5432/hive
+      user: hive
+      password: hive
+      dbType: postgres
+    s3:
+      reference: minio
   metastore:
     roleGroups:
       default:
         replicas: 2
-        config:
-          database:
-            connString: jdbc:postgresql://hive-postgresql:5432/hive
-            user: hive
-            password: hive
-            dbType: postgres
-  s3:
-    reference: minio
 ---
 apiVersion: s3.stackable.tech/v1alpha1
 kind: S3Connection

examples/simple-trino-cluster-s3.yaml

@@ -43,18 +43,18 @@ spec:
   image:
     productVersion: 3.1.3
     stackableVersion: 0.2.0
+  clusterConfig:
+    database:
+      connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
+      user: APP
+      password: mine
+      dbType: derby
+    s3:
+      reference: minio
   metastore:
     roleGroups:
       default:
         replicas: 1
-        config:
-          database:
-            connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
-            user: APP
-            password: mine
-            dbType: derby
-  s3:
-    reference: minio
 ---
 apiVersion: s3.stackable.tech/v1alpha1
 kind: S3Connection

examples/simple-trino-cluster.yaml

@@ -39,13 +39,13 @@ spec:
   image:
     productVersion: 3.1.3
     stackableVersion: 0.2.0
+  clusterConfig:
+    database:
+      connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
+      user: APP
+      password: mine
+      dbType: derby
   metastore:
     roleGroups:
       default:
         replicas: 1
-        config:
-          database:
-            connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
-            user: APP
-            password: mine
-            dbType: derby

tests/templates/kuttl/smoke/07-install-hive.yaml.j2

@@ -27,17 +27,17 @@ spec:
   image:
     productVersion: "{{ test_scenario['values']['hive'].split('-stackable')[0] }}"
     stackableVersion: "{{ test_scenario['values']['hive'].split('-stackable')[1] }}"
+  clusterConfig:
+    database:
+      connString: jdbc:postgresql://postgresql:5432/hive
+      user: hive
+      password: hive
+      dbType: postgres
+    hdfs:
+      configMap: hdfs
+    s3:
+      reference: minio
   metastore:
     roleGroups:
       default:
         replicas: 2
-        config:
-          database:
-            connString: jdbc:postgresql://postgresql:5432/hive
-            user: hive
-            password: hive
-            dbType: postgres
-  s3:
-    reference: minio
-  hdfs:
-    configMap: hdfs