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] Additional initContainers in microservices #3516

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.28.0
version: 1.29.0
appVersion: 2.6.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
7 changes: 6 additions & 1 deletion charts/tempo-distributed/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ The memcached default args are removed and should be provided manually. The sett
| compactor.image.registry | string | `nil` | The Docker registry for the compactor image. Overrides `tempo.image.registry` |
| compactor.image.repository | string | `nil` | Docker image repository for the compactor image. Overrides `tempo.image.repository` |
| compactor.image.tag | string | `nil` | Docker image tag for the compactor image. Overrides `tempo.image.tag` |
| compactor.initContainers | list | `[]` | Init Containers |
| compactor.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| compactor.nodeSelector | object | `{}` | Node selector for compactor pods |
| compactor.podAnnotations | object | `{}` | Annotations for compactor pods |
Expand Down Expand Up @@ -346,6 +347,7 @@ The memcached default args are removed and should be provided manually. The sett
| distributor.image.registry | string | `nil` | The Docker registry for the distributor image. Overrides `tempo.image.registry` |
| distributor.image.repository | string | `nil` | Docker image repository for the distributor image. Overrides `tempo.image.repository` |
| distributor.image.tag | string | `nil` | Docker image tag for the distributor image. Overrides `tempo.image.tag` |
| distributor.initContainers | list | `[]` | Init Containers |
| distributor.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| distributor.nodeSelector | object | `{}` | Node selector for distributor pods |
| distributor.podAnnotations | object | `{}` | Annotations for distributor pods |
Expand Down Expand Up @@ -599,6 +601,7 @@ The memcached default args are removed and should be provided manually. The sett
| memcached.image.registry | string | `nil` | The Docker registry for the Memcached image. Overrides `global.image.registry` |
| memcached.image.repository | string | `"memcached"` | Memcached Docker image repository |
| memcached.image.tag | string | `"1.6.33-alpine"` | Memcached Docker image tag |
| memcached.initContainers | list | `[]` | Init Containers |
| memcached.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| memcached.podAnnotations | object | `{}` | Annotations for memcached pods |
| memcached.podLabels | object | `{}` | Labels for memcached pods |
Expand Down Expand Up @@ -669,7 +672,7 @@ The memcached default args are removed and should be provided manually. The sett
| metricsGenerator.image.registry | string | `nil` | The Docker registry for the metrics-generator image. Overrides `tempo.image.registry` |
| metricsGenerator.image.repository | string | `nil` | Docker image repository for the metrics-generator image. Overrides `tempo.image.repository` |
| metricsGenerator.image.tag | string | `nil` | Docker image tag for the metrics-generator image. Overrides `tempo.image.tag` |
| metricsGenerator.initContainers | list | `[]` | |
| metricsGenerator.initContainers | list | `[]` | Init Containers |
| metricsGenerator.kind | string | `"Deployment"` | Kind of deployment [StatefulSet/Deployment] |
| metricsGenerator.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| metricsGenerator.nodeSelector | object | `{}` | Node selector for metrics-generator pods |
Expand Down Expand Up @@ -744,6 +747,7 @@ The memcached default args are removed and should be provided manually. The sett
| querier.image.registry | string | `nil` | The Docker registry for the querier image. Overrides `tempo.image.registry` |
| querier.image.repository | string | `nil` | Docker image repository for the querier image. Overrides `tempo.image.repository` |
| querier.image.tag | string | `nil` | Docker image tag for the querier image. Overrides `tempo.image.tag` |
| querier.initContainers | list | `[]` | Init Containers |
| querier.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| querier.nodeSelector | object | `{}` | Node selector for querier pods |
| querier.podAnnotations | object | `{}` | Annotations for querier pods |
Expand Down Expand Up @@ -791,6 +795,7 @@ The memcached default args are removed and should be provided manually. The sett
| queryFrontend.ingress.enabled | bool | `false` | Specifies whether an ingress for the Jaeger should be created |
| queryFrontend.ingress.hosts | list | `[{"host":"query.tempo.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the Jaeger ingress |
| queryFrontend.ingress.tls | list | `[{"hosts":["query.tempo.example.com"],"secretName":"tempo-query-tls"}]` | TLS configuration for the Jaeger ingress |
| queryFrontend.initContainers | list | `[]` | Init Containers |
| queryFrontend.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
| queryFrontend.nodeSelector | object | `{}` | Node selector for query-frontend pods |
| queryFrontend.podAnnotations | object | `{}` | Annotations for query-frontend pods |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ spec:
hostAliases:
{{- toYaml . | nindent 8 }}
{{- end }}
initContainers:
{{- toYaml .Values.compactor.initContainers | nindent 8 }}
containers:
- args:
- -target=compactor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ spec:
hostAliases:
{{- toYaml . | nindent 8 }}
{{- end }}
initContainers:
{{- toYaml .Values.distributor.initContainers | nindent 8 }}
containers:
- args:
- -target=distributor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ spec:
hostAliases:
{{- toYaml . | nindent 8 }}
{{- end }}
initContainers:
{{- toYaml .Values.memcached.initContainers | nindent 8 }}
containers:
- image: {{ include "tempo.imageReference" $dict }}
imagePullPolicy: {{ .Values.memcached.image.pullPolicy }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ spec:
hostAliases:
{{- toYaml . | nindent 8 }}
{{- end }}
initContainers:
{{- toYaml .Values.metricsGenerator.initContainers | nindent 8 }}
containers:
- args:
- -target=metrics-generator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ spec:
hostAliases:
{{- toYaml . | nindent 8 }}
{{- end }}
initContainers:
{{- toYaml .Values.querier.initContainers | nindent 8 }}
containers:
- args:
- -target=querier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ spec:
hostAliases:
{{- toYaml . | nindent 8 }}
{{- end }}
initContainers:
{{- toYaml .Values.queryFrontend.initContainers | nindent 8 }}
containers:
- args:
- -target=query-frontend
Expand Down
20 changes: 20 additions & 0 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ metricsGenerator:
# - ip: 1.2.3.4
# hostnames:
# - domain.tld
# -- Init Containers
initContainers: []
image:
# -- The Docker registry for the metrics-generator image. Overrides `tempo.image.registry`
Expand Down Expand Up @@ -469,6 +470,10 @@ distributor:
# - ip: 1.2.3.4
# hostnames:
# - domain.tld

# -- Init Containers
initContainers: []

autoscaling:
# -- Enable autoscaling for the distributor
enabled: false
Expand Down Expand Up @@ -623,6 +628,10 @@ compactor:
# - ip: 1.2.3.4
# hostnames:
# - domain.tld

# -- Init Containers
initContainers: []

image:
# -- The Docker registry for the compactor image. Overrides `tempo.image.registry`
registry: null
Expand Down Expand Up @@ -717,6 +726,10 @@ querier:
# - ip: 1.2.3.4
# hostnames:
# - domain.tld

# -- Init Containers
initContainers: []

autoscaling:
# -- Enable autoscaling for the querier
enabled: false
Expand Down Expand Up @@ -860,6 +873,10 @@ queryFrontend:
# - ip: 1.2.3.4
# hostnames:
# - domain.tld

# -- Init Containers
initContainers: []

config:
# -- Maximum number of outstanding requests per tenant per frontend; requests beyond this error with HTTP 429.
max_outstanding_per_tenant: 2000
Expand Down Expand Up @@ -1584,6 +1601,9 @@ memcached:
tag: 1.6.33-alpine
# -- Memcached Docker image pull policy
pullPolicy: IfNotPresent
# -- Init Containers
initContainers: []

host: memcached
# Number of replicas for memchached
replicas: 1
Expand Down