From f5ec2e2b3a5720728b69ea60573578bb2fb9c7dd Mon Sep 17 00:00:00 2001
From: Benedith Mulongo <benedith@sunet.se>
Date: Tue, 10 Dec 2024 18:08:56 +0100
Subject: [PATCH] Fix env in configmaps

---
 .../charts/trino-0.32.0/trino/values.yaml     |  9 +++++++++
 trino/base/values/values.yaml                 | 20 +++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/trino/base/charts/trino-0.32.0/trino/values.yaml b/trino/base/charts/trino-0.32.0/trino/values.yaml
index 86890df..faea4aa 100644
--- a/trino/base/charts/trino-0.32.0/trino/values.yaml
+++ b/trino/base/charts/trino-0.32.0/trino/values.yaml
@@ -307,6 +307,15 @@ catalogs:
   tpcds: |
     connector.name=tpcds
     tpcds.splits-per-node=4
+  hive: |
+    connector.name=hive
+    fs.native-s3.enabled=true
+    hive.metastore: file
+    hive.metastore.catalog.dir: s3a://delta-lake-test/
+    s3.aws-access-key="{{ .Env.MINIO_ACCESS_KEY }}"
+    s3.aws-secret-key="{{ .Env.MINIO_SECRET_KEY }}"
+    s3.endpoint="{{ .Env.MINIO_ENDPOINT_URL }}"
+    s3.path-style-access=true
 # catalogs -- Configure
 # [catalogs](https://trino.io/docs/current/installation/deployment.html#catalog-properties).
 # @raw
diff --git a/trino/base/values/values.yaml b/trino/base/values/values.yaml
index 98db188..a55dd02 100644
--- a/trino/base/values/values.yaml
+++ b/trino/base/values/values.yaml
@@ -12,15 +12,15 @@ worker:
 
 # # hive.metastore.uri=thrift://hivems-hive-metastore.hive-metastore:9083
 # #       hive.non-managed-table-writes-enabled=true
-additionalCatalogs:
-  hive: |
-    connector.name=hive
-    fs.native-s3.enabled=true
-    hive.metastore: file
-    hive.metastore.catalog.dir: s3a://delta-lake-test/
-    s3.aws-access-key="${MINIO_ACCESS_KEY}"
-    s3.aws-secret-key="${MINIO_SECRET_KEY}"
-    s3.endpoint="${MINIO_ENDPOINT_URL}"
-    s3.path-style-access=true
+# additionalCatalogs:
+#   hive: |
+#     connector.name=hive
+#     fs.native-s3.enabled=true
+#     hive.metastore: file
+#     hive.metastore.catalog.dir: s3a://delta-lake-test/
+#     s3.aws-access-key="${MINIO_ACCESS_KEY}"
+#     s3.aws-secret-key="${MINIO_SECRET_KEY}"
+#     s3.endpoint="${MINIO_ENDPOINT_URL}"
+#     s3.path-style-access=true
 
 # #s3.ssl.enabled: false