From 040b95be1f4d77054965b704ba505ae0250c116c Mon Sep 17 00:00:00 2001 From: Georgii Ekserdzhian Date: Thu, 26 Mar 2026 11:02:24 +0100 Subject: [PATCH 1/3] allows templating of catalogs --- charts/trino/README.md | 3 ++- charts/trino/templates/configmap-catalog.yaml | 2 +- charts/trino/values.yaml | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/trino/README.md b/charts/trino/README.md index f64e8aa3..f31229f1 100644 --- a/charts/trino/README.md +++ b/charts/trino/README.md @@ -391,9 +391,10 @@ Fast distributed SQL query engine for big data analytics that helps you explore connector.name=memory memory.max-data-per-node=128MB ``` + Supports templating with `tpl`. * `additionalCatalogs` - object, default: `{}` - Deprecated, use `catalogs` instead. Configure additional [catalogs](https://trino.io/docs/current/installation/deployment.html#catalog-properties). + Deprecated, use `catalogs` instead. Configure additional [catalogs](https://trino.io/docs/current/installation/deployment.html#catalog-properties). Supports templating with `tpl`. * `env` - list, default: `[]` additional environment variables added to every pod, specified as a list with explicit values diff --git a/charts/trino/templates/configmap-catalog.yaml b/charts/trino/templates/configmap-catalog.yaml index 74ef1b16..643b379c 100644 --- a/charts/trino/templates/configmap-catalog.yaml +++ b/charts/trino/templates/configmap-catalog.yaml @@ -11,6 +11,6 @@ data: {{- $merged := merge .Values.catalogs .Values.additionalCatalogs }} {{- range $catalogName, $catalogProperties := $merged }} {{ $catalogName }}.properties: | - {{- $catalogProperties | nindent 4 }} + {{- tpl $catalogProperties $ | nindent 4 }} {{- end }} {{- end }} diff --git a/charts/trino/values.yaml b/charts/trino/values.yaml index bfeee0e4..429fbfff 100644 --- a/charts/trino/values.yaml +++ b/charts/trino/values.yaml @@ -463,10 +463,12 @@ catalogs: # connector.name=memory # memory.max-data-per-node=128MB # ``` +# Supports templating with `tpl`. additionalCatalogs: {} # additionalCatalogs -- Deprecated, use `catalogs` instead. Configure additional # [catalogs](https://trino.io/docs/current/installation/deployment.html#catalog-properties). +# Supports templating with `tpl`. env: [] # env -- additional environment variables added to every pod, specified as a list with explicit values From bf05db8fcec0e903f1cbf1f1959c7f051582ae55 Mon Sep 17 00:00:00 2001 From: Georgii Ekserdzhian Date: Thu, 30 Apr 2026 14:37:23 +0200 Subject: [PATCH 2/3] remove templating from deprecated field Co-authored-by: Copilot --- charts/trino/README.md | 2 +- charts/trino/templates/configmap-catalog.yaml | 4 ++-- charts/trino/values.yaml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/trino/README.md b/charts/trino/README.md index f31229f1..55c1ca08 100644 --- a/charts/trino/README.md +++ b/charts/trino/README.md @@ -394,7 +394,7 @@ Fast distributed SQL query engine for big data analytics that helps you explore Supports templating with `tpl`. * `additionalCatalogs` - object, default: `{}` - Deprecated, use `catalogs` instead. Configure additional [catalogs](https://trino.io/docs/current/installation/deployment.html#catalog-properties). Supports templating with `tpl`. + Deprecated, use `catalogs` instead. Configure additional [catalogs](https://trino.io/docs/current/installation/deployment.html#catalog-properties). * `env` - list, default: `[]` additional environment variables added to every pod, specified as a list with explicit values diff --git a/charts/trino/templates/configmap-catalog.yaml b/charts/trino/templates/configmap-catalog.yaml index 643b379c..4d599bc7 100644 --- a/charts/trino/templates/configmap-catalog.yaml +++ b/charts/trino/templates/configmap-catalog.yaml @@ -8,9 +8,9 @@ metadata: {{- include "trino.labels" . | nindent 4 }} app.kubernetes.io/component: catalogs data: -{{- $merged := merge .Values.catalogs .Values.additionalCatalogs }} +{{- $merged := merge (tpl .Values.catalogs $) .Values.additionalCatalogs }} {{- range $catalogName, $catalogProperties := $merged }} {{ $catalogName }}.properties: | - {{- tpl $catalogProperties $ | nindent 4 }} + {{- $catalogProperties | nindent 4 }} {{- end }} {{- end }} diff --git a/charts/trino/values.yaml b/charts/trino/values.yaml index 429fbfff..7a2a6dd2 100644 --- a/charts/trino/values.yaml +++ b/charts/trino/values.yaml @@ -468,7 +468,6 @@ catalogs: additionalCatalogs: {} # additionalCatalogs -- Deprecated, use `catalogs` instead. Configure additional # [catalogs](https://trino.io/docs/current/installation/deployment.html#catalog-properties). -# Supports templating with `tpl`. env: [] # env -- additional environment variables added to every pod, specified as a list with explicit values From 83bc5aff0057fbc8d3bafbc81fdb35933a3a60e3 Mon Sep 17 00:00:00 2001 From: Georgii Ekserdzhian Date: Thu, 30 Apr 2026 14:54:45 +0200 Subject: [PATCH 3/3] template values before merging Co-authored-by: Copilot --- charts/trino/templates/configmap-catalog.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/trino/templates/configmap-catalog.yaml b/charts/trino/templates/configmap-catalog.yaml index 4d599bc7..2cffef06 100644 --- a/charts/trino/templates/configmap-catalog.yaml +++ b/charts/trino/templates/configmap-catalog.yaml @@ -8,7 +8,11 @@ metadata: {{- include "trino.labels" . | nindent 4 }} app.kubernetes.io/component: catalogs data: -{{- $merged := merge (tpl .Values.catalogs $) .Values.additionalCatalogs }} +{{- $templatedCatalogs := dict }} +{{- range $catalogName, $catalogProperties := .Values.catalogs }} +{{- $templatedCatalogs = set $templatedCatalogs $catalogName (tpl $catalogProperties $) }} +{{- end }} +{{- $merged := merge $templatedCatalogs .Values.additionalCatalogs }} {{- range $catalogName, $catalogProperties := $merged }} {{ $catalogName }}.properties: | {{- $catalogProperties | nindent 4 }}