Skip to content

Commit 5a14f87

Browse files
CmdrSharpCmdrSharp
authored
[tempo-distributed] Add ability to override liveness/readiness probes on a component level (#125)
* Add ability to override liveness/readiness probes on component level Signed-off-by: Marcus Frölander <CmdrSharp@users.noreply.github.com> * Bump chart version Signed-off-by: Marcus Frölander <CmdrSharp@users.noreply.github.com> --------- Signed-off-by: Marcus Frölander <CmdrSharp@users.noreply.github.com>
1 parent 7806463 commit 5a14f87

File tree

7 files changed

+47
-11
lines changed

7 files changed

+47
-11
lines changed

‎charts/tempo-distributed/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 2.3.2
5+
version: 2.4.2
66
# renovate: docker=docker.io/grafana/tempo
77
appVersion: 2.10.1
88
kubeVersion: "^1.25.0-0"

‎charts/tempo-distributed/templates/compactor/deployment-compactor.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,14 @@ spec:
9494
{{- toYaml . | nindent 12 }}
9595
{{- end }}
9696
{{- end }}
97+
{{- with or .Values.compactor.livenessProbe .Values.tempo.livenessProbe }}
9798
livenessProbe:
98-
{{- toYaml .Values.tempo.livenessProbe | nindent 12 }}
99+
{{- toYaml . | nindent 12 }}
100+
{{- end }}
101+
{{- with or .Values.compactor.readinessProbe .Values.tempo.readinessProbe }}
99102
readinessProbe:
100-
{{- toYaml .Values.tempo.readinessProbe | nindent 12 }}
103+
{{- toYaml . | nindent 12 }}
104+
{{- end }}
101105
resources:
102106
{{- toYaml .Values.compactor.resources | nindent 12 }}
103107
{{- with .Values.tempo.securityContext }}

‎charts/tempo-distributed/templates/distributor/deployment-distributor.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,14 @@ spec:
137137
{{- toYaml . | nindent 12 }}
138138
{{- end }}
139139
{{- end }}
140+
{{- with or .Values.distributor.livenessProbe .Values.tempo.livenessProbe }}
140141
livenessProbe:
141-
{{- toYaml .Values.tempo.livenessProbe | nindent 12 }}
142+
{{- toYaml . | nindent 12 }}
143+
{{- end }}
144+
{{- with or .Values.distributor.readinessProbe .Values.tempo.readinessProbe }}
142145
readinessProbe:
143-
{{- toYaml .Values.tempo.readinessProbe | nindent 12 }}
146+
{{- toYaml . | nindent 12 }}
147+
{{- end }}
144148
resources:
145149
{{- toYaml .Values.distributor.resources | nindent 12 }}
146150
{{- with .Values.tempo.securityContext }}

‎charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,14 @@ spec:
117117
{{- toYaml . | nindent 12 }}
118118
{{- end }}
119119
{{- end }}
120+
{{- with or .Values.ingester.livenessProbe .Values.tempo.livenessProbe }}
120121
livenessProbe:
121-
{{- toYaml .Values.tempo.livenessProbe | nindent 12 }}
122+
{{- toYaml . | nindent 12 }}
123+
{{- end }}
124+
{{- with or .Values.ingester.readinessProbe .Values.tempo.readinessProbe }}
122125
readinessProbe:
123-
{{- toYaml .Values.tempo.readinessProbe | nindent 12 }}
126+
{{- toYaml . | nindent 12 }}
127+
{{- end }}
124128
resources:
125129
{{- toYaml .Values.ingester.resources | nindent 12 }}
126130
{{- with .Values.tempo.securityContext }}

‎charts/tempo-distributed/templates/querier/deployment-querier.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ spec:
101101
securityContext:
102102
{{- toYaml . | nindent 12 }}
103103
{{- end }}
104-
{{- with .Values.tempo.livenessProbe }}
104+
{{- with or .Values.querier.livenessProbe .Values.tempo.livenessProbe }}
105105
livenessProbe:
106106
{{- toYaml . | nindent 12 }}
107107
{{- end }}
108-
{{- with .Values.tempo.readinessProbe }}
108+
{{- with or .Values.querier.readinessProbe .Values.tempo.readinessProbe }}
109109
readinessProbe:
110110
{{- toYaml . | nindent 12 }}
111111
{{- end }}

‎charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,14 @@ spec:
9494
{{- toYaml . | nindent 12 }}
9595
{{- end }}
9696
{{- end }}
97+
{{- with or .Values.queryFrontend.livenessProbe .Values.tempo.livenessProbe }}
9798
livenessProbe:
98-
{{- toYaml .Values.tempo.livenessProbe | nindent 12 }}
99+
{{- toYaml . | nindent 12 }}
100+
{{- end }}
101+
{{- with or .Values.queryFrontend.readinessProbe .Values.tempo.readinessProbe }}
99102
readinessProbe:
100-
{{- toYaml .Values.tempo.readinessProbe | nindent 12 }}
103+
{{- toYaml . | nindent 12 }}
104+
{{- end }}
101105
resources:
102106
{{- toYaml .Values.queryFrontend.resources | nindent 12 }}
103107
{{- with .Values.tempo.securityContext }}

‎charts/tempo-distributed/values.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ ingester:
188188
extraEnv: []
189189
# -- Environment variables from secrets or configmaps to add to the ingester pods
190190
extraEnvFrom: []
191+
# -- Liveness probe for ingester pods. Uses `tempo.livenessProbe` as default if not set.
192+
livenessProbe: {}
193+
# -- Readiness probe for ingester pods. Uses `tempo.readinessProbe` as default if not set.
194+
readinessProbe: {}
191195
# -- Resource requests and limits for the ingester
192196
resources: {}
193197
# -- Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor,
@@ -604,6 +608,10 @@ distributor:
604608
initContainers: []
605609
# -- Containers to add to the distributor pod
606610
extraContainers: []
611+
# -- Liveness probe for distributor pods. Uses `tempo.livenessProbe` as default if not set.
612+
livenessProbe: {}
613+
# -- Readiness probe for distributor pods. Uses `tempo.readinessProbe` as default if not set.
614+
readinessProbe: {}
607615
# -- Resource requests and limits for the distributor
608616
resources: {}
609617
# -- Grace period to allow the distributor to shutdown before it is killed
@@ -781,6 +789,10 @@ compactor:
781789
initContainers: []
782790
# -- Containers to add to the compactor pod
783791
extraContainers: []
792+
# -- Liveness probe for compactor pods. Uses `tempo.livenessProbe` as default if not set.
793+
livenessProbe: {}
794+
# -- Readiness probe for compactor pods. Uses `tempo.readinessProbe` as default if not set.
795+
readinessProbe: {}
784796
# -- Resource requests and limits for the compactor
785797
resources: {}
786798
# -- Grace period to allow the compactor to shutdown before it is killed
@@ -880,6 +892,10 @@ querier:
880892
extraEnv: []
881893
# -- Environment variables from secrets or configmaps to add to the querier pods
882894
extraEnvFrom: []
895+
# -- Liveness probe for querier pods. Uses `tempo.livenessProbe` as default if not set.
896+
livenessProbe: {}
897+
# -- Readiness probe for querier pods. Uses `tempo.readinessProbe` as default if not set.
898+
readinessProbe: {}
883899
# -- Resource requests and limits for the querier
884900
resources: {}
885901
# -- Grace period to allow the querier to shutdown before it is killed
@@ -1104,6 +1120,10 @@ queryFrontend:
11041120
extraEnv: []
11051121
# -- Environment variables from secrets or configmaps to add to the query-frontend pods
11061122
extraEnvFrom: []
1123+
# -- Liveness probe for query-frontend pods. Uses `tempo.livenessProbe` as default if not set.
1124+
livenessProbe: {}
1125+
# -- Readiness probe for query-frontend pods. Uses `tempo.readinessProbe` as default if not set.
1126+
readinessProbe: {}
11071127
# -- Resource requests and limits for the query-frontend
11081128
resources: {}
11091129
# -- Grace period to allow the query-frontend to shutdown before it is killed

0 commit comments

Comments
 (0)