From e0a7fb2f64a4488056b984bdcfa7e85f4bb73b83 Mon Sep 17 00:00:00 2001 From: Mathieu Bodjikian Date: Tue, 10 Sep 2024 15:58:35 +0200 Subject: [PATCH] feat: templatise tempo-distributed chart services annoations Signed-off-by: Mathieu Bodjikian --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- .../templates/compactor/service-compactor.yaml | 2 +- .../templates/distributor/service-distributor-discovery.yaml | 2 +- .../templates/distributor/service-distributor.yaml | 2 +- .../service-federation-frontend.yaml | 2 +- charts/tempo-distributed/templates/gateway/service-gateway.yaml | 2 +- .../templates/ingester/service-ingester-discovery.yaml | 2 +- .../tempo-distributed/templates/ingester/service-ingester.yaml | 2 +- .../templates/memcached/service-memcached.yaml | 2 +- .../metrics-generator/service-metrics-generator-discovery.yaml | 2 +- .../templates/metrics-generator/service-metrics-generator.yaml | 2 +- charts/tempo-distributed/templates/querier/service-querier.yaml | 2 +- .../query-frontend/service-query-frontend-discovery.yaml | 2 +- .../templates/query-frontend/service-query-frontend.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 0c31a9b274..9f57b1e752 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: 1.18.0 +version: 1.19.0 appVersion: 2.6.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 fbbcf5dd28..8c8971cf25 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.19.0](https://img.shields.io/badge/Version-1.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/templates/compactor/service-compactor.yaml b/charts/tempo-distributed/templates/compactor/service-compactor.yaml index d280df9322..dcbacc273b 100644 --- a/charts/tempo-distributed/templates/compactor/service-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/service-compactor.yaml @@ -6,7 +6,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "compactor") | nindent 4 }} {{- with .Values.compactor.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml b/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml index d15797cac2..a226788b55 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml @@ -12,7 +12,7 @@ metadata: prometheus.io/service-monitor: "false" {{- with .Values.distributor.serviceDiscovery.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/distributor/service-distributor.yaml b/charts/tempo-distributed/templates/distributor/service-distributor.yaml index efd7574110..a7174f2a00 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- with .Values.distributor.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.distributor.service.type }} diff --git a/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml b/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml index 8eb08042d9..8d1db22ce1 100644 --- a/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml +++ b/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml @@ -8,7 +8,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "enterprise-federation-frontend") | nindent 4 }} {{- with .Values.enterpriseFederationFrontend.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.enterpriseFederationFrontend.service.type }} diff --git a/charts/tempo-distributed/templates/gateway/service-gateway.yaml b/charts/tempo-distributed/templates/gateway/service-gateway.yaml index 6270cf7578..97efb6fd19 100644 --- a/charts/tempo-distributed/templates/gateway/service-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/service-gateway.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- with .Values.gateway.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.gateway.service.type }} diff --git a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml index 6c26ccf23a..2835cd866e 100644 --- a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml +++ b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml @@ -9,7 +9,7 @@ metadata: prometheus.io/service-monitor: "false" {{- with .Values.ingester.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/ingester/service-ingester.yaml b/charts/tempo-distributed/templates/ingester/service-ingester.yaml index 61e2fa7ab5..988c891028 100644 --- a/charts/tempo-distributed/templates/ingester/service-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/service-ingester.yaml @@ -8,7 +8,7 @@ metadata: {{- include "tempo.labels" $dict | nindent 4 }} {{- with .Values.ingester.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/memcached/service-memcached.yaml b/charts/tempo-distributed/templates/memcached/service-memcached.yaml index 21e1455f02..64806afc63 100644 --- a/charts/tempo-distributed/templates/memcached/service-memcached.yaml +++ b/charts/tempo-distributed/templates/memcached/service-memcached.yaml @@ -8,7 +8,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "memcached") | nindent 4 }} {{- with .Values.memcached.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml index 48eb8468ba..8fb96f85cb 100644 --- a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml @@ -10,7 +10,7 @@ metadata: prometheus.io/service-monitor: "false" {{- with .Values.metricsGenerator.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml index c2550fd96f..f0ca27a68e 100644 --- a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml @@ -9,7 +9,7 @@ metadata: {{- include "tempo.labels" $dict | nindent 4 }} {{- with .Values.metricsGenerator.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/querier/service-querier.yaml b/charts/tempo-distributed/templates/querier/service-querier.yaml index cea6816c03..b13348b0f8 100644 --- a/charts/tempo-distributed/templates/querier/service-querier.yaml +++ b/charts/tempo-distributed/templates/querier/service-querier.yaml @@ -7,7 +7,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "querier") | nindent 4 }} {{- with .Values.querier.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml index ba91e8f8a4..48d2c28f4c 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml @@ -10,7 +10,7 @@ metadata: {{- end }} {{- with .Values.queryFrontend.serviceDiscovery.annotations }} annotations: - {{ toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml index 153ca95b41..d737e7e52c 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml @@ -10,7 +10,7 @@ metadata: {{- end }} {{- with .Values.queryFrontend.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.queryFrontend.service.type }}