Skip to content

Commit dd28afe

Browse files
committed
feat(helm): Add health probes to pattern-ingester
Adds configurable `livenessProbe` and `startupProbe` to the pattern-ingester container in the pattern-ingester pods. reference.md was generated via this command: ```shell docker run -it --rm -v "$(pwd):/go" --entrypoint bash -e BUILD_IN_CONTAINER=false grafana/loki-build-image:0.34.7.1 -c 'git config --global --add safe.directory /go; make -BC docs sources/setup/install/helm/reference.md' ``` Signed-off-by: Andreas Lindhé <[email protected]>
1 parent a3e3a82 commit dd28afe

File tree

4 files changed

+38
-4
lines changed

4 files changed

+38
-4
lines changed

docs/sources/setup/install/helm/reference.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9390,6 +9390,7 @@ null
93909390
},
93919391
"serviceAnnotations": {},
93929392
"serviceLabels": {},
9393+
"startupProbe": {},
93939394
"terminationGracePeriodSeconds": 30,
93949395
"tolerations": [],
93959396
"topologySpreadConstraints": []
@@ -9546,7 +9547,7 @@ null
95469547
<tr>
95479548
<td>patternIngester.livenessProbe</td>
95489549
<td>object</td>
9549-
<td>liveness probe settings for ingester pods. If empty use `loki.livenessProbe`</td>
9550+
<td>liveness probe settings for pattern ingester pods. If empty use `loki.livenessProbe`</td>
95509551
<td><pre lang="json">
95519552
{}
95529553
</pre>
@@ -9683,7 +9684,7 @@ null
96839684
<tr>
96849685
<td>patternIngester.readinessProbe</td>
96859686
<td>object</td>
9686-
<td>readiness probe settings for ingester pods. If empty, use `loki.readinessProbe`</td>
9687+
<td>readiness probe settings for pattern ingester pods. If empty, use `loki.readinessProbe`</td>
96879688
<td><pre lang="json">
96889689
{}
96899690
</pre>
@@ -9759,6 +9760,15 @@ null
97599760
<td><pre lang="json">
97609761
{}
97619762
</pre>
9763+
</td>
9764+
</tr>
9765+
<tr>
9766+
<td>patternIngester.startupProbe</td>
9767+
<td>object</td>
9768+
<td>startup probe settings for pattern ingester pods. If empty use `loki.startupProbe`</td>
9769+
<td><pre lang="json">
9770+
{}
9771+
</pre>
97629772
</td>
97639773
</tr>
97649774
<tr>

production/helm/loki/templates/pattern-ingester/_helpers-pattern-ingester.tpl

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ pattern ingester selector labels
2121
app.kubernetes.io/component: pattern-ingester
2222
{{- end }}
2323

24+
{{/*
25+
pattern ingester livenessProbe
26+
*/}}
27+
{{- define "loki.patternIngester.livenessProbe" }}
28+
{{- with .Values.patternIngester.livenessProbe | default .Values.loki.livenessProbe }}
29+
livenessProbe:
30+
{{- toYaml . | nindent 2 }}
31+
{{- end }}
32+
{{- end }}
33+
2434
{{/*
2535
pattern ingester readinessProbe
2636
*/}}
@@ -31,6 +41,16 @@ readinessProbe:
3141
{{- end }}
3242
{{- end }}
3343

44+
{{/*
45+
pattern ingester startupProbe
46+
*/}}
47+
{{- define "loki.patternIngester.startupProbe" }}
48+
{{- with .Values.patternIngester.startupProbe | default .Values.loki.startupProbe }}
49+
startupProbe:
50+
{{- toYaml . | nindent 2 }}
51+
{{- end }}
52+
{{- end }}
53+
3454
{{/*
3555
pattern ingester priority class name
3656
*/}}

production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ spec:
103103
{{- end }}
104104
securityContext:
105105
{{- toYaml .Values.loki.containerSecurityContext | nindent 12 }}
106+
{{- include "loki.patternIngester.livenessProbe" . | nindent 10 }}
106107
{{- include "loki.patternIngester.readinessProbe" . | nindent 10 }}
108+
{{- include "loki.patternIngester.startupProbe" . | nindent 10 }}
107109
volumeMounts:
108110
- name: temp
109111
mountPath: /tmp

production/helm/loki/values.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3225,10 +3225,12 @@ patternIngester:
32253225
extraVolumeMounts: []
32263226
# -- Volumes to add to the pattern ingester pods
32273227
extraVolumes: []
3228-
# -- readiness probe settings for ingester pods. If empty, use `loki.readinessProbe`
3228+
# -- readiness probe settings for pattern ingester pods. If empty, use `loki.readinessProbe`
32293229
readinessProbe: {}
3230-
# -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe`
3230+
# -- liveness probe settings for pattern ingester pods. If empty use `loki.livenessProbe`
32313231
livenessProbe: {}
3232+
# -- startup probe settings for pattern ingester pods. If empty use `loki.startupProbe`
3233+
startupProbe: {}
32323234
# -- Resource requests and limits for the pattern ingester
32333235
resources: {}
32343236
# -- Containers to add to the pattern ingester pods

0 commit comments

Comments
 (0)