diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index ef62de9022..cd88770d25 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -1209,6 +1209,7 @@ null }, "serviceAnnotations": {}, "serviceLabels": {}, + "startupProbe": {}, "terminationGracePeriodSeconds": 30, "tolerations": [] } @@ -1521,6 +1522,15 @@ null
 {}
 
+ + + + bloomGateway.startupProbe + object + startup probe settings for ingester pods. If empty, use `loki.startupProbe` +
+{}
+
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 566ba6884a..858fd0b078 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,7 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.) +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-gateway. [#18551](https://github.com/grafana/loki/pull/18551) - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for loki in bloom-builder. [#18549](https://github.com/grafana/loki/pull/18549) - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-planner. [#18552](https://github.com/grafana/loki/pull/18552) - [FEATURE] Support separate loki ruler storage configuration [#18510](https://github.com/grafana/loki/pull/18510) diff --git a/production/helm/loki/templates/bloom-gateway/_helpers-bloom-gateway.tpl b/production/helm/loki/templates/bloom-gateway/_helpers-bloom-gateway.tpl index 7a038ef5e1..c483b71304 100644 --- a/production/helm/loki/templates/bloom-gateway/_helpers-bloom-gateway.tpl +++ b/production/helm/loki/templates/bloom-gateway/_helpers-bloom-gateway.tpl @@ -21,6 +21,16 @@ bloom gateway selector labels app.kubernetes.io/component: bloom-gateway {{- end }} +{{/* +bloom gateway livenessProbe +*/}} +{{- define "loki.bloomGateway.livenessProbe" }} +{{- with .Values.bloomGateway.livenessProbe | default .Values.loki.livenessProbe }} +livenessProbe: + {{- toYaml . | nindent 2 }} +{{- end }} +{{- end }} + {{/* bloom gateway readinessProbe */}} @@ -31,6 +41,16 @@ readinessProbe: {{- end }} {{- end }} +{{/* +bloom gateway startupProbe +*/}} +{{- define "loki.bloomGateway.startupProbe" }} +{{- with .Values.bloomGateway.startupProbe | default .Values.loki.startupProbe }} +startupProbe: + {{- toYaml . | nindent 2 }} +{{- end }} +{{- end }} + {{/* bloom gateway priority class name */}} diff --git a/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml b/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml index 39f12e4be4..551cb923cb 100644 --- a/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml +++ b/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml @@ -95,7 +95,9 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- include "loki.bloomGateway.livenessProbe" . | nindent 10 }} {{- include "loki.bloomGateway.readinessProbe" . | nindent 10 }} + {{- include "loki.bloomGateway.startupProbe" . | nindent 10 }} volumeMounts: - name: temp mountPath: /tmp diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 77e7df0d56..812be8982f 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -2653,6 +2653,8 @@ bloomGateway: readinessProbe: {} # -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe` livenessProbe: {} + # -- startup probe settings for ingester pods. If empty, use `loki.startupProbe` + startupProbe: {} # -- Resource requests and limits for the bloom-gateway resources: {} # -- Containers to add to the bloom-gateway pods