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.

Sign up for GitHub

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] Add annotation for query-frontend-discovery #1104

Merged
merged 2 commits into from
Mar 16, 2022
Merged

[tempo-distributed] Add annotation for query-frontend-discovery #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35cf772
Add annotation for query-frontend-discovery
Mar 16, 2022
1e94c65
Add missing comment, and update doc
Mar 16, 2022
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
View file
Open in desktop
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: 0.16.4
version: 0.16.5
appVersion: 1.3.2
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
3 changes: 2 additions & 1 deletion charts/tempo-distributed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 0.16.4](https://img.shields.io/badge/Version-0.16.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.2](https://img.shields.io/badge/AppVersion-1.3.2-informational?style=flat-square)
![Version: 0.16.5](https://img.shields.io/badge/Version-0.16.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.2](https://img.shields.io/badge/AppVersion-1.3.2-informational?style=flat-square)

Grafana Tempo in MicroService mode

Expand Down Expand Up @@ -244,6 +244,7 @@ The memcached default args are removed and should be provided manually. The sett
| queryFrontend.resources | object | `{}` | Resource requests and limits for the query-frontend |
| queryFrontend.service.annotations | object | `{}` | Annotations for queryFrontend service |
| queryFrontend.service.type | string | `"ClusterIP"` | Type of service for the queryFrontend |
| queryFrontend.serviceDiscovery.annotations | object | `{}` | Annotations for queryFrontendDiscovery service |
| queryFrontend.terminationGracePeriodSeconds | int | `30` | Grace period to allow the query-frontend to shutdown before it is killed |
| queryFrontend.tolerations | list | `[]` | Tolerations for query-frontend pods |
| rbac.create | bool | `false` | Specifies whether RBAC manifests should be created |
Expand Down
2 changes: 1 addition & 1 deletion charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "tempo.queryFrontendLabels" . | nindent 4 }}
{{- with .Values.queryFrontend.service.annotations }}
{{- with .Values.queryFrontend.serviceDiscovery.annotations }}
annotations:
{{ toYaml . | nindent 4 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/tempo-distributed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@ queryFrontend:
annotations: {}
# -- Type of service for the queryFrontend
type: ClusterIP
serviceDiscovery:
# -- Annotations for queryFrontendDiscovery service
annotations: {}
# -- The name of the PriorityClass for query-frontend pods
lazam marked this conversation as resolved.
Show resolved Hide resolved
priorityClassName: null
# -- Labels for queryFrontend pods
Expand Down