From bcb3ad68390f53e008931c065bef58d595703042 Mon Sep 17 00:00:00 2001 From: David Pusch Date: Tue, 6 Dec 2022 17:38:20 +0100 Subject: [PATCH] Add capability to define additional ports on gateway service This creates a way to use the gateway for more complex scenarios in combination with .Values.gateway.nginxConfig.httpSnippet. Signed-off-by: David Pusch --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 3 ++- .../templates/gateway/service-gateway.yaml | 6 ++++++ charts/tempo-distributed/values.yaml | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 2fb4723bdf..99a91ee079 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 0.27.10 +version: 0.27.14 appVersion: 1.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index ae85257989..48cc8adaf3 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 0.27.10](https://img.shields.io/badge/Version-0.27.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square) +![Version: 0.27.14](https://img.shields.io/badge/Version-0.27.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -349,6 +349,7 @@ The memcached default args are removed and should be provided manually. The sett | gateway.readinessProbe.timeoutSeconds | int | `1` | | | gateway.replicas | int | `1` | Number of replicas for the gateway | | gateway.resources | object | `{}` | Resource requests and limits for the gateway | +| gateway.service.additionalPorts | object | `{}` | Additional ports to be opneed on gateway service (e.g. for RPC connections) | | gateway.service.annotations | object | `{}` | Annotations for the gateway service | | gateway.service.clusterIP | string | `nil` | ClusterIP of the gateway service | | gateway.service.labels | object | `{}` | Labels for gateway service | diff --git a/charts/tempo-distributed/templates/gateway/service-gateway.yaml b/charts/tempo-distributed/templates/gateway/service-gateway.yaml index dd121e183e..f6bdd18fae 100644 --- a/charts/tempo-distributed/templates/gateway/service-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/service-gateway.yaml @@ -28,6 +28,12 @@ spec: nodePort: {{ .Values.gateway.service.nodePort }} {{- end }} protocol: TCP + {{ range .Values.gateway.service.additionalPorts }} + - name: {{ .name }} + port: {{ .port }} + targetPort: {{ .targetPort }} + protocol: {{ .protocol }} + {{ end }} selector: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "gateway") | nindent 4 }} {{- end }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 7d5d21045a..b579ca6c74 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1196,6 +1196,8 @@ gateway: annotations: {} # -- Labels for gateway service labels: {} + # -- Additional ports to be opneed on gateway service (e.g. for RPC connections) + additionalPorts: {} # Gateway ingress configuration ingress: # -- Specifies whether an ingress for the gateway should be created