From 04155f8859f87f8af5a05b002eee4f1caf6fd7fb Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Apr 2026 14:04:55 +0200 Subject: [PATCH] chore: Update generic database connections for Hive and Superset --- stacks/airflow/hive-metastores.yaml | 11 +++++----- .../hive-metastores.yaml | 20 ++++++++++--------- .../end-to-end-security/hive-metastore.yaml | 11 +++++----- stacks/end-to-end-security/superset.yaml | 19 ++++++++++++++---- .../superset.yaml | 19 ++++++++++++++---- .../hive-metastore.yaml | 20 ++++++++++--------- stacks/stacks-v2.yaml | 15 -------------- stacks/trino-iceberg/hive-metastores.yaml | 11 +++++----- stacks/trino-superset-s3/hive-metastore.yaml | 11 +++++----- stacks/trino-superset-s3/superset.yaml | 19 ++++++++++++++---- 10 files changed, 91 insertions(+), 65 deletions(-) diff --git a/stacks/airflow/hive-metastores.yaml b/stacks/airflow/hive-metastores.yaml index 4a67bd13..4870d3da 100644 --- a/stacks/airflow/hive-metastores.yaml +++ b/stacks/airflow/hive-metastores.yaml @@ -7,10 +7,11 @@ spec: image: productVersion: 4.2.0 clusterConfig: - database: - connString: jdbc:postgresql://postgresql-hive-iceberg:5432/hive - dbType: postgres - credentialsSecret: postgres-credentials + metadataDatabase: + postgresql: + host: postgresql-hive-iceberg + database: hive + credentialsSecretName: hive-postgres-credentials s3: reference: minio metastore: @@ -21,7 +22,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: postgres-credentials + name: hive-postgres-credentials type: Opaque stringData: username: hive diff --git a/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml b/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml index cb1e4d43..d01e305a 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml @@ -7,10 +7,11 @@ spec: image: productVersion: 4.0.0 clusterConfig: - database: - connString: jdbc:postgresql://postgresql-hive:5432/hive - dbType: postgres - credentialsSecret: postgres-credentials + metadataDatabase: + postgresql: + host: postgresql-hive + database: hive + credentialsSecretName: hive-postgres-credentials s3: reference: minio metastore: @@ -27,10 +28,11 @@ spec: # Cannot upgrade to 4.0.1 because we run into github.com/apache/iceberg/issues/12878 productVersion: 4.0.0 clusterConfig: - database: - connString: jdbc:postgresql://postgresql-hive-iceberg:5432/hive - dbType: postgres - credentialsSecret: postgres-credentials + metadataDatabase: + postgresql: + host: postgresql-hive-iceberg + database: hive + credentialsSecretName: hive-postgres-credentials s3: reference: minio metastore: @@ -41,7 +43,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: postgres-credentials + name: hive-postgres-credentials type: Opaque stringData: username: hive diff --git a/stacks/end-to-end-security/hive-metastore.yaml b/stacks/end-to-end-security/hive-metastore.yaml index 68f468c6..9e413bb3 100644 --- a/stacks/end-to-end-security/hive-metastore.yaml +++ b/stacks/end-to-end-security/hive-metastore.yaml @@ -12,10 +12,11 @@ spec: opa: configMapName: opa package: hive_iceberg - database: - connString: jdbc:postgresql://postgresql-hive-iceberg:5432/hive - credentialsSecret: postgres-credentials - dbType: postgres + metadataDatabase: + postgresql: + host: postgresql-hive-iceberg + database: hive + credentialsSecretName: hive-postgres-credentials hdfs: configMap: hdfs authentication: @@ -29,7 +30,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: postgres-credentials + name: hive-postgres-credentials type: Opaque stringData: username: hive diff --git a/stacks/end-to-end-security/superset.yaml b/stacks/end-to-end-security/superset.yaml index 20a3881e..376c52f3 100644 --- a/stacks/end-to-end-security/superset.yaml +++ b/stacks/end-to-end-security/superset.yaml @@ -7,7 +7,12 @@ spec: image: productVersion: 6.0.0 clusterConfig: - credentialsSecret: superset-credentials + credentialsSecretName: superset-admin-credentials + metadataDatabase: + postgresql: + host: postgresql-superset + database: superset + credentialsSecretName: superset-postgresql-credentials authentication: - authenticationClass: keycloak oidc: @@ -33,7 +38,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: superset-credentials + name: superset-admin-credentials type: Opaque stringData: adminUser.username: admin @@ -41,8 +46,14 @@ stringData: adminUser.lastname: Admin adminUser.email: admin@superset.com adminUser.password: {{ supersetAdminPassword }} - connections.secretKey: {{ supersetSecretKey }} - connections.sqlalchemyDatabaseUri: postgresql://superset:superset@postgresql-superset/superset +--- +apiVersion: v1 +kind: Secret +metadata: + name: superset-postgresql-credentials +stringData: + username: superset + password: superset --- apiVersion: v1 kind: Secret diff --git a/stacks/nifi-kafka-druid-superset-s3/superset.yaml b/stacks/nifi-kafka-druid-superset-s3/superset.yaml index c672ff04..702dac86 100644 --- a/stacks/nifi-kafka-druid-superset-s3/superset.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/superset.yaml @@ -7,7 +7,12 @@ spec: image: productVersion: 6.0.0 clusterConfig: - credentialsSecret: superset-credentials + credentialsSecretName: superset-admin-credentials + metadataDatabase: + postgresql: + host: postgresql-superset + database: superset + credentialsSecretName: superset-postgresql-credentials nodes: roleConfig: listenerClass: external-stable @@ -18,7 +23,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: superset-credentials + name: superset-admin-credentials type: Opaque stringData: adminUser.username: admin @@ -26,8 +31,14 @@ stringData: adminUser.lastname: Admin adminUser.email: admin@superset.com adminUser.password: {{ supersetAdminPassword }} - connections.secretKey: {{ supersetSecretKey }} - connections.sqlalchemyDatabaseUri: postgresql://superset:superset@postgresql-superset/superset +--- +apiVersion: v1 +kind: Secret +metadata: + name: superset-postgresql-credentials +stringData: + username: superset + password: superset --- apiVersion: superset.stackable.tech/v1alpha1 kind: DruidConnection diff --git a/stacks/spark-trino-superset-s3/hive-metastore.yaml b/stacks/spark-trino-superset-s3/hive-metastore.yaml index cb1e4d43..d01e305a 100644 --- a/stacks/spark-trino-superset-s3/hive-metastore.yaml +++ b/stacks/spark-trino-superset-s3/hive-metastore.yaml @@ -7,10 +7,11 @@ spec: image: productVersion: 4.0.0 clusterConfig: - database: - connString: jdbc:postgresql://postgresql-hive:5432/hive - dbType: postgres - credentialsSecret: postgres-credentials + metadataDatabase: + postgresql: + host: postgresql-hive + database: hive + credentialsSecretName: hive-postgres-credentials s3: reference: minio metastore: @@ -27,10 +28,11 @@ spec: # Cannot upgrade to 4.0.1 because we run into github.com/apache/iceberg/issues/12878 productVersion: 4.0.0 clusterConfig: - database: - connString: jdbc:postgresql://postgresql-hive-iceberg:5432/hive - dbType: postgres - credentialsSecret: postgres-credentials + metadataDatabase: + postgresql: + host: postgresql-hive-iceberg + database: hive + credentialsSecretName: hive-postgres-credentials s3: reference: minio metastore: @@ -41,7 +43,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: postgres-credentials + name: hive-postgres-credentials type: Opaque stringData: username: hive diff --git a/stacks/stacks-v2.yaml b/stacks/stacks-v2.yaml index a763f4ee..897ffbae 100644 --- a/stacks/stacks-v2.yaml +++ b/stacks/stacks-v2.yaml @@ -234,9 +234,6 @@ stacks: - name: minioAdminPassword description: Password of the MinIO admin user default: adminadmin - - name: supersetSecretKey - description: Superset's secret key used to generate e.g. user session tokens - default: supersetSecretKey hdfs-hbase: description: HBase cluster using HDFS as underlying storage stackableRelease: dev @@ -303,9 +300,6 @@ stacks: - name: minioAdminPassword description: Password of the MinIO admin user default: adminadmin - - name: supersetSecretKey - description: Superset's secret key used to generate e.g. user session tokens - default: adminadmin spark-trino-superset-s3: description: Stack containing MinIO, Trino and Superset for data visualization stackableRelease: dev @@ -350,9 +344,6 @@ stacks: - name: minioAdminPassword description: Password of the MinIO admin user default: adminadmin - - name: supersetSecretKey - description: Superset's secret key used to generate e.g. user session tokens - default: supersetSecretKey trino-superset-s3: description: Stack containing MinIO, Trino and Superset for data visualization stackableRelease: dev @@ -392,9 +383,6 @@ stacks: - name: minioAdminPassword description: Password of the MinIO admin user default: adminadmin - - name: supersetSecretKey - description: Superset's secret key used to generate e.g. user session tokens - default: supersetSecretKey trino-iceberg: description: Stack containing Trino using Apache Iceberg as a S3 data lakehouse stackableRelease: dev @@ -572,9 +560,6 @@ stacks: - name: supersetAdminPassword description: Password of the Superset admin user default: adminadmin - - name: supersetSecretKey - description: Superset's secret key used to generate e.g. user session tokens - default: supersetSecretKey - name: trinoSupersetUserPassword description: Password of the service Superset uses to connect to Trino. Superset itself will use impersonation for Trino users default: supersetsuperset diff --git a/stacks/trino-iceberg/hive-metastores.yaml b/stacks/trino-iceberg/hive-metastores.yaml index 4a67bd13..4870d3da 100644 --- a/stacks/trino-iceberg/hive-metastores.yaml +++ b/stacks/trino-iceberg/hive-metastores.yaml @@ -7,10 +7,11 @@ spec: image: productVersion: 4.2.0 clusterConfig: - database: - connString: jdbc:postgresql://postgresql-hive-iceberg:5432/hive - dbType: postgres - credentialsSecret: postgres-credentials + metadataDatabase: + postgresql: + host: postgresql-hive-iceberg + database: hive + credentialsSecretName: hive-postgres-credentials s3: reference: minio metastore: @@ -21,7 +22,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: postgres-credentials + name: hive-postgres-credentials type: Opaque stringData: username: hive diff --git a/stacks/trino-superset-s3/hive-metastore.yaml b/stacks/trino-superset-s3/hive-metastore.yaml index 20ebd79d..f804a57e 100644 --- a/stacks/trino-superset-s3/hive-metastore.yaml +++ b/stacks/trino-superset-s3/hive-metastore.yaml @@ -7,10 +7,11 @@ spec: image: productVersion: 4.2.0 clusterConfig: - database: - connString: jdbc:postgresql://postgresql-hive:5432/hive - dbType: postgres - credentialsSecret: postgres-credentials + metadataDatabase: + postgresql: + host: postgresql-hive + database: hive + credentialsSecretName: hive-postgres-credentials s3: reference: minio metastore: @@ -21,7 +22,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: postgres-credentials + name: hive-postgres-credentials type: Opaque stringData: username: hive diff --git a/stacks/trino-superset-s3/superset.yaml b/stacks/trino-superset-s3/superset.yaml index f1312d55..2c538d18 100644 --- a/stacks/trino-superset-s3/superset.yaml +++ b/stacks/trino-superset-s3/superset.yaml @@ -7,7 +7,12 @@ spec: image: productVersion: 6.0.0 clusterConfig: - credentialsSecret: superset-credentials + credentialsSecretName: superset-admin-credentials + metadataDatabase: + postgresql: + host: postgresql-superset + database: superset + credentialsSecretName: superset-postgresql-credentials nodes: roleConfig: listenerClass: external-stable @@ -18,7 +23,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: superset-credentials + name: superset-admin-credentials type: Opaque stringData: adminUser.username: admin @@ -26,8 +31,14 @@ stringData: adminUser.lastname: Admin adminUser.email: admin@superset.com adminUser.password: "{{ supersetAdminPassword }}" - connections.secretKey: "{{ supersetSecretKey }}" - connections.sqlalchemyDatabaseUri: postgresql://superset:superset@postgresql-superset/superset +--- +apiVersion: v1 +kind: Secret +metadata: + name: superset-postgresql-credentials +stringData: + username: superset + password: superset # --- # TODO Use when available (https://github.com/stackabletech/superset-operator/issues/3) # apiVersion: superset.stackable.tech/v1alpha1