From fe297322894bd67e4282c47a147576f58478fab1 Mon Sep 17 00:00:00 2001 From: Marshall Ford Date: Fri, 14 Mar 2025 14:06:08 -0500 Subject: [PATCH 1/2] adds extraObjects as strings support to tempo-distributed chart Signed-off-by: Marshall Ford --- charts/tempo-distributed/Chart.yaml | 2 +- .../templates/extra-manifests.yaml | 8 +++-- charts/tempo-distributed/values.yaml | 34 +++++++++++++------ 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index ee46dcf6e8..4511c0e6eb 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.32.7 +version: 1.32.8 appVersion: 2.7.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/templates/extra-manifests.yaml b/charts/tempo-distributed/templates/extra-manifests.yaml index 2855904ec7..578be451fb 100644 --- a/charts/tempo-distributed/templates/extra-manifests.yaml +++ b/charts/tempo-distributed/templates/extra-manifests.yaml @@ -1,4 +1,8 @@ {{ range .Values.extraObjects }} --- -{{ tpl (toYaml .) $ }} -{{ end }} \ No newline at end of file +{{- if typeIs "string" . }} + {{ tpl . $ }} +{{ else }} + {{ tpl (. | toYaml) $ }} +{{- end }} +{{ end }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index f2929e225a..0287cf19c8 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -2434,14 +2434,28 @@ enterpriseGateway: hosts: - gateway.gem.example.com -# -- Create extra manifests via values. +# Add dynamic manifests via values extraObjects: [] - # - apiVersion: "kubernetes-client.io/v1" - # kind: ExternalSecret - # metadata: - # name: tempo-secrets - # spec: - # backendType: aws - # data: - # - key: secret-access-key - # name: awssm-secret +# Examples: +# extraObjects: +# - apiVersion: kubernetes-client.io/v1 +# kind: ExternalSecret +# metadata: +# name: tempo-secrets-{{ .Release.Name }} +# spec: +# backendType: aws +# data: +# - key: secret-access-key +# name: awssm-secret +# Alternatively, you can use strings, which lets you use additional templating features: +# extraObjects: +# - | +# apiVersion: kubernetes-client.io/v1 +# kind: ExternalSecret +# metadata: +# name: tempo-secrets-{{ .Release.Name }} +# spec: +# backendType: aws +# data: +# - key: secret-access-key +# name: {{ include "some-other-template" }} From 491d2e344c4a0e1e6c96db0529aeb832dac53de8 Mon Sep 17 00:00:00 2001 From: Marshall Ford Date: Fri, 14 Mar 2025 16:01:21 -0500 Subject: [PATCH 2/2] adds extraObjects as strings support to tempo-distributed chart Signed-off-by: Marshall Ford --- charts/tempo-distributed/README.md | 4 ++-- charts/tempo-distributed/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 7778a5ffce..b20f180a70 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.32.7](https://img.shields.io/badge/Version-1.32.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.1](https://img.shields.io/badge/AppVersion-2.7.1-informational?style=flat-square) +![Version: 1.32.8](https://img.shields.io/badge/Version-1.32.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.1](https://img.shields.io/badge/AppVersion-2.7.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -466,7 +466,7 @@ The memcached default args are removed and should be provided manually. The sett | externalConfigSecretName | string | `"{{ include \"tempo.resourceName\" (dict \"ctx\" . \"component\" \"config\") }}"` | Name of the Secret or ConfigMap that contains the configuration (used for naming even if config is internal). | | externalConfigVersion | string | `"0"` | When 'useExternalConfig' is true, then changing 'externalConfigVersion' triggers restart of services - otherwise changes to the configuration cause a restart. | | externalRuntimeConfigName | string | `"{{ include \"tempo.resourceName\" (dict \"ctx\" . \"component\" \"runtime\") }}"` | Name of the Secret or ConfigMap that contains the runtime configuration (used for naming even if config is internal). | -| extraObjects | list | `[]` | Create extra manifests via values. | +| extraObjects | list | `[]` | extraObjects could be utilized to add dynamic manifests via values | | fullnameOverride | string | `""` | | | gateway.affinity | string | Hard node and soft zone anti-affinity | Affinity for gateway pods. Passed through `tpl` and, thus, to be configured as string | | gateway.autoscaling.behavior | object | `{}` | Autoscaling behavior configuration for the gateway | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 0287cf19c8..a39d5ac0b2 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -2434,7 +2434,7 @@ enterpriseGateway: hosts: - gateway.gem.example.com -# Add dynamic manifests via values +# -- extraObjects could be utilized to add dynamic manifests via values extraObjects: [] # Examples: # extraObjects: