From 204a3028cb43472394fccca3bc44b6d7500080ba Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Fri, 9 Oct 2026 15:55:52 +0000 Subject: [PATCH] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@fb924df5c043cc95473cd38e6edb187b6e675b0e Reference-to: stackabletech/operator-templating@fb924df (Write operator file logs to an emptyDir under /var/log, and complete the Artifact Hub metadata in Chart.yaml) --- deploy/helm/trino-operator/Chart.yaml | 13 ++++++++++++- deploy/helm/trino-operator/templates/_telemetry.tpl | 9 ++++++++- .../helm/trino-operator/templates/deployment.yaml | 10 ++++++++++ nix/meta.json | 2 +- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/deploy/helm/trino-operator/Chart.yaml b/deploy/helm/trino-operator/Chart.yaml index 2508bd3a..04766ae2 100644 --- a/deploy/helm/trino-operator/Chart.yaml +++ b/deploy/helm/trino-operator/Chart.yaml @@ -12,19 +12,30 @@ icon: https://raw.githubusercontent.com/stackabletech/trino-operator/main/.readm sources: - https://github.com/stackabletech/trino-operator keywords: ["trino", "sql", "query-engine", "federation", "kubernetes", "operator", "big-data"] +# Artifact Hub drops any maintainer entry that has no email. maintainers: - - name: Stackable + - name: Stackable GmbH + email: info@stackable.tech url: https://www.stackable.tech # Consumed by Artifact Hub, see https://artifacthub.io/docs/topics/annotations/helm/ annotations: # The chart package ships no LICENSE file, so Artifact Hub cannot detect this itself. artifacthub.io/license: OSL-3.0 + # Artifact Hub currently infers this from "operator" in the chart name but I don't want to rely on the heuristics. + artifacthub.io/operator: "true" + # Unset means Artifact Hub predicts a category from the keywords, which it gets wrong a lot for our stuff + artifacthub.io/category: database + artifacthub.io/alternativeName: trino # A link named "support" is rendered highlighted by Artifact Hub. Keep it lowercase. artifacthub.io/links: | - name: Documentation url: https://docs.stackable.tech/home/stable/trino/ + - name: Stackable Hub + url: https://hub.stackable.tech/components/trino - name: support url: https://github.com/stackabletech/trino-operator/issues + - name: Operator image on quay.io + url: https://quay.io/repository/stackable/sdp/trino-operator artifacthub.io/crds: |- - kind: TrinoCluster version: v1alpha1 diff --git a/deploy/helm/trino-operator/templates/_telemetry.tpl b/deploy/helm/trino-operator/templates/_telemetry.tpl index 4af6c6db..da55c5d0 100644 --- a/deploy/helm/trino-operator/templates/_telemetry.tpl +++ b/deploy/helm/trino-operator/templates/_telemetry.tpl @@ -1,3 +1,10 @@ +{{/* +Used by FILE_LOG_DIRECTORY and the log volume mount in deployment.yaml, which have to agree. +*/}} +{{- define "trino-operator.telemetry.fileLogDirectory" -}} +/var/log/{{ include "trino-operator.appname" . }} +{{- end }} + {{/* Create a list of telemetry related env vars. */}} @@ -17,7 +24,7 @@ Create a list of telemetry related env vars. {{ end }} {{- if .fileLog.enabled }} - name: FILE_LOG_DIRECTORY - value: /stackable/logs/{{ include "trino-operator.appname" $ }} + value: {{ include "trino-operator.telemetry.fileLogDirectory" $ }} {{- end }} {{- if and .fileLog.enabled .fileLog.level }} - name: FILE_LOG_LEVEL diff --git a/deploy/helm/trino-operator/templates/deployment.yaml b/deploy/helm/trino-operator/templates/deployment.yaml index 790ef4fc..7553a374 100644 --- a/deploy/helm/trino-operator/templates/deployment.yaml +++ b/deploy/helm/trino-operator/templates/deployment.yaml @@ -92,6 +92,11 @@ spec: periodSeconds: 3 failureThreshold: 30 timeoutSeconds: 3 + {{- if .Values.telemetry.fileLog.enabled }} + volumeMounts: + - name: log + mountPath: {{ include "trino-operator.telemetry.fileLogDirectory" . }} + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -107,3 +112,8 @@ spec: {{- with .Values.priorityClassName }} priorityClassName: {{ . }} {{- end }} + {{- if .Values.telemetry.fileLog.enabled }} + volumes: + - name: log + emptyDir: {} + {{- end }} diff --git a/nix/meta.json b/nix/meta.json index 0e3129bd..5049c539 100644 --- a/nix/meta.json +++ b/nix/meta.json @@ -1 +1 @@ -{"operator": {"name": "trino-operator", "pretty_string": "Trino", "product_string": "trino", "url": "stackabletech/trino-operator.git", "artifacthub_repository_id": "02de1bee-270f-4d85-bc30-6e5d2288b2b7", "chart_description": "Kubernetes operator for Trino. Deploy and run Trino coordinators and workers with the Stackable Data Platform (SDP).", "keywords": ["trino", "sql", "query-engine", "federation", "kubernetes", "operator", "big-data"]}} +{"operator": {"name": "trino-operator", "pretty_string": "Trino", "product_string": "trino", "url": "stackabletech/trino-operator.git", "artifacthub_repository_id": "02de1bee-270f-4d85-bc30-6e5d2288b2b7", "chart_description": "Kubernetes operator for Trino. Deploy and run Trino coordinators and workers with the Stackable Data Platform (SDP).", "artifacthub_category": "database", "artifacthub_alternative_name": "trino", "keywords": ["trino", "sql", "query-engine", "federation", "kubernetes", "operator", "big-data"]}}