From 3df45d51e716c35042594e76b8f00efc1b0f05f2 Mon Sep 17 00:00:00 2001 From: Ben Foster Date: Wed, 11 Sep 2024 12:26:04 -0400 Subject: [PATCH] [bitnami/grafana-tempo] Allow rendering resources values (#29344) * [bitnami/grafana-tempo] Allow rendering resources values This is done in other charts Signed-off-by: Ben Foster * Update CHANGELOG.md Signed-off-by: Bitnami Containers * Update CHANGELOG.md Signed-off-by: Bitnami Containers --------- Signed-off-by: Ben Foster Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/grafana-tempo/CHANGELOG.md | 8 ++++++-- bitnami/grafana-tempo/Chart.yaml | 2 +- bitnami/grafana-tempo/templates/compactor/deployment.yaml | 2 +- .../grafana-tempo/templates/distributor/deployment.yaml | 2 +- bitnami/grafana-tempo/templates/ingester/statefulset.yaml | 4 ++-- .../templates/metrics-generator/deployment.yaml | 2 +- bitnami/grafana-tempo/templates/querier/deployment.yaml | 2 +- .../templates/query-frontend/deployment.yaml | 2 +- bitnami/grafana-tempo/templates/vulture/deployment.yaml | 2 +- 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bitnami/grafana-tempo/CHANGELOG.md b/bitnami/grafana-tempo/CHANGELOG.md index 8d162dc59057bc..5bfa49197c960c 100644 --- a/bitnami/grafana-tempo/CHANGELOG.md +++ b/bitnami/grafana-tempo/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 3.7.9 (2024-09-06) +## 3.7.10 (2024-09-11) -* [bitnami/grafana-tempo] Release 3.7.9 ([#29238](https://github.com/bitnami/charts/pull/29238)) +* [bitnami/grafana-tempo] Allow rendering resources values ([#29344](https://github.com/bitnami/charts/pull/29344)) + +## 3.7.9 (2024-09-06) + +* [bitnami/grafana-tempo] Release 3.7.9 (#29238) ([4685bca](https://github.com/bitnami/charts/commit/4685bca5832244969c233e10ea9a350fa7ededb3)), closes [#29238](https://github.com/bitnami/charts/issues/29238) ## 3.7.8 (2024-09-04) diff --git a/bitnami/grafana-tempo/Chart.yaml b/bitnami/grafana-tempo/Chart.yaml index 6f149de34cf4b8..79349d9b33ed3b 100644 --- a/bitnami/grafana-tempo/Chart.yaml +++ b/bitnami/grafana-tempo/Chart.yaml @@ -39,4 +39,4 @@ maintainers: name: grafana-tempo sources: - https://github.com/bitnami/charts/tree/main/bitnami/grafana-tempo -version: 3.7.9 +version: 3.7.10 diff --git a/bitnami/grafana-tempo/templates/compactor/deployment.yaml b/bitnami/grafana-tempo/templates/compactor/deployment.yaml index 2022d0ce7d1194..d38f94eb1a7da2 100644 --- a/bitnami/grafana-tempo/templates/compactor/deployment.yaml +++ b/bitnami/grafana-tempo/templates/compactor/deployment.yaml @@ -113,7 +113,7 @@ spec: - containerPort: {{ .Values.tempo.containerPorts.gossipRing }} name: http-memberlist {{- if .Values.compactor.resources }} - resources: {{- toYaml .Values.compactor.resources | nindent 12 }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.resources "context" $) | nindent 12 }} {{- else if ne .Values.compactor.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.compactor.resourcesPreset) | nindent 12 }} {{- end }} diff --git a/bitnami/grafana-tempo/templates/distributor/deployment.yaml b/bitnami/grafana-tempo/templates/distributor/deployment.yaml index f51b9341ae9536..5041e307d89b0c 100644 --- a/bitnami/grafana-tempo/templates/distributor/deployment.yaml +++ b/bitnami/grafana-tempo/templates/distributor/deployment.yaml @@ -152,7 +152,7 @@ spec: protocol: TCP {{- end }} {{- if .Values.distributor.resources }} - resources: {{- toYaml .Values.distributor.resources | nindent 12 }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.resources "context" $) | nindent 12 }} {{- else if ne .Values.distributor.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.distributor.resourcesPreset) | nindent 12 }} {{- end }} diff --git a/bitnami/grafana-tempo/templates/ingester/statefulset.yaml b/bitnami/grafana-tempo/templates/ingester/statefulset.yaml index 92ec27c01c4bc1..6c195dfdb4a8d1 100644 --- a/bitnami/grafana-tempo/templates/ingester/statefulset.yaml +++ b/bitnami/grafana-tempo/templates/ingester/statefulset.yaml @@ -90,7 +90,7 @@ spec: securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} {{- end }} {{- if .Values.volumePermissions.resources }} - resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.resources "context" $) | nindent 12 }} {{- else if ne .Values.volumePermissions.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.volumePermissions.resourcesPreset) | nindent 12 }} {{- end }} @@ -143,7 +143,7 @@ spec: - containerPort: {{ .Values.tempo.containerPorts.grpc }} name: grpc {{- if .Values.ingester.resources }} - resources: {{- toYaml .Values.ingester.resources | nindent 12 }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.resources "context" $) | nindent 12 }} {{- else if ne .Values.ingester.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.ingester.resourcesPreset) | nindent 12 }} {{- end }} diff --git a/bitnami/grafana-tempo/templates/metrics-generator/deployment.yaml b/bitnami/grafana-tempo/templates/metrics-generator/deployment.yaml index 52269e4739b794..393d19ca7856a2 100644 --- a/bitnami/grafana-tempo/templates/metrics-generator/deployment.yaml +++ b/bitnami/grafana-tempo/templates/metrics-generator/deployment.yaml @@ -112,7 +112,7 @@ spec: - containerPort: {{ .Values.tempo.containerPorts.grpc }} name: grpc {{- if .Values.metricsGenerator.resources }} - resources: {{- toYaml .Values.metricsGenerator.resources | nindent 12 }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.metricsGenerator.resources "context" $) | nindent 12 }} {{- else if ne .Values.metricsGenerator.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.metricsGenerator.resourcesPreset) | nindent 12 }} {{- end }} diff --git a/bitnami/grafana-tempo/templates/querier/deployment.yaml b/bitnami/grafana-tempo/templates/querier/deployment.yaml index b5fb433368e0b1..e03984417b7b09 100644 --- a/bitnami/grafana-tempo/templates/querier/deployment.yaml +++ b/bitnami/grafana-tempo/templates/querier/deployment.yaml @@ -112,7 +112,7 @@ spec: - containerPort: {{ .Values.tempo.containerPorts.grpc }} name: grpc {{- if .Values.querier.resources }} - resources: {{- toYaml .Values.querier.resources | nindent 12 }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.querier.resources "context" $) | nindent 12 }} {{- else if ne .Values.querier.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.querier.resourcesPreset) | nindent 12 }} {{- end }} diff --git a/bitnami/grafana-tempo/templates/query-frontend/deployment.yaml b/bitnami/grafana-tempo/templates/query-frontend/deployment.yaml index 95a16603068e53..9cbbe9053acccf 100644 --- a/bitnami/grafana-tempo/templates/query-frontend/deployment.yaml +++ b/bitnami/grafana-tempo/templates/query-frontend/deployment.yaml @@ -111,7 +111,7 @@ spec: - containerPort: {{ .Values.tempo.containerPorts.grpc }} name: grpc {{- if .Values.queryFrontend.resources }} - resources: {{- toYaml .Values.queryFrontend.resources | nindent 12 }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.resources "context" $) | nindent 12 }} {{- else if ne .Values.queryFrontend.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.queryFrontend.resourcesPreset) | nindent 12 }} {{- end }} diff --git a/bitnami/grafana-tempo/templates/vulture/deployment.yaml b/bitnami/grafana-tempo/templates/vulture/deployment.yaml index 259a5526b8b3da..063004ed9dcee8 100644 --- a/bitnami/grafana-tempo/templates/vulture/deployment.yaml +++ b/bitnami/grafana-tempo/templates/vulture/deployment.yaml @@ -110,7 +110,7 @@ spec: - containerPort: {{ .Values.vulture.containerPorts.http }} name: http {{- if .Values.vulture.resources }} - resources: {{- toYaml .Values.vulture.resources | nindent 12 }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.vulture.resources "context" $) | nindent 12 }} {{- else if ne .Values.vulture.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.vulture.resourcesPreset) | nindent 12 }} {{- end }}