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] Declare after installation #3479

Open
wants to merge 8 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.26.2
version: 1.26.3
appVersion: 2.6.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
6 changes: 3 additions & 3 deletions charts/tempo-distributed/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 1.26.2](https://img.shields.io/badge/Version-1.26.2-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.26.3](https://img.shields.io/badge/Version-1.26.3-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

Expand Down Expand Up @@ -412,8 +412,8 @@ The memcached default args are removed and should be provided manually. The sett
| enterpriseGateway.image.tag | string | `nil` | Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag` |
| enterpriseGateway.ingress.annotations | object | `{}` | Annotations for the enterprise-gateway ingress |
| enterpriseGateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the enterprise-gateway should be created |
| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.gem.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the enterprise-gateway ingress |
| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.gem.example.com"],"secretName":"gem-gateway-tls"}]` | TLS configuration for the enterprise-gateway ingress |
| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.get.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the enterprise-gateway ingress |
| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.get.example.com"],"secretName":"get-gateway-tls"}]` | TLS configuration for the enterprise-gateway ingress |
| enterpriseGateway.initContainers | list | `[]` | |
| enterpriseGateway.nodeSelector | object | `{}` | |
| enterpriseGateway.persistence.subPath | string | `nil` | |
Expand Down
18 changes: 17 additions & 1 deletion charts/tempo-distributed/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,25 @@ Installed components:
* federation-frontend
{{- end }}
* compactor
{{- if .Values.metricsGenerator.enabled }}
* metrics-generator
{{- end }}
{{- if .Values.memcached.enabled }}
* memcached
{{- end }}
{{- if .Values.memcachedExporter.enabled }}
* memcached-exporter
{{- end }}
{{- if .Values.gateway.enabled }}
* gateway
{{- end }}
{{- end }}
{{- if .Values.minio.enabled }}
* minio
{{- end }}
{{- if .Values.rollout_operator.enabled }}
* rollout-operator
{{- end }}
{{- if .Values.enterprise.enabled }}
* admin_api
* enterprise-gateway
{{- end }}
6 changes: 3 additions & 3 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2338,16 +2338,16 @@ enterpriseGateway:
annotations: {}
# -- Hosts configuration for the enterprise-gateway ingress
hosts:
- host: gateway.gem.example.com
- host: gateway.get.example.com
paths:
- path: /
# -- pathType (e.g. ImplementationSpecific, Prefix, .. etc.) might also be required by some Ingress Controllers
# pathType: Prefix
# -- TLS configuration for the enterprise-gateway ingress
tls:
- secretName: gem-gateway-tls
- secretName: get-gateway-tls
hosts:
- gateway.gem.example.com
- gateway.get.example.com

# -- Create extra manifests via values.
extraObjects: []
Expand Down
Loading