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] Service labels for distributor and query-frontend #2430

Merged
merged 2 commits into from
Jul 23, 2023
Merged

[tempo-distributed] Service labels for distributor and query-frontend #2430

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
559a898
[tempo-distributed] Service labels for distributor and query-frontend
deejgregor May 24, 2023
12943cd
Merge branch 'main' into add-service-labels
zanhsieh Jul 23, 2023
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: 1.4.10
version: 1.4.11
appVersion: 2.1.1
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
6 changes: 5 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: 1.4.10](https://img.shields.io/badge/Version-1.4.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square)
![Version: 1.4.11](https://img.shields.io/badge/Version-1.4.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square)

Grafana Tempo in MicroService mode

Expand Down Expand Up @@ -292,9 +292,11 @@ The memcached default args are removed and should be provided manually. The sett
| distributor.replicas | int | `1` | Number of replicas for the distributor |
| distributor.resources | object | `{}` | Resource requests and limits for the distributor |
| distributor.service.annotations | object | `{}` | Annotations for distributor service |
| distributor.service.labels | object | `{}` | Labels for distributor service |
| distributor.service.loadBalancerIP | string | `""` | If type is LoadBalancer you can assign the IP to the LoadBalancer |
| distributor.service.loadBalancerSourceRanges | list | `[]` | If type is LoadBalancer limit incoming traffic from IPs. |
| distributor.service.type | string | `"ClusterIP"` | Type of service for the distributor |
| distributor.serviceDiscovery.labels | object | `{}` | Labels for distributorDiscovery service |
| distributor.terminationGracePeriodSeconds | int | `30` | Grace period to allow the distributor to shutdown before it is killed |
| distributor.tolerations | list | `[]` | Tolerations for distributor pods |
| distributor.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for distributor pods. Passed through `tpl` and, thus, to be configured as string |
Expand Down Expand Up @@ -673,11 +675,13 @@ The memcached default args are removed and should be provided manually. The sett
| queryFrontend.replicas | int | `1` | Number of replicas for the query-frontend |
| queryFrontend.resources | object | `{}` | Resource requests and limits for the query-frontend |
| queryFrontend.service.annotations | object | `{}` | Annotations for queryFrontend service |
| queryFrontend.service.labels | object | `{}` | Labels for queryFrontend service |
| queryFrontend.service.loadBalancerIP | string | `""` | If type is LoadBalancer you can assign the IP to the LoadBalancer |
| queryFrontend.service.loadBalancerSourceRanges | list | `[]` | If type is LoadBalancer limit incoming traffic from IPs. |
| queryFrontend.service.port | int | `16686` | Port of the query-frontend service |
| queryFrontend.service.type | string | `"ClusterIP"` | Type of service for the queryFrontend |
| queryFrontend.serviceDiscovery.annotations | object | `{}` | Annotations for queryFrontendDiscovery service |
| queryFrontend.serviceDiscovery.labels | object | `{}` | Labels 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 |
| queryFrontend.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for query-frontend pods. Passed through `tpl` and, thus, to be configured as string |
Expand Down
3 changes: 3 additions & 0 deletions charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "tempo.labels" $dict | nindent 4 }}
{{- with .Values.distributor.serviceDiscovery.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
prometheus.io/service-monitor: "false"
{{- with .Values.distributor.service.annotations }}
annotations:
Expand Down
3 changes: 3 additions & 0 deletions charts/tempo-distributed/templates/distributor/service-distributor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "tempo.labels" $dict | nindent 4 }}
{{- with .Values.distributor.service.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.distributor.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
3 changes: 3 additions & 0 deletions 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,6 +5,9 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "tempo.labels" (dict "ctx" . "component" "query-frontend") | nindent 4 }}
{{- with .Values.queryFrontend.serviceDiscovery.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.queryFrontend.serviceDiscovery.annotations }}
annotations:
{{ toYaml . | nindent 4 }}
Expand Down
3 changes: 3 additions & 0 deletions charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "tempo.labels" (dict "ctx" . "component" "query-frontend") | nindent 4 }}
{{- with .Values.queryFrontend.service.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.queryFrontend.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
9 changes: 9 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 @@ -366,12 +366,17 @@ distributor:
service:
# -- Annotations for distributor service
annotations: {}
# -- Labels for distributor service
labels: {}
# -- Type of service for the distributor
type: ClusterIP
# -- If type is LoadBalancer you can assign the IP to the LoadBalancer
loadBalancerIP: ''
# -- If type is LoadBalancer limit incoming traffic from IPs.
loadBalancerSourceRanges: []
serviceDiscovery:
# -- Labels for distributorDiscovery service
labels: {}
# -- The name of the PriorityClass for distributor pods
priorityClassName: null
# -- Labels for distributor pods
Expand Down Expand Up @@ -687,6 +692,8 @@ queryFrontend:
port: 16686
# -- Annotations for queryFrontend service
annotations: {}
# -- Labels for queryFrontend service
labels: {}
# -- Type of service for the queryFrontend
type: ClusterIP
# -- If type is LoadBalancer you can assign the IP to the LoadBalancer
Expand All @@ -696,6 +703,8 @@ queryFrontend:
serviceDiscovery:
# -- Annotations for queryFrontendDiscovery service
annotations: {}
# -- Labels for queryFrontendDiscovery service
labels: {}
ingress:
# -- Specifies whether an ingress for the Jaeger should be created
enabled: false
Expand Down