Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tempo-distributed] adds extraObjects as strings support #3603

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/tempo-distributed/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions charts/tempo-distributed/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 |
Expand Down
8 changes: 6 additions & 2 deletions charts/tempo-distributed/templates/extra-manifests.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{{ range .Values.extraObjects }}
---
{{ tpl (toYaml .) $ }}
{{ end }}
{{- if typeIs "string" . }}
{{ tpl . $ }}
{{ else }}
{{ tpl (. | toYaml) $ }}
{{- end }}
{{ end }}
34 changes: 24 additions & 10 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2434,14 +2434,28 @@ enterpriseGateway:
hosts:
- gateway.gem.example.com

# -- Create extra manifests via values.
# -- extraObjects could be utilized to 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" }}
Loading