diff --git a/valeriano-manassero/trino/Chart.yaml b/valeriano-manassero/trino/Chart.yaml index 0bf894d..8286601 100644 --- a/valeriano-manassero/trino/Chart.yaml +++ b/valeriano-manassero/trino/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "433" description: High performance, distributed SQL query engine for big data name: trino -version: 9.0.0 +version: 9.1.0 kubeVersion: ">= 1.24.0-0 < 1.29.0-0" home: https://trino.io icon: https://trino.io/assets/images/trino-logo/trino-ko_tiny-alt.svg @@ -27,4 +27,4 @@ keywords: annotations: artifacthub.io/changes: | - kind: changed - description: modify JVM configurations to work with 433 version + description: restore ability to provide fault tolerance config without b64 encoded secret diff --git a/valeriano-manassero/trino/README.md b/valeriano-manassero/trino/README.md index 1ef4786..53c1469 100644 --- a/valeriano-manassero/trino/README.md +++ b/valeriano-manassero/trino/README.md @@ -1,6 +1,6 @@ # trino -![Version: 9.0.0](https://img.shields.io/badge/Version-9.0.0-informational?style=flat-square) ![AppVersion: 433](https://img.shields.io/badge/AppVersion-433-informational?style=flat-square) +![Version: 9.1.0](https://img.shields.io/badge/Version-9.1.0-informational?style=flat-square) ![AppVersion: 433](https://img.shields.io/badge/AppVersion-433-informational?style=flat-square) High performance, distributed SQL query engine for big data @@ -89,6 +89,7 @@ Kubernetes: `>= 1.24.0-0 < 1.29.0-0` | connectors | object | `{}` | | | containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}` | SecurityContext configuration for containers | | eventListenerProperties | object | `{}` | | +| faultTolerance.configAsSecret | bool | `true` | | | faultTolerance.enabled | bool | `false` | | | fullnameOverride | string | `"trino"` | | | groupProvider | object | `{}` | | diff --git a/valeriano-manassero/trino/templates/configmap-coordinator.yaml b/valeriano-manassero/trino/templates/configmap-coordinator.yaml index 0446674..934f68b 100644 --- a/valeriano-manassero/trino/templates/configmap-coordinator.yaml +++ b/valeriano-manassero/trino/templates/configmap-coordinator.yaml @@ -102,6 +102,12 @@ data: {{ .Values.groupProvider.customProperties | indent 4 }} {{- end }}{{- end }} +{{- if .Values.faultTolerance.enabled }}{{- if not .Values.faultTolerance.configAsSecret }} + exchange-manager.properties: | + exchange-manager.name=filesystem +{{ .Values.faultTolerance.properties | indent 4 }} +{{- end }}{{- end }} + {{ if .Values.eventListenerProperties }} event-listener.properties: | {{- range $configValue := .Values.eventListenerProperties }} diff --git a/valeriano-manassero/trino/templates/configmap-worker.yaml b/valeriano-manassero/trino/templates/configmap-worker.yaml index 1275dae..035cb51 100644 --- a/valeriano-manassero/trino/templates/configmap-worker.yaml +++ b/valeriano-manassero/trino/templates/configmap-worker.yaml @@ -52,6 +52,12 @@ data: log.properties: | io.trino={{ .Values.config.general.log.trino.level }} +{{- if .Values.faultTolerance.enabled }}{{- if not .Values.faultTolerance.configAsSecret }} + exchange-manager.properties: | + exchange-manager.name=filesystem +{{ .Values.faultTolerance.properties | indent 4 }} +{{- end }}{{- end }} + {{ if .Values.eventListenerProperties }} event-listener.properties: | {{- range $configValue := .Values.eventListenerProperties }} diff --git a/valeriano-manassero/trino/templates/deployment-coordinator.yaml b/valeriano-manassero/trino/templates/deployment-coordinator.yaml index b16f80b..226c6f0 100644 --- a/valeriano-manassero/trino/templates/deployment-coordinator.yaml +++ b/valeriano-manassero/trino/templates/deployment-coordinator.yaml @@ -34,7 +34,7 @@ spec: - configMap: name: {{ template "trino.coordinator" . }} - {{- if .Values.faultTolerance.enabled }} + {{- if and .Values.faultTolerance.enabled .Values.faultTolerance.configAsSecret }} - secret: name: {{ .Values.faultToleranceSecret | default "trino-fault-tolerance" }} {{- end }} diff --git a/valeriano-manassero/trino/templates/deployment-worker.yaml b/valeriano-manassero/trino/templates/deployment-worker.yaml index f6a4a62..15d4f21 100644 --- a/valeriano-manassero/trino/templates/deployment-worker.yaml +++ b/valeriano-manassero/trino/templates/deployment-worker.yaml @@ -35,7 +35,7 @@ spec: - configMap: name: {{ template "trino.worker" . }} - {{- if .Values.faultTolerance.enabled }} + {{- if and .Values.faultTolerance.enabled .Values.faultTolerance.configAsSecret }} - secret: name: {{ .Values.faultToleranceSecret | default "trino-fault-tolerance" }} {{- end }} diff --git a/valeriano-manassero/trino/templates/secret.yaml b/valeriano-manassero/trino/templates/secret.yaml index 03d8274..7100bfc 100644 --- a/valeriano-manassero/trino/templates/secret.yaml +++ b/valeriano-manassero/trino/templates/secret.yaml @@ -23,7 +23,7 @@ data: password.db: {{ .Values.auth.passwordAuth | b64enc }} {{- end }}{{- end }}{{- end }} --- -{{- if .Values.faultTolerance.enabled }}{{- if not .Values.faultToleranceSecret }} +{{- if and .Values.faultTolerance.enabled .Values.faultTolerance.configAsSecret (not .Values.faultToleranceSecret)}} apiVersion: v1 kind: Secret metadata: @@ -33,4 +33,4 @@ metadata: data: exchange-manager.properties: | {{ .Values.faultTolerance.properties | b64enc }} -{{- end }}{{- end }} +{{- end }} diff --git a/valeriano-manassero/trino/values.yaml b/valeriano-manassero/trino/values.yaml index dd2448b..b970df1 100644 --- a/valeriano-manassero/trino/values.yaml +++ b/valeriano-manassero/trino/values.yaml @@ -353,6 +353,7 @@ groupProvider: {} faultTolerance: enabled: false + configAsSecret: true # properties: |- # exchange-manager.name=filesystem # exchange.base-directories=s3://