From 3603cc70c9c169cac997cc173a5b92a6b1adcd3f Mon Sep 17 00:00:00 2001 From: Carim Date: Mon, 30 Aug 2021 16:54:09 +0200 Subject: [PATCH 1/3] Add pod labels --- README.md | 1 + charts/trino/templates/deployment-coordinator.yaml | 3 +++ charts/trino/templates/deployment-worker.yaml | 3 +++ charts/trino/values.yaml | 2 ++ 4 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 38b30df0..5970ba31 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ The following table lists the configurable parameters of the Trino chart and the | `additionalConfigProperties` | | `{}` | | `additionalLogProperties` | | `{}` | | `additionalCatalogs` | | `{}` | +| `podLabels` | | `{}` | | `securityContext.runAsUser` | | `1000` | | `securityContext.runAsGroup` | | `1000` | | `service.type` | | `"ClusterIP"` | diff --git a/charts/trino/templates/deployment-coordinator.yaml b/charts/trino/templates/deployment-coordinator.yaml index 0c990093..c01a2870 100644 --- a/charts/trino/templates/deployment-coordinator.yaml +++ b/charts/trino/templates/deployment-coordinator.yaml @@ -20,6 +20,9 @@ spec: app: {{ template "trino.name" . }} release: {{ .Release.Name }} component: coordinator + {{- if .Values.podLabels }} + {{ toYaml .Values.podLabels | nindent 8 }} + {{- end }} spec: {{- with .Values.securityContext }} securityContext: diff --git a/charts/trino/templates/deployment-worker.yaml b/charts/trino/templates/deployment-worker.yaml index 8adfa009..c9a8537c 100644 --- a/charts/trino/templates/deployment-worker.yaml +++ b/charts/trino/templates/deployment-worker.yaml @@ -22,6 +22,9 @@ spec: app: {{ template "trino.name" . }} release: {{ .Release.Name }} component: worker + {{- if .Values.podLabels }} + {{ toYaml .Values.podLabels | nindent 8 }} + {{- end }} spec: volumes: - name: config-volume diff --git a/charts/trino/values.yaml b/charts/trino/values.yaml index 8e94586c..9d075f2e 100644 --- a/charts/trino/values.yaml +++ b/charts/trino/values.yaml @@ -69,3 +69,5 @@ nodeSelector: {} tolerations: [] affinity: {} + +podLabels: {} \ No newline at end of file From 496762b9b0d2a9c5410bf8cfe12222c6069632c2 Mon Sep 17 00:00:00 2001 From: Carim Date: Mon, 30 Aug 2021 18:10:23 +0200 Subject: [PATCH 2/3] Add newline --- charts/trino/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/trino/values.yaml b/charts/trino/values.yaml index 9d075f2e..7c34e605 100644 --- a/charts/trino/values.yaml +++ b/charts/trino/values.yaml @@ -70,4 +70,4 @@ tolerations: [] affinity: {} -podLabels: {} \ No newline at end of file +podLabels: {} From bacb177a88a8ece6d41086ad3182052588923a4c Mon Sep 17 00:00:00 2001 From: Carim Date: Tue, 31 Aug 2021 19:53:56 +0200 Subject: [PATCH 3/3] Split labels for worker and coordinator. Improve README --- README.md | 5 +- charts/trino/README.md | 58 +++++++++++++++++++ .../templates/deployment-coordinator.yaml | 4 +- charts/trino/templates/deployment-worker.yaml | 4 +- charts/trino/values.yaml | 8 ++- 5 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 charts/trino/README.md diff --git a/README.md b/README.md index 5970ba31..653dd4b6 100644 --- a/README.md +++ b/README.md @@ -30,10 +30,10 @@ The following table lists the configurable parameters of the Trino chart and the | `server.jvm.gcMethod.g1.heapRegionSize` | | `"32M"` | | `additionalNodeProperties` | | `{}` | | `additionalJVMConfig` | | `{}` | -| `additionalConfigProperties` | | `{}` | +| `additionalConfigProperties` | | `[]` | | `additionalLogProperties` | | `{}` | | `additionalCatalogs` | | `{}` | -| `podLabels` | | `{}` | +| `coordinatorPodLabels` | | `{}` | | `securityContext.runAsUser` | | `1000` | | `securityContext.runAsGroup` | | `1000` | | `service.type` | | `"ClusterIP"` | @@ -41,6 +41,7 @@ The following table lists the configurable parameters of the Trino chart and the | `resources` | | `{}` | | `nodeSelector` | | `{}` | | `tolerations` | | `[]` | +| `workerPodLabels` | | `{}` | | `affinity` | | `{}` | --- diff --git a/charts/trino/README.md b/charts/trino/README.md new file mode 100644 index 00000000..a4cc7ea5 --- /dev/null +++ b/charts/trino/README.md @@ -0,0 +1,58 @@ +# trino + +![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 355](https://img.shields.io/badge/AppVersion-355-informational?style=flat-square) + +Fast distributed SQL query engine for big data analytics + +**Homepage:** + +## Maintainers + +| Name | Email | Url | +| ---- | ------ | --- | +| Trino community | | | + +## Source Code + +* +* + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| additionalCatalogs | object | `{}` | | +| additionalConfigProperties | list | `[]` | | +| additionalJVMConfig | object | `{}` | | +| additionalLogProperties | object | `{}` | | +| additionalNodeProperties | object | `{}` | | +| affinity | object | `{}` | | +| coordinatorPodLabels | object | `{}` | Labels for coordinator pods | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `"trinodb/trino"` | | +| image.tag | string | `"latest"` | | +| nodeSelector | object | `{}` | | +| resources | object | `{}` | | +| securityContext.runAsGroup | int | `1000` | | +| securityContext.runAsUser | int | `1000` | | +| server.config.http.port | int | `8080` | | +| server.config.memory.heapHeadroomPerNode | string | `"1GB"` | | +| server.config.path | string | `"/etc/trino"` | | +| server.config.query.maxMemory | string | `"4GB"` | | +| server.config.query.maxMemoryPerNode | string | `"1GB"` | | +| server.config.query.maxTotalMemoryPerNode | string | `"2GB"` | | +| server.jvm.gcMethod.g1.heapRegionSize | string | `"32M"` | | +| server.jvm.gcMethod.type | string | `"UseG1GC"` | | +| server.jvm.maxHeapSize | string | `"8G"` | | +| server.log.trino.level | string | `"INFO"` | | +| server.node.dataDir | string | `"/data/trino"` | | +| server.node.environment | string | `"production"` | | +| server.node.pluginDir | string | `"/usr/lib/trino/plugin"` | | +| server.workers | int | `2` | | +| service.port | int | `8080` | | +| service.type | string | `"ClusterIP"` | | +| tolerations | list | `[]` | | +| workerPodLabels | object | `{}` | Labels for worker pods | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0) diff --git a/charts/trino/templates/deployment-coordinator.yaml b/charts/trino/templates/deployment-coordinator.yaml index c01a2870..eee0ff35 100644 --- a/charts/trino/templates/deployment-coordinator.yaml +++ b/charts/trino/templates/deployment-coordinator.yaml @@ -20,8 +20,8 @@ spec: app: {{ template "trino.name" . }} release: {{ .Release.Name }} component: coordinator - {{- if .Values.podLabels }} - {{ toYaml .Values.podLabels | nindent 8 }} + {{- if .Values.coordinatorPodLabels }} + {{ toYaml .Values.coordinatorPodLabels | nindent 8 }} {{- end }} spec: {{- with .Values.securityContext }} diff --git a/charts/trino/templates/deployment-worker.yaml b/charts/trino/templates/deployment-worker.yaml index c9a8537c..de86f11d 100644 --- a/charts/trino/templates/deployment-worker.yaml +++ b/charts/trino/templates/deployment-worker.yaml @@ -22,8 +22,8 @@ spec: app: {{ template "trino.name" . }} release: {{ .Release.Name }} component: worker - {{- if .Values.podLabels }} - {{ toYaml .Values.podLabels | nindent 8 }} + {{- if .Values.workerPodLabels }} + {{ toYaml .Values.workerPodLabels | nindent 8 }} {{- end }} spec: volumes: diff --git a/charts/trino/values.yaml b/charts/trino/values.yaml index 7c34e605..8fb5d76f 100644 --- a/charts/trino/values.yaml +++ b/charts/trino/values.yaml @@ -38,7 +38,7 @@ additionalNodeProperties: {} additionalJVMConfig: {} -additionalConfigProperties: {} +additionalConfigProperties: [] additionalLogProperties: {} @@ -70,4 +70,8 @@ tolerations: [] affinity: {} -podLabels: {} +# -- Labels for coordinator pods +coordinatorPodLabels: {} + +# -- Labels for worker pods +workerPodLabels: {}