diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 3acdd12d4d2a1..7613b6aa11060 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -7665,6 +7665,15 @@ null
 "pod"
 
+ + + + lokiCanary.livenessProbe + string + Liveness probe +
+null
+
@@ -7762,6 +7771,15 @@ true
 {}
 
+ + + + lokiCanary.startupProbe + string + Startup probe +
+null
+
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 29c2da475df1f..4569f4b07d659 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -20,6 +20,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add support for configuring `volumeAttributesClassName` for `volumeClaimTemplates`. [#19719](https://github.com/grafana/loki/pull/19719) - [BUGFIX] Don't fail for missing bucket name, if minio is enabled. [#19745](https://github.com/grafana/loki/pull/19745) - [BUGFIX] Add startupProbe to read pod [#19708](https://github.com/grafana/loki/pull/19708) +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to loki-canary [#20079](https://github.com/grafana/loki/pull/20079) ## 6.46.0 diff --git a/production/helm/loki/templates/loki-canary/daemonset.yaml b/production/helm/loki/templates/loki-canary/daemonset.yaml index 480748b01f7c5..2f89eb5d12850 100644 --- a/production/helm/loki/templates/loki-canary/daemonset.yaml +++ b/production/helm/loki/templates/loki-canary/daemonset.yaml @@ -105,10 +105,18 @@ spec: envFrom: {{- toYaml . | nindent 12 }} {{- end }} + {{- with .livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} {{- with .readinessProbe }} readinessProbe: {{- toYaml . | nindent 12 }} {{- end }} + {{- with .startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} {{- with .resources}} resources: {{- toYaml . | nindent 12 }} diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index f231e41d7aec8..372671c5fb043 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -833,6 +833,8 @@ lokiCanary: digest: null # -- Docker image pull policy pullPolicy: IfNotPresent + # -- Liveness probe + livenessProbe: # -- Readiness probe readinessProbe: httpGet: @@ -840,6 +842,8 @@ lokiCanary: port: http-metrics initialDelaySeconds: 15 timeoutSeconds: 1 + # -- Startup probe + startupProbe: # -- Update strategy for the `loki-canary` Daemonset pods updateStrategy: type: RollingUpdate