diff --git a/deploy/helm/listener-operator/Chart.yaml b/deploy/helm/listener-operator/Chart.yaml index 147360b2..6aeca8aa 100644 --- a/deploy/helm/listener-operator/Chart.yaml +++ b/deploy/helm/listener-operator/Chart.yaml @@ -12,19 +12,27 @@ icon: https://raw.githubusercontent.com/stackabletech/listener-operator/main/.re sources: - https://github.com/stackabletech/listener-operator keywords: ["listener", "load-balancer", "service-discovery", "networking", "kubernetes", "operator"] +# 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: networking # 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/listener-operator/ - name: support url: https://github.com/stackabletech/listener-operator/issues + - name: Operator image on quay.io + url: https://quay.io/repository/stackable/sdp/listener-operator artifacthub.io/crds: |- - kind: ListenerClass version: v1alpha1 diff --git a/deploy/helm/listener-operator/templates/_telemetry.tpl b/deploy/helm/listener-operator/templates/_telemetry.tpl index 48256983..66a20f89 100644 --- a/deploy/helm/listener-operator/templates/_telemetry.tpl +++ b/deploy/helm/listener-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 "listener-operator.telemetry.fileLogDirectory" -}} +/var/log/{{ include "listener-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 "listener-operator.appname" $ }} + value: {{ include "listener-operator.telemetry.fileLogDirectory" $ }} {{- end }} {{- if and .fileLog.enabled .fileLog.level }} - name: FILE_LOG_LEVEL diff --git a/nix/meta.json b/nix/meta.json index 3edbe6b8..485cf865 100644 --- a/nix/meta.json +++ b/nix/meta.json @@ -1 +1 @@ -{"operator": {"name": "listener-operator", "pretty_string": "Stackable Listener Operator", "chart_title": "Stackable Listener Operator", "product_string": "listener-operator", "url": "stackabletech/listener-operator.git", "artifacthub_repository_id": "739bf044-22df-4d16-b4a9-d2a326e3c821", "chart_description": "Kubernetes operator for exposing pods through listeners, load balancers and NodePorts. Part of the Stackable Data Platform (SDP).", "keywords": ["listener", "load-balancer", "service-discovery", "networking", "kubernetes", "operator"], "config": {"has_product": false, "run_as": "custom"}}} +{"operator": {"name": "listener-operator", "pretty_string": "Stackable Listener Operator", "chart_title": "Stackable Listener Operator", "product_string": "listener-operator", "url": "stackabletech/listener-operator.git", "artifacthub_repository_id": "739bf044-22df-4d16-b4a9-d2a326e3c821", "chart_description": "Kubernetes operator for exposing pods through listeners, load balancers and NodePorts. Part of the Stackable Data Platform (SDP).", "artifacthub_category": "networking", "keywords": ["listener", "load-balancer", "service-discovery", "networking", "kubernetes", "operator"], "config": {"has_product": false, "run_as": "custom"}}}