Skip to content

Commit fb84ea0

Browse files
committed
feat(helm): Add health probes to loki-canary
This change makes it possible to configure `livenessProbe` and `startupProbe` for the loki-canary container in the loki-canary pods. reference.md was updated via the following 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 fb84ea0

File tree

4 files changed

+31
-0
lines changed

4 files changed

+31
-0
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7665,6 +7665,15 @@ null
76657665
<td><pre lang="json">
76667666
"pod"
76677667
</pre>
7668+
</td>
7669+
</tr>
7670+
<tr>
7671+
<td>lokiCanary.livenessProbe</td>
7672+
<td>string</td>
7673+
<td>Liveness probe</td>
7674+
<td><pre lang="json">
7675+
null
7676+
</pre>
76687677
</td>
76697678
</tr>
76707679
<tr>
@@ -7762,6 +7771,15 @@ true
77627771
<td><pre lang="json">
77637772
{}
77647773
</pre>
7774+
</td>
7775+
</tr>
7776+
<tr>
7777+
<td>lokiCanary.startupProbe</td>
7778+
<td>string</td>
7779+
<td>Startup probe</td>
7780+
<td><pre lang="json">
7781+
null
7782+
</pre>
77657783
</td>
77667784
</tr>
77677785
<tr>

production/helm/loki/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Entries should include a reference to the pull request that introduced the chang
2020
- [ENHANCEMENT] Add support for configuring `volumeAttributesClassName` for `volumeClaimTemplates`. [#19719](https://github.com/grafana/loki/pull/19719)
2121
- [BUGFIX] Don't fail for missing bucket name, if minio is enabled. [#19745](https://github.com/grafana/loki/pull/19745)
2222
- [BUGFIX] Add startupProbe to read pod [#19708](https://github.com/grafana/loki/pull/19708)
23+
- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to loki-canary [#20079](https://github.com/grafana/loki/pull/20079)
2324

2425
## 6.46.0
2526

production/helm/loki/templates/loki-canary/daemonset.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,18 @@ spec:
105105
envFrom:
106106
{{- toYaml . | nindent 12 }}
107107
{{- end }}
108+
{{- with .livenessProbe }}
109+
livenessProbe:
110+
{{- toYaml . | nindent 12 }}
111+
{{- end }}
108112
{{- with .readinessProbe }}
109113
readinessProbe:
110114
{{- toYaml . | nindent 12 }}
111115
{{- end }}
116+
{{- with .startupProbe }}
117+
startupProbe:
118+
{{- toYaml . | nindent 12 }}
119+
{{- end }}
112120
{{- with .resources}}
113121
resources:
114122
{{- toYaml . | nindent 12 }}

production/helm/loki/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,13 +833,17 @@ lokiCanary:
833833
digest: null
834834
# -- Docker image pull policy
835835
pullPolicy: IfNotPresent
836+
# -- Liveness probe
837+
livenessProbe:
836838
# -- Readiness probe
837839
readinessProbe:
838840
httpGet:
839841
path: /metrics
840842
port: http-metrics
841843
initialDelaySeconds: 15
842844
timeoutSeconds: 1
845+
# -- Startup probe
846+
startupProbe:
843847
# -- Update strategy for the `loki-canary` Daemonset pods
844848
updateStrategy:
845849
type: RollingUpdate

0 commit comments

Comments
 (0)