diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 3acdd12d4d2a1..f1d727e4ba73e 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -3117,6 +3117,7 @@ null "serviceAnnotations": {}, "serviceLabels": {}, "serviceType": "ClusterIP", + "startupProbe": {}, "terminationGracePeriodSeconds": 30, "tolerations": [] } @@ -3467,6 +3468,15 @@ null
 "ClusterIP"
 
+ + + + compactor.startupProbe + object + liveness probe settings for ingester pods. If empty use `loki.livenessProbe` +
+{}
+
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 29c2da475df1f..97a366e246464 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 `startupProbe` to compactor [#20072](https://github.com/grafana/loki/pull/20072). ## 6.46.0 diff --git a/production/helm/loki/templates/compactor/_helpers-compactor.tpl b/production/helm/loki/templates/compactor/_helpers-compactor.tpl index 061dfc874d657..9570eca0272c1 100644 --- a/production/helm/loki/templates/compactor/_helpers-compactor.tpl +++ b/production/helm/loki/templates/compactor/_helpers-compactor.tpl @@ -49,6 +49,16 @@ livenessProbe: {{- end }} {{- end }} +{{/* +compactor startup probe +*/}} +{{- define "loki.compactor.startupProbe" }} +{{- with .Values.compactor.startupProbe | default .Values.loki.startupProbe }} +startupProbe: + {{- toYaml . | nindent 2 }} +{{- end }} +{{- end }} + {{/* compactor priority class name */}} diff --git a/production/helm/loki/templates/compactor/statefulset-compactor.yaml b/production/helm/loki/templates/compactor/statefulset-compactor.yaml index 98a725124cbf5..256fb8840eac0 100644 --- a/production/helm/loki/templates/compactor/statefulset-compactor.yaml +++ b/production/helm/loki/templates/compactor/statefulset-compactor.yaml @@ -111,6 +111,7 @@ spec: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} {{- include "loki.compactor.readinessProbe" . | nindent 10 }} {{- include "loki.compactor.livenessProbe" . | nindent 10 }} + {{- include "loki.compactor.startupProbe" . | nindent 10 }} volumeMounts: - name: temp mountPath: /tmp diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index f231e41d7aec8..95a270ddb9e0e 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -2775,6 +2775,8 @@ compactor: readinessProbe: {} # -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe` livenessProbe: {} + # -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe` + startupProbe: {} # -- Resource requests and limits for the compactor resources: {} # -- Containers to add to the compactor pods