From 36a50c4fdc8e14acc26988eae9f92ee106bf15bc Mon Sep 17 00:00:00 2001 From: lozbrown Date: Mon, 6 Jan 2025 15:37:45 +0000 Subject: [PATCH 1/3] Update configmap-worker.yaml --- charts/trino/templates/configmap-worker.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/trino/templates/configmap-worker.yaml b/charts/trino/templates/configmap-worker.yaml index 21bb2713..127d90e3 100644 --- a/charts/trino/templates/configmap-worker.yaml +++ b/charts/trino/templates/configmap-worker.yaml @@ -14,7 +14,7 @@ data: node.data-dir={{ .Values.server.node.dataDir }} plugin.dir={{ .Values.server.node.pluginDir }} {{- range $configValue := .Values.additionalNodeProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} jvm.config: | @@ -43,7 +43,7 @@ data: {{- end }}{{/* if */}} {{- end }}{{/* with */}} {{- range $configValue := .Values.worker.additionalJVMConfig }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{- if $workerJmx.enabled }} -Dcom.sun.management.jmxremote.rmi.port={{- $workerJmx.serverPort }} @@ -59,7 +59,7 @@ data: {{- end }} discovery.uri=http://{{ template "trino.fullname" . }}:{{ .Values.service.port }} {{- range $configValue := .Values.additionalConfigProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{- if $workerJmx.enabled }} jmx.rmiregistry.port={{- $workerJmx.registryPort }} @@ -69,7 +69,7 @@ data: shutdown.grace-period={{- .Values.worker.gracefulShutdown.gracePeriodSeconds -}}s {{- end }} {{- if .Values.server.workerExtraConfig }} - {{- .Values.server.workerExtraConfig | nindent 4 }} + {{- tpl (.Values.server.workerExtraConfig | nindent 4) . }} {{- end }} {{- if .Values.worker.gracefulShutdown.enabled }} @@ -83,20 +83,20 @@ data: exchange-manager.name={{ .Values.server.exchangeManager.name }} exchange.base-directories={{ .Values.server.exchangeManager.baseDir }} {{- range $configValue := .Values.additionalExchangeManagerProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{- end }} log.properties: | io.trino={{ .Values.server.log.trino.level }} {{- range $configValue := .Values.additionalLogProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{ if .Values.eventListenerProperties }} event-listener.properties: | {{- range $configValue := .Values.eventListenerProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{ end }} From a8e9234188c5f8d30b4474e8c84bc0427d5547c1 Mon Sep 17 00:00:00 2001 From: lozbrown Date: Mon, 6 Jan 2025 15:43:46 +0000 Subject: [PATCH 2/3] Update configmap-coordinator.yaml --- .../trino/templates/configmap-coordinator.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/trino/templates/configmap-coordinator.yaml b/charts/trino/templates/configmap-coordinator.yaml index 069c9b0e..a912ed8d 100644 --- a/charts/trino/templates/configmap-coordinator.yaml +++ b/charts/trino/templates/configmap-coordinator.yaml @@ -13,7 +13,7 @@ data: node.data-dir={{ .Values.server.node.dataDir }} plugin.dir={{ .Values.server.node.pluginDir }} {{- range $configValue := .Values.additionalNodeProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} jvm.config: | @@ -42,7 +42,7 @@ data: {{- end }}{{/* if */}} {{- end }}{{/* with */}} {{- range $configValue := .Values.coordinator.additionalJVMConfig }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{- if $coordinatorJmx.enabled }} -Dcom.sun.management.jmxremote.rmi.port={{- $coordinatorJmx.serverPort }} @@ -66,7 +66,7 @@ data: http-server.authentication.type={{ .Values.server.config.authenticationType }} {{- end }} {{- range $configValue := .Values.additionalConfigProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{- if .Values.server.config.https.enabled }} http-server.https.enabled=true @@ -81,7 +81,7 @@ data: shutdown.grace-period={{- .Values.worker.gracefulShutdown.gracePeriodSeconds -}}s {{- end }} {{- if .Values.server.coordinatorExtraConfig }} - {{- .Values.server.coordinatorExtraConfig | nindent 4 }} + {{- tpl (.Values.server.coordinatorExtraConfig | nindent 4) . }} {{- end }} {{- if .Values.accessControl }} @@ -95,7 +95,7 @@ data: {{- else if eq .Values.accessControl.type "properties" }} access-control.properties: | {{- if .Values.accessControl.properties }} - {{- .Values.accessControl.properties | nindent 4 }} + {{- tpl (.Values.accessControl.properties | nindent 4) . }} {{- else}} {{- fail "accessControl.properties is required when accessControl.type is 'properties'." }} {{- end }} @@ -126,14 +126,14 @@ data: exchange-manager.name={{ .Values.server.exchangeManager.name }} exchange.base-directories={{ .Values.server.exchangeManager.baseDir }} {{- range $configValue := .Values.additionalExchangeManagerProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{- end }} log.properties: | io.trino={{ .Values.server.log.trino.level }} {{- range $configValue := .Values.additionalLogProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{- if contains "PASSWORD" .Values.server.config.authenticationType }}{{- if not (index .Values.coordinator.additionalConfigFiles "password-authenticator.properties") }} @@ -154,7 +154,7 @@ data: {{ if .Values.eventListenerProperties }} event-listener.properties: | {{- range $configValue := .Values.eventListenerProperties }} - {{ $configValue }} + {{- tpl $configValue . }} {{- end }} {{ end }} From 3f3faf237ab660a61006a0ea41c660a561c71b78 Mon Sep 17 00:00:00 2001 From: lozbrown Date: Mon, 6 Jan 2025 15:46:22 +0000 Subject: [PATCH 3/3] Update configmap-catalog.yaml --- charts/trino/templates/configmap-catalog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/trino/templates/configmap-catalog.yaml b/charts/trino/templates/configmap-catalog.yaml index 74ef1b16..c627c8c1 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 }}