[charts][trino] allow catalogs creation using secrets

charts/trino/README.md

@@ -954,6 +954,25 @@ Fast distributed SQL query engine for big data analytics that helps you explore
        - protocol: TCP
          port: 9999
   ```
+
+ * `additionalSecrets` - list, default: `[]`
+     Example:
+ ```yaml
+ additionalSecrets: []
+  # - name: catalogs
+  #   value:
+  #     mariadb.properties: |
+  #       connector.name=mariadb
+  #       connection-user=
+  #       connection-url=
+  #       connection-password=
+  #     postgresql.properties: |
+  #       connector.name=postgresql
+  #       connection-user=
+  #       connection-url=
+  #       postgresql.array-mapping=
+  #       connection-password=
+  ```
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/trino/templates/configmap-catalog.yaml

@@ -1,4 +1,4 @@
-{{- if or .Values.catalogs .Values.additionalCatalogs }}
+{{- if or .Values.additionalCatalogs (and (.Values.catalogs) (gt (len .Values.catalogs) 0)) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/trino/templates/deployment-coordinator.yaml

@@ -28,7 +28,7 @@ spec:
         {{- if and (eq .Values.accessControl.type "configmap") (not .Values.accessControl.refreshPeriod) }}
         checksum/access-control-config: {{ include (print $.Template.BasePath "/configmap-access-control-coordinator.yaml") . | sha256sum }}
         {{- end }}
-        {{- if or .Values.catalogs .Values.additionalCatalogs }}
+        {{- if or .Values.additionalCatalogs (and (.Values.catalogs) (gt (len .Values.catalogs) 0)) }}
         checksum/catalog-config: {{ include (print $.Template.BasePath "/configmap-catalog.yaml") . | sha256sum }}
         {{- end }}
         checksum/coordinator-config: {{ include (print $.Template.BasePath "/configmap-coordinator.yaml") . | sha256sum }}
@@ -56,7 +56,7 @@ spec:
         - name: config-volume
           configMap:
             name: {{ template "trino.coordinator" . }}
-        {{- if or .Values.catalogs .Values.additionalCatalogs }}
+        {{- if or .Values.additionalCatalogs (and (.Values.catalogs) (gt (len .Values.catalogs) 0)) }}
         - name: catalog-volume
           configMap:
             name: {{ template "trino.catalog" . }}
@@ -140,7 +140,7 @@ spec:
           volumeMounts:
             - mountPath: {{ .Values.server.config.path }}
               name: config-volume
-            {{- if or .Values.catalogs .Values.additionalCatalogs }}
+            {{- if or .Values.additionalCatalogs (and (.Values.catalogs) (gt (len .Values.catalogs) 0)) }}
             - mountPath: {{ .Values.server.config.path }}/catalog
               name: catalog-volume
             {{- end }}

charts/trino/templates/deployment-worker.yaml

@@ -29,7 +29,7 @@ spec:
   template:
     metadata:
       annotations:
-        {{- if or .Values.catalogs .Values.additionalCatalogs }}
+        {{- if or .Values.additionalCatalogs (and (.Values.catalogs) (gt (len .Values.catalogs) 0)) }}
         checksum/catalog-config: {{ include (print $.Template.BasePath "/configmap-catalog.yaml") . | sha256sum }}
         {{- end }}
         checksum/worker-config: {{ include (print $.Template.BasePath "/configmap-worker.yaml") . | sha256sum }}
@@ -59,7 +59,7 @@ spec:
         - name: config-volume
           configMap:
             name: {{ template "trino.worker" . }}
-        {{- if or .Values.catalogs .Values.additionalCatalogs }}
+        {{- if or .Values.additionalCatalogs (and (.Values.catalogs) (gt (len .Values.catalogs) 0)) }}
         - name: catalog-volume
           configMap:
             name: {{ template "trino.catalog" . }}
@@ -126,7 +126,7 @@ spec:
           volumeMounts:
             - mountPath: {{ .Values.server.config.path }}
               name: config-volume
-            {{- if or .Values.catalogs .Values.additionalCatalogs }}
+            {{- if or .Values.additionalCatalogs (and (.Values.catalogs) (gt (len .Values.catalogs) 0)) }}
             - mountPath: {{ .Values.server.config.path }}/catalog
               name: catalog-volume
             {{- end }}

charts/trino/templates/secret.yaml

@@ -25,3 +25,17 @@ data:
   group.db: {{ .Values.auth.groups | b64enc }}
 {{- end }}
 {{- end }}
+---
+{{- if .Values.additionalSecrets }}
+{{- range .Values.additionalSecrets }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "{{ .name }}"
+data:
+{{- range $key, $val := .value }}
+  {{ $key }}: {{ $val | b64enc | nindent 4 }}
+{{- end }}
+type: Opaque
+{{- end }}
+{{- end }}

charts/trino/values.yaml

@@ -382,13 +382,13 @@ eventListenerProperties: []
 #  - custom-property2=custom-value2
 # ```
 
-catalogs:
-  tpch: |
-    connector.name=tpch
-    tpch.splits-per-node=4
-  tpcds: |
-    connector.name=tpcds
-    tpcds.splits-per-node=4
+catalogs: {}
+#  tpch: |
+#    connector.name=tpch
+#    tpch.splits-per-node=4
+#  tpcds: |
+#    connector.name=tpcds
+#    tpcds.splits-per-node=4
 # catalogs -- Configure
 # [catalogs](https://trino.io/docs/current/installation/deployment.html#catalog-properties).
 # @raw
@@ -546,6 +546,12 @@ secretMounts: []
 #    secretName: sample-secret
 #    path: /secrets/sample.json
 #    subPath: sample.json
+#  - name: catalogs
+#    secretName: catalogs
+#    path: /etc/trino/catalog
+#  - name: ldap
+#    secretName: ldap
+#    path: /etc/trino/ldap
 # ```
 
 coordinator:
@@ -1133,3 +1139,18 @@ networkPolicy:
   #        port: 9999
   # ```
   egress: []
+
+additionalSecrets: []
+  # - name: catalogs
+  #   value:
+  #     mariadb.properties: |
+  #       connector.name=mariadb
+  #       connection-user=
+  #       connection-url=
+  #       connection-password=
+  #     postgresql.properties: |
+  #       connector.name=postgresql
+  #       connection-user=
+  #       connection-url=
+  #       postgresql.array-mapping=
+  #       connection-password=

tests/trino/test-catalogs-secrets-values.yaml

@@ -0,0 +1,18 @@
+additionalSecrets:
+  - name: catalogs
+    value:
+     mariadb.properties: |
+      connector.name=mariadb
+      connection-user=
+      connection-url=
+      connection-password=
+     postgresql.properties: |
+      connector.name=postgresql
+      connection-user=
+      connection-url=
+      postgresql.array-mapping=
+      connection-password
+secretMounts:
+  - name: catalogs
+    secretName: catalogs
+    path: /etc/trino/catalog