From 9df3b420e7be4ab14ef53402701a8048063713bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 09:04:53 +0100 Subject: [PATCH 01/27] fix(helm): Fix health probe helper templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The helper template definitions really got me scratching my head: - I had never seen a `with` statement with an `else` clause before and I cannot find any reference indicating that it is valid. Helm's documentation never mentions it. - There's an extra `{{- end -}}` with not apparent start, yet it did not render an error in the templates (which is very surprising). While it kind of seemed to work, I'm convinced it was more by chance than by design. The old logic should not work, I suspect that the errors got masked by the overly inclusive `with` statement. This change rewrites the template definitions so it's easier to follow and uses valid Helm template flow control. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../bloom-gateway/_helpers-bloom-gateway.tpl | 12 ++++---- .../bloom-planner/_helpers-bloom-planner.tpl | 12 ++++---- .../compactor/_helpers-compactor.tpl | 24 +++++++-------- .../templates/ingester/_helpers-ingester.tpl | 30 ++++++++++--------- .../_helpers-pattern-ingester.tpl | 12 ++++---- 6 files changed, 42 insertions(+), 49 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index fd833cdcea660..fd5d3609713e5 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -29,6 +29,7 @@ Entries should include a reference to the pull request that introduced the chang - [BUGFIX] Disables the Helm test pod when `test.enabled=false`. - [BUGFIX] Fix `enterprise.image.tag` to `3.3.0` - [ENHANCEMENT] Bump Loki version to 3.3.2 +- [BUGFIX] Fix broken `readinessProbe` and `livenessProbe` helper template definitons. ## 6.23.0 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 f0cef4f179da8..d3aeac0ca175f 100644 --- a/production/helm/loki/templates/bloom-gateway/_helpers-bloom-gateway.tpl +++ b/production/helm/loki/templates/bloom-gateway/_helpers-bloom-gateway.tpl @@ -24,17 +24,15 @@ app.kubernetes.io/component: bloom-gateway {{/* bloom gateway readinessProbe */}} -{{- define "loki.bloomGateway.readinessProbe" -}} -{{- with .Values.bloomGateway.readinessProbe }} +{{- define "loki.bloomGateway.readinessProbe" }} +{{- if .Values.bloomGateway.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} -{{- else }} -{{- with .Values.loki.readinessProbe }} + {{- toYaml .Values.bloomGateway.readinessProbe | nindent 2 }} +{{- else if .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} + {{- toYaml .Values.loki.readinessProbe | nindent 2 }} {{- end }} {{- end }} -{{- end -}} {{/* bloom gateway priority class name diff --git a/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl b/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl index a4a8c6e4f9d20..2201b79e1eb26 100644 --- a/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl +++ b/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl @@ -24,17 +24,15 @@ app.kubernetes.io/component: bloom-planner {{/* bloom planner readinessProbe */}} -{{- define "loki.bloomPlanner.readinessProbe" -}} -{{- with .Values.bloomPlanner.readinessProbe }} +{{- define "loki.bloomPlanner.readinessProbe" }} +{{- if .Values.bloomPlanner.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} -{{- else }} -{{- with .Values.loki.readinessProbe }} + {{- toYaml .Values.bloomPlanner.readinessProbe | nindent 2 }} +{{- else if .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} + {{- toYaml .Values.loki.readinessProbe | nindent 2 }} {{- end }} {{- end }} -{{- end -}} {{/* bloom planner priority class name diff --git a/production/helm/loki/templates/compactor/_helpers-compactor.tpl b/production/helm/loki/templates/compactor/_helpers-compactor.tpl index 75c21db167473..df5f17c3240db 100644 --- a/production/helm/loki/templates/compactor/_helpers-compactor.tpl +++ b/production/helm/loki/templates/compactor/_helpers-compactor.tpl @@ -32,32 +32,28 @@ compactor image {{/* compactor readinessProbe */}} -{{- define "loki.compactor.readinessProbe" -}} -{{- with .Values.compactor.readinessProbe }} +{{- define "loki.compactor.readinessProbe" }} +{{- if .Values.compactor.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} -{{- else }} -{{- with .Values.loki.readinessProbe }} + {{- toYaml .Values.compactor.readinessProbe | nindent 2 }} +{{- else if .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} + {{- toYaml .Values.loki.readinessProbe | nindent 2 }} {{- end }} {{- end }} -{{- end -}} {{/* compactor livenessProbe */}} -{{- define "loki.compactor.livenessProbe" -}} -{{- with .Values.compactor.livenessProbe }} +{{- define "loki.compactor.livenessProbe" }} +{{- if .Values.compactor.livenessProbe }} livenessProbe: - {{- toYaml . | nindent 2 }} -{{- else }} -{{- with .Values.loki.livenessProbe }} + {{- toYaml .Values.compactor.livenessProbe | nindent 2 }} +{{- else if .Values.loki.livenessProbe }} livenessProbe: - {{- toYaml . | nindent 2 }} + {{- toYaml .Values.loki.livenessProbe | nindent 2 }} {{- end }} {{- end }} -{{- end -}} {{/* compactor priority class name diff --git a/production/helm/loki/templates/ingester/_helpers-ingester.tpl b/production/helm/loki/templates/ingester/_helpers-ingester.tpl index 70728a085ee28..a0ae28edeaf8c 100644 --- a/production/helm/loki/templates/ingester/_helpers-ingester.tpl +++ b/production/helm/loki/templates/ingester/_helpers-ingester.tpl @@ -31,29 +31,31 @@ priorityClassName: {{ $pcn }} {{- end }} {{- end }} -{{- define "loki.ingester.readinessProbe" -}} -{{- with .Values.ingester.readinessProbe }} +{{/* +ingester readiness probe +*/}} +{{- define "loki.ingester.readinessProbe" }} +{{- if .Values.ingester.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} -{{- else }} -{{- with .Values.loki.readinessProbe }} + {{- toYaml .Values.ingester.readinessProbe | nindent 2 }} +{{- else if .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} + {{- toYaml .Values.loki.readinessProbe | nindent 2 }} {{- end }} {{- end }} -{{- end -}} -{{- define "loki.ingester.livenessProbe" -}} -{{- with .Values.ingester.livenessProbe }} +{{/* +ingester liveness probe +*/}} +{{- define "loki.ingester.livenessProbe" }} +{{- if .Values.ingester.livenessProbe }} livenessProbe: - {{- toYaml . | nindent 2 }} -{{- else }} -{{- with .Values.loki.livenessProbe }} + {{- toYaml .Values.ingester.livenessProbe | nindent 2 }} +{{- else if .Values.loki.livenessProbe }} livenessProbe: - {{- toYaml . | nindent 2 }} + {{- toYaml .Values.loki.livenessProbe | nindent 2 }} {{- end }} {{- end }} -{{- end -}} {{/* expects global context diff --git a/production/helm/loki/templates/pattern-ingester/_helpers-pattern-ingester.tpl b/production/helm/loki/templates/pattern-ingester/_helpers-pattern-ingester.tpl index 5477214a0b5af..ee88448f054f5 100644 --- a/production/helm/loki/templates/pattern-ingester/_helpers-pattern-ingester.tpl +++ b/production/helm/loki/templates/pattern-ingester/_helpers-pattern-ingester.tpl @@ -24,17 +24,15 @@ app.kubernetes.io/component: pattern-ingester {{/* pattern ingester readinessProbe */}} -{{- define "loki.patternIngester.readinessProbe" -}} -{{- with .Values.patternIngester.readinessProbe }} +{{- define "loki.patternIngester.readinessProbe" }} +{{- if .Values.patternIngester.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} -{{- else }} -{{- with .Values.loki.readinessProbe }} + {{- toYaml .Values.patternIngester.readinessProbe | nindent 2 }} +{{- else if .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml . | nindent 2 }} + {{- toYaml .Values.loki.readinessProbe | nindent 2 }} {{- end }} {{- end }} -{{- end -}} {{/* pattern ingester priority class name From 393a27174f9d91fe2562a3085c75c80f9d340767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:33:48 +0100 Subject: [PATCH 02/27] feat(helm): Add health probes to gateway MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes it possibe to configure `livenessProbe` and `startupProbe` to the nginx container in the gateway pods. Also adds a guard for when the `readinessProbe` is unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../templates/gateway/deployment-gateway-nginx.yaml | 12 +++++++++++- production/helm/loki/values.yaml | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index fd5d3609713e5..0c5091b384bd9 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -30,6 +30,7 @@ Entries should include a reference to the pull request that introduced the chang - [BUGFIX] Fix `enterprise.image.tag` to `3.3.0` - [ENHANCEMENT] Bump Loki version to 3.3.2 - [BUGFIX] Fix broken `readinessProbe` and `livenessProbe` helper template definitons. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for the nginx container in the gateway pods. ## 6.23.0 diff --git a/production/helm/loki/templates/gateway/deployment-gateway-nginx.yaml b/production/helm/loki/templates/gateway/deployment-gateway-nginx.yaml index 94562ad165c97..3faab4c2cbda8 100644 --- a/production/helm/loki/templates/gateway/deployment-gateway-nginx.yaml +++ b/production/helm/loki/templates/gateway/deployment-gateway-nginx.yaml @@ -72,8 +72,18 @@ spec: envFrom: {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.gateway.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.gateway.readinessProbe }} readinessProbe: - {{- toYaml .Values.gateway.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.gateway.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} securityContext: {{- toYaml .Values.gateway.containerSecurityContext | nindent 12 }} {{- with .Values.gateway.lifecycle }} diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 378e8b8c268fd..4a94794b50a60 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -1066,6 +1066,8 @@ gateway: {{ else }} {{ htpasswd (required "'gateway.basicAuth.username' is required" .Values.gateway.basicAuth.username) (required "'gateway.basicAuth.password' is required" .Values.gateway.basicAuth.password) }} {{ end }} # -- Existing basic auth secret to use. Must contain '.htpasswd' existingSecret: null + # -- liveness probe for the nginx container in the gateway pods. + livenessProbe: {} # Configures the readiness probe for the gateway readinessProbe: httpGet: @@ -1073,6 +1075,8 @@ gateway: port: http-metrics initialDelaySeconds: 15 timeoutSeconds: 1 + # -- startup probe for the nginx container in the gateway pods. + startupProbe: {} nginxConfig: # -- Which schema to be used when building URLs. Can be 'http' or 'https'. schema: http @@ -1104,6 +1108,7 @@ gateway: # @default -- See values.yaml file: | {{- include "loki.nginxFile" . | indent 2 -}} + # -- If running enterprise and using the default enterprise gateway, configs go here. enterpriseGateway: # -- Define the amount of instances @@ -1173,6 +1178,7 @@ enterpriseGateway: tolerations: [] # -- Grace period to allow the gateway to shutdown before it is killed terminationGracePeriodSeconds: 60 + # -- Ingress configuration Use either this ingress or the gateway, but not both at once. # If you enable this, make sure to disable the gateway. # You'll need to supply authn configuration for your ingress controller. From e31c65c2e3805b91e6e4e7d6074d3cf0267acae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Wed, 11 Dec 2024 20:34:46 +0100 Subject: [PATCH 03/27] feat(helm): Add health probes to admin-api MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes it possible to configure `livenessProbe` and `startupProbe` to the admin-api container in the admin-api pods. Also adds a guard for when the `readinessProbe` is unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../templates/admin-api/deployment-admin-api.yaml | 12 +++++++++++- production/helm/loki/values.yaml | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 0c5091b384bd9..2d8c4411ede71 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -31,6 +31,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Bump Loki version to 3.3.2 - [BUGFIX] Fix broken `readinessProbe` and `livenessProbe` helper template definitons. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for the nginx container in the gateway pods. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for admin-api. ## 6.23.0 diff --git a/production/helm/loki/templates/admin-api/deployment-admin-api.yaml b/production/helm/loki/templates/admin-api/deployment-admin-api.yaml index 7146ffb6588e6..c72c4f597e0e6 100644 --- a/production/helm/loki/templates/admin-api/deployment-admin-api.yaml +++ b/production/helm/loki/templates/admin-api/deployment-admin-api.yaml @@ -96,8 +96,18 @@ spec: - name: http-memberlist containerPort: 7946 protocol: TCP + {{- with .Values.adminApi.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.adminApi.readinessProbe }} readinessProbe: - {{- toYaml .Values.adminApi.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.adminApi.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} resources: {{- toYaml .Values.adminApi.resources | nindent 12 }} securityContext: diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 4a94794b50a60..8c195e006cb0b 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -857,12 +857,16 @@ adminApi: # -- Update strategy strategy: type: RollingUpdate + # -- Liveness probe + livenessProbe: {} # -- Readiness probe readinessProbe: httpGet: path: /ready port: http-metrics initialDelaySeconds: 45 + # -- Startup probe + startupProbe: {} # -- Request and limit Kubernetes resources # -- Values are defined in small.yaml and large.yaml resources: {} From aa3a08efefe0e669a6973a8cde75fb4cc10919b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:40:13 +0100 Subject: [PATCH 04/27] feat(helm): Add startupProbe to loki-sc-rules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes it possible to configure `startupProbe` for the loki-sc-rules sidecar container in the backend pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../helm/loki/templates/backend/statefulset-backend.yaml | 4 ++++ production/helm/loki/values.yaml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 2d8c4411ede71..e2f64e5a66a88 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -32,6 +32,7 @@ Entries should include a reference to the pull request that introduced the chang - [BUGFIX] Fix broken `readinessProbe` and `livenessProbe` helper template definitons. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for the nginx container in the gateway pods. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for admin-api. +- [ENHANCEMENT] Add configurable `startupProbe` to the loki-sc-rules sidecar container in the backend pods. ## 6.23.0 diff --git a/production/helm/loki/templates/backend/statefulset-backend.yaml b/production/helm/loki/templates/backend/statefulset-backend.yaml index bf2e18da80b4a..f43e7ecf6fc21 100644 --- a/production/helm/loki/templates/backend/statefulset-backend.yaml +++ b/production/helm/loki/templates/backend/statefulset-backend.yaml @@ -141,6 +141,10 @@ spec: readinessProbe: {{- toYaml .Values.sidecar.readinessProbe | nindent 12 }} {{- end }} + {{- if .Values.sidecar.startupProbe }} + startupProbe: + {{- toYaml .Values.sidecar.startupProbe | nindent 12 }} + {{- end }} {{- if .Values.sidecar.resources }} resources: {{- toYaml .Values.sidecar.resources | nindent 12 }} diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 8c195e006cb0b..bee0217b84666 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -3476,6 +3476,8 @@ sidecar: readinessProbe: {} # -- Liveness probe definition. Probe is disabled on the sidecar by default. livenessProbe: {} + # -- Startup probe definition. Probe is disabled on the sidecar by default. + startupProbe: {} rules: # -- Whether or not to create a sidecar to ingest rule from specific ConfigMaps and/or Secrets. enabled: true From 20fac46665b4eba295eaace3af98a64a2ad11181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:46:39 +0100 Subject: [PATCH 05/27] feat(helm): Add health probes to loki in backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes it possible to configure `livenessProbe` and `startupProbe` to the loki container in the backend pods. Also adds a guard for when the `readinessProbe` is unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../loki/templates/backend/statefulset-backend.yaml | 12 +++++++++++- production/helm/loki/values.yaml | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index e2f64e5a66a88..70a8174022ef6 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -33,6 +33,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for the nginx container in the gateway pods. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for admin-api. - [ENHANCEMENT] Add configurable `startupProbe` to the loki-sc-rules sidecar container in the backend pods. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to the loki container in the backend pods. ## 6.23.0 diff --git a/production/helm/loki/templates/backend/statefulset-backend.yaml b/production/helm/loki/templates/backend/statefulset-backend.yaml index f43e7ecf6fc21..e6a9d6d034924 100644 --- a/production/helm/loki/templates/backend/statefulset-backend.yaml +++ b/production/helm/loki/templates/backend/statefulset-backend.yaml @@ -187,8 +187,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index bee0217b84666..a799e4274c7eb 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -34,6 +34,7 @@ imagePullSecrets: [] # - SimpleScalable<->Distributed: Migrate from SimpleScalable to Distributed (or vice versa) # Note: SimpleScalable and Distributed REQUIRE the use of object storage. deploymentMode: SimpleScalable + ###################################################################################################################### # # Base Loki Configs including kubernetes configurations and configurations for Loki itself, @@ -43,6 +44,8 @@ deploymentMode: SimpleScalable # -- Configuration for running Loki # @default -- See values.yaml loki: + # Configures the liveness probe for all of the Loki pods + livenessProbe: {} # Configures the readiness probe for all of the Loki pods readinessProbe: httpGet: @@ -50,6 +53,8 @@ loki: port: http-metrics initialDelaySeconds: 30 timeoutSeconds: 1 + # Configures the startup probe for all of the Loki pods + startupProbe: {} image: # -- The Docker registry registry: docker.io From bc952531763e2ccef02db2d689f1f8c687d610df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:52:48 +0100 Subject: [PATCH 06/27] feat(helm): Add health probes to bloom-builder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `livenessProbe` and `startupProbe` to the bloom-builder container in the bloom-builder pods. Also adds a guard for when the `readinessProbe` is unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../bloom-builder/deployment-bloom-builder.yaml | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 70a8174022ef6..ccd87805c6058 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -34,6 +34,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for admin-api. - [ENHANCEMENT] Add configurable `startupProbe` to the loki-sc-rules sidecar container in the backend pods. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to the loki container in the backend pods. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-builder. ## 6.23.0 diff --git a/production/helm/loki/templates/bloom-builder/deployment-bloom-builder.yaml b/production/helm/loki/templates/bloom-builder/deployment-bloom-builder.yaml index c04b3ae5ae255..f5e639dcb4da5 100644 --- a/production/helm/loki/templates/bloom-builder/deployment-bloom-builder.yaml +++ b/production/helm/loki/templates/bloom-builder/deployment-bloom-builder.yaml @@ -90,8 +90,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config From 28099f85e44d2856a95d98f756eb3795e0a685b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:02:27 +0100 Subject: [PATCH 07/27] feat(helm): Add health probes to bloom-gateway MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `livenessProbe` and `startupProbe` to the bloom-gateway container in the bloom-gateway pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../bloom-gateway/_helpers-bloom-gateway.tpl | 26 +++++++++++++++++++ .../statefulset-bloom-gateway.yaml | 2 ++ production/helm/loki/values.yaml | 2 ++ 4 files changed, 31 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index ccd87805c6058..f82850cdc98dd 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -35,6 +35,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `startupProbe` to the loki-sc-rules sidecar container in the backend pods. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to the loki container in the backend pods. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-builder. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-gateway. ## 6.23.0 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 d3aeac0ca175f..812685b5bd8dc 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,19 @@ bloom gateway selector labels app.kubernetes.io/component: bloom-gateway {{- end }} +{{/* +bloom gateway livenessProbe +*/}} +{{- define "loki.bloomGateway.livenessProbe" }} +{{- if .Values.bloomGateway.livenessProbe }} +livenessProbe: + {{- toYaml .Values.bloomGateway.livenessProbe | nindent 2 }} +{{- else if .Values.loki.livenessProbe }} +livenessProbe: + {{- toYaml .Values.loki.livenessProbe | nindent 2 }} +{{- end }} +{{- end }} + {{/* bloom gateway readinessProbe */}} @@ -34,6 +47,19 @@ readinessProbe: {{- end }} {{- end }} +{{/* +bloom gateway startupProbe +*/}} +{{- define "loki.bloomGateway.startupProbe" }} +{{- if .Values.bloomGateway.startupProbe }} +startupProbe: + {{- toYaml .Values.bloomGateway.startupProbe | nindent 2 }} +{{- else if .Values.loki.startupProbe }} +startupProbe: + {{- toYaml .Values.loki.startupProbe | 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 8c3f574f58de0..bfc6214e8eb85 100644 --- a/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml +++ b/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml @@ -98,7 +98,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 a799e4274c7eb..7ce5d78dd4439 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -2536,6 +2536,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 From 5327e7f5d27f039582a3192baf0fb84829a5c662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:22:10 +0100 Subject: [PATCH 08/27] feat(helm): Add health probes to bloom-planner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `livenessProbe` and `startupProbe` to the bloom-planner container in the bloom-planner pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../bloom-planner/_helpers-bloom-planner.tpl | 26 +++++++++++++++++++ .../statefulset-bloom-planner.yaml | 2 ++ production/helm/loki/values.yaml | 5 ++++ 4 files changed, 34 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index f82850cdc98dd..a885286de70b9 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -36,6 +36,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to the loki container in the backend pods. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-builder. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-gateway. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-planner. ## 6.23.0 diff --git a/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl b/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl index 2201b79e1eb26..53a3a2f57b6fe 100644 --- a/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl +++ b/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl @@ -21,6 +21,19 @@ bloom planner selector labels app.kubernetes.io/component: bloom-planner {{- end }} +{{/* +bloom planner livenessProbe +*/}} +{{- define "loki.bloomPlanner.livenessProbe" }} +{{- if .Values.bloomPlanner.livenessProbe }} +livenessProbe: + {{- toYaml .Values.bloomPlanner.livenessProbe | nindent 2 }} +{{- else if .Values.loki.livenessProbe }} +livenessProbe: + {{- toYaml .Values.loki.livenessProbe | nindent 2 }} +{{- end }} +{{- end }} + {{/* bloom planner readinessProbe */}} @@ -34,6 +47,19 @@ readinessProbe: {{- end }} {{- end }} +{{/* +bloom planner startupProbe +*/}} +{{- define "loki.bloomPlanner.startupProbe" }} +{{- if .Values.bloomPlanner.startupProbe }} +startupProbe: + {{- toYaml .Values.bloomPlanner.startupProbe | nindent 2 }} +{{- else if .Values.loki.startupProbe }} +startupProbe: + {{- toYaml .Values.loki.startupProbe | nindent 2 }} +{{- end }} +{{- end }} + {{/* bloom planner priority class name */}} diff --git a/production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml b/production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml index 30e39a9d823af..835160d5f28af 100644 --- a/production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml +++ b/production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml @@ -98,7 +98,9 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- include "loki.bloomPlanner.livenessProbe" . | nindent 10 }} {{- include "loki.bloomPlanner.readinessProbe" . | nindent 10 }} + {{- include "loki.bloomPlanner.startupProbe" . | nindent 10 }} volumeMounts: - name: temp mountPath: /tmp diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 7ce5d78dd4439..a8c9fed7a8261 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -2586,6 +2586,7 @@ bloomGateway: annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true + # -- Configuration for the bloom-planner bloomPlanner: # -- Number of replicas for the bloom-planner @@ -2637,6 +2638,8 @@ bloomPlanner: 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-planner resources: {} # -- Containers to add to the bloom-planner pods @@ -2685,6 +2688,7 @@ bloomPlanner: annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true + # -- Configuration for the bloom-builder bloomBuilder: # -- Number of replicas for the bloom-builder @@ -2775,6 +2779,7 @@ bloomBuilder: appProtocol: # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" grpc: "" + # -- Configuration for the pattern ingester patternIngester: # -- Number of replicas for the pattern ingester From 9fa4d2e14d23adbdcb2fb61d610ac528b60d12ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:42:13 +0100 Subject: [PATCH 09/27] feat(helm): Add health probes to memcached-exporter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes it possible to configure `livenessProbe`, `readinessProbe` and `startupProbe` to the exporter container in the memcached pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../templates/memcached/_memcached-statefulset.tpl | 13 ++++++++++++- production/helm/loki/values.yaml | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index a885286de70b9..0b496f798f4d7 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -37,6 +37,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-builder. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-gateway. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-planner. +- [ENHANCEMENT] Add configurable `livenessProbe`, `readinessProbe` and `startupProbe` to the exporter container in the memcached pods. ## 6.23.0 diff --git a/production/helm/loki/templates/memcached/_memcached-statefulset.tpl b/production/helm/loki/templates/memcached/_memcached-statefulset.tpl index cb798e508f35b..998c4eb7e9811 100644 --- a/production/helm/loki/templates/memcached/_memcached-statefulset.tpl +++ b/production/helm/loki/templates/memcached/_memcached-statefulset.tpl @@ -158,6 +158,18 @@ spec: volumeMounts: {{- toYaml .extraVolumeMounts | nindent 12 }} {{- end }} + {{- with $.ctx.Values.memcachedExporter.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with $.ctx.Values.memcachedExporter.readinessProbe }} + readinessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with $.ctx.Values.memcachedExporter.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} {{- end }} {{- if .persistence.enabled }} volumeClaimTemplates: @@ -177,4 +189,3 @@ spec: {{- end -}} {{- end -}} {{- end -}} - diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index a8c9fed7a8261..a3ca0b322ee42 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -3131,6 +3131,7 @@ memcached: capabilities: drop: [ALL] allowPrivilegeEscalation: false + memcachedExporter: # -- Whether memcached metrics should be exported enabled: true @@ -3157,6 +3158,10 @@ memcachedExporter: # memcached.tls.insecure-skip-verify: false # memcached.tls.server-name: memcached extraArgs: {} + livenessProbe: {} + readinessProbe: {} + startupProbe: {} + resultsCache: # -- Specifies whether memcached based results-cache should be enabled enabled: true @@ -3255,6 +3260,7 @@ resultsCache: storageClass: null # -- Volume mount path mountPath: /data + chunksCache: # -- Specifies whether memcached based chunks-cache should be enabled enabled: true @@ -3357,6 +3363,7 @@ chunksCache: storageClass: null # -- Volume mount path mountPath: /data + ###################################################################################################################### # # Subchart configurations From 17e955026edc8375b943ebd268d6c046963d64fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:06:12 +0100 Subject: [PATCH 10/27] feat(helm): Add health probes to memcached MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes it possible to configure `livenessProbe`, `readinessProbe` and `startupProbe` to the memcached container in the memcached pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../templates/memcached/_memcached-statefulset.tpl | 12 ++++++++++++ production/helm/loki/values.yaml | 3 +++ 3 files changed, 16 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 0b496f798f4d7..73f83d16d68ca 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -38,6 +38,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-gateway. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-planner. - [ENHANCEMENT] Add configurable `livenessProbe`, `readinessProbe` and `startupProbe` to the exporter container in the memcached pods. +- [ENHANCEMENT] Add configurable `livenessProbe`, `readinessProbe` and `startupProbe` to the memcached container in the memcached pods. ## 6.23.0 diff --git a/production/helm/loki/templates/memcached/_memcached-statefulset.tpl b/production/helm/loki/templates/memcached/_memcached-statefulset.tpl index 998c4eb7e9811..4c55fe9225242 100644 --- a/production/helm/loki/templates/memcached/_memcached-statefulset.tpl +++ b/production/helm/loki/templates/memcached/_memcached-statefulset.tpl @@ -134,6 +134,18 @@ spec: {{- toYaml .extraVolumeMounts | nindent 12 }} {{- end }} {{- end }} + {{- with $.ctx.Values.memcached.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with $.ctx.Values.memcached.readinessProbe }} + readinessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with $.ctx.Values.memcached.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} {{- if $.ctx.Values.memcachedExporter.enabled }} - name: exporter diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index a3ca0b322ee42..fbb1efc782d4b 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -3131,6 +3131,9 @@ memcached: capabilities: drop: [ALL] allowPrivilegeEscalation: false + livenessProbe: {} + readinessProbe: {} + startupProbe: {} memcachedExporter: # -- Whether memcached metrics should be exported From 259a8aaed01a1e8b5933a6a365fc8c14cb1e8663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:29:25 +0100 Subject: [PATCH 11/27] feat(helm): Add startupProbe to compactor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `startupProbe` to the compactor container in the compactor pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../loki/templates/compactor/_helpers-compactor.tpl | 13 +++++++++++++ .../templates/compactor/statefulset-compactor.yaml | 1 + production/helm/loki/values.yaml | 4 ++++ 4 files changed, 19 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 73f83d16d68ca..ff7f5ac8cd77b 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -39,6 +39,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-planner. - [ENHANCEMENT] Add configurable `livenessProbe`, `readinessProbe` and `startupProbe` to the exporter container in the memcached pods. - [ENHANCEMENT] Add configurable `livenessProbe`, `readinessProbe` and `startupProbe` to the memcached container in the memcached pods. +- [ENHANCEMENT] Add configurable `startupProbe` to compactor. ## 6.23.0 diff --git a/production/helm/loki/templates/compactor/_helpers-compactor.tpl b/production/helm/loki/templates/compactor/_helpers-compactor.tpl index df5f17c3240db..2827dfc744d99 100644 --- a/production/helm/loki/templates/compactor/_helpers-compactor.tpl +++ b/production/helm/loki/templates/compactor/_helpers-compactor.tpl @@ -55,6 +55,19 @@ livenessProbe: {{- end }} {{- end }} +{{/* +compactor startupProbe +*/}} +{{- define "loki.compactor.startupProbe" }} +{{- if .Values.compactor.startupProbe }} +startupProbe: + {{- toYaml .Values.compactor.startupProbe | nindent 2 }} +{{- else if .Values.loki.startupProbe }} +startupProbe: + {{- toYaml .Values.loki.startupProbe | 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 987aae71233a6..917f28a0e78f3 100644 --- a/production/helm/loki/templates/compactor/statefulset-compactor.yaml +++ b/production/helm/loki/templates/compactor/statefulset-compactor.yaml @@ -107,6 +107,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 fbb1efc782d4b..254578083a0b3 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -2377,6 +2377,7 @@ indexGateway: # -- Optional for updateStrategy.type=RollingUpdate. See [Partitioned rolling updates](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions) in the StatefulSet docs for details. # rollingUpdate: # partition: 0 + # -- Configuration for the compactor compactor: # -- Number of replicas for the compactor @@ -2428,6 +2429,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 @@ -2485,6 +2488,7 @@ compactor: annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true + # -- Configuration for the bloom-gateway bloomGateway: # -- Number of replicas for the bloom-gateway From ed6fc047156c603381ac33b753ff9bc1416b5791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:00:45 +0100 Subject: [PATCH 12/27] feat(helm): Add startupProbe to distributor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `startupProbe` to the distributor container in the distributor pods. Adds guards for when the `readinessProbe` or `livenessProbe` are unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../distributor/deployment-distributor.yaml | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index ff7f5ac8cd77b..2c9a07196d50c 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -40,6 +40,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe`, `readinessProbe` and `startupProbe` to the exporter container in the memcached pods. - [ENHANCEMENT] Add configurable `livenessProbe`, `readinessProbe` and `startupProbe` to the memcached container in the memcached pods. - [ENHANCEMENT] Add configurable `startupProbe` to compactor. +- [ENHANCEMENT] Add configurable `startupProbe` to distributor. ## 6.23.0 diff --git a/production/helm/loki/templates/distributor/deployment-distributor.yaml b/production/helm/loki/templates/distributor/deployment-distributor.yaml index 556a0534f75cb..57d4083e142de 100644 --- a/production/helm/loki/templates/distributor/deployment-distributor.yaml +++ b/production/helm/loki/templates/distributor/deployment-distributor.yaml @@ -104,10 +104,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.livenessProbe }} livenessProbe: - {{- toYaml .Values.loki.livenessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config From d49c60fd448ef65358a34404dd79eb34191ba338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:06:53 +0100 Subject: [PATCH 13/27] feat(helm): Add health probes to enterprise-gateway MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes it possible to configure `livenessProbe` and `startupProbe` to the gateway container in the enterprise-gateway pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../gateway/deployment-gateway-enterprise.yaml | 14 ++++++++++++-- production/helm/loki/values.yaml | 4 ++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 2c9a07196d50c..4fbd0aff8ee5e 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -41,6 +41,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe`, `readinessProbe` and `startupProbe` to the memcached container in the memcached pods. - [ENHANCEMENT] Add configurable `startupProbe` to compactor. - [ENHANCEMENT] Add configurable `startupProbe` to distributor. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for the gateway container in the enterprise-gateway pods. ## 6.23.0 diff --git a/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml b/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml index 6e9bb15dd09d3..384d74e68822b 100644 --- a/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml +++ b/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml @@ -43,7 +43,7 @@ spec: topologySpreadConstraints: {{- toYaml . | nindent 8 }} {{- end }} - {{- end }} + {{- end }} serviceAccountName: {{ template "loki.serviceAccountName" . }} {{- if .Values.enterpriseGateway.priorityClassName }} priorityClassName: {{ .Values.enterpriseGateway.priorityClassName }} @@ -110,8 +110,18 @@ spec: - name: http-metrics containerPort: 3100 protocol: TCP + {{- with .Values.enterpriseGateway.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.enterpriseGateway.readinessProbe }} readinessProbe: - {{- toYaml .Values.enterpriseGateway.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.enterpriseGateway.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} resources: {{- toYaml .Values.enterpriseGateway.resources | nindent 12 }} securityContext: diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 254578083a0b3..e3dc0cb348d10 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -1158,12 +1158,16 @@ enterpriseGateway: # -- update strategy strategy: type: RollingUpdate + # -- Liveness probe + livenessProbe: {} # -- Readiness probe readinessProbe: httpGet: path: /ready port: http-metrics initialDelaySeconds: 45 + # -- Startup probe + startupProbe: {} # -- Request and limit Kubernetes resources # -- Values are defined in small.yaml and large.yaml resources: {} From 4e01303b016fb74bcd5a5f877c5b9895bc147c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:17:48 +0100 Subject: [PATCH 14/27] feat(helm): Add startupProbe to index-gateway MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `startupProbe` to the index-gateway container in the index-gateway pods. It also adds guards for the `readinessProbe` and `livenessProbe`. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../index-gateway/statefulset-index-gateway.yaml | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 4fbd0aff8ee5e..2e5719cdb4b0e 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -42,6 +42,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `startupProbe` to compactor. - [ENHANCEMENT] Add configurable `startupProbe` to distributor. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for the gateway container in the enterprise-gateway pods. +- [ENHANCEMENT] Add configurable `startupProbe` to index-gateway. ## 6.23.0 diff --git a/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml b/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml index 269fa57ebed92..1619ea38e92b1 100644 --- a/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml +++ b/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml @@ -102,10 +102,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.livenessProbe }} livenessProbe: - {{- toYaml .Values.loki.livenessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config From b72f592fd0de6c9fc11d6b725dd83f4c9d420a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:22:25 +0100 Subject: [PATCH 15/27] feat(helm): Add startupProbe to ingester MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `startupProbe` to the ingester container in the ingester pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../loki/templates/ingester/_helpers-ingester.tpl | 13 +++++++++++++ .../ingester/statefulset-ingester-zone-a.yaml | 1 + .../ingester/statefulset-ingester-zone-b.yaml | 1 + .../ingester/statefulset-ingester-zone-c.yaml | 1 + .../templates/ingester/statefulset-ingester.yaml | 1 + production/helm/loki/values.yaml | 2 ++ 7 files changed, 20 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 2e5719cdb4b0e..2415de2d199a7 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -43,6 +43,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `startupProbe` to distributor. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for the gateway container in the enterprise-gateway pods. - [ENHANCEMENT] Add configurable `startupProbe` to index-gateway. +- [ENHANCEMENT] Add configurable `startupProbe` to ingester. ## 6.23.0 diff --git a/production/helm/loki/templates/ingester/_helpers-ingester.tpl b/production/helm/loki/templates/ingester/_helpers-ingester.tpl index a0ae28edeaf8c..b7d4c97415ee0 100644 --- a/production/helm/loki/templates/ingester/_helpers-ingester.tpl +++ b/production/helm/loki/templates/ingester/_helpers-ingester.tpl @@ -57,6 +57,19 @@ livenessProbe: {{- end }} {{- end }} +{{/* +ingester startup probe +*/}} +{{- define "loki.ingester.startupProbe" }} +{{- if .Values.ingester.startupProbe }} +startupProbe: + {{- toYaml .Values.ingester.startupProbe | nindent 2 }} +{{- else if .Values.loki.startupProbe }} +startupProbe: + {{- toYaml .Values.loki.startupProbe | nindent 2 }} +{{- end }} +{{- end }} + {{/* expects global context */}} diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml index 095300e66a0f8..c8393f36e4c40 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml @@ -131,6 +131,7 @@ spec: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} {{- include "loki.ingester.readinessProbe" . | nindent 10 }} {{- include "loki.ingester.livenessProbe" . | nindent 10 }} + {{- include "loki.ingester.startupProbe" . | nindent 10 }} volumeMounts: - name: config mountPath: /etc/loki/config diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml index da6d0dfb84746..08d9bf5ab2017 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml @@ -131,6 +131,7 @@ spec: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} {{- include "loki.ingester.readinessProbe" . | nindent 10 }} {{- include "loki.ingester.livenessProbe" . | nindent 10 }} + {{- include "loki.ingester.startupProbe" . | nindent 10 }} volumeMounts: - name: config mountPath: /etc/loki/config diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml index 619db5e02ad03..84dc13d4ea94f 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml @@ -131,6 +131,7 @@ spec: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} {{- include "loki.ingester.readinessProbe" . | nindent 10 }} {{- include "loki.ingester.livenessProbe" . | nindent 10 }} + {{- include "loki.ingester.startupProbe" . | nindent 10 }} volumeMounts: - name: config mountPath: /etc/loki/config diff --git a/production/helm/loki/templates/ingester/statefulset-ingester.yaml b/production/helm/loki/templates/ingester/statefulset-ingester.yaml index c107492d8a860..1e6664aa1a499 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester.yaml @@ -115,6 +115,7 @@ spec: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} {{- include "loki.ingester.readinessProbe" . | nindent 10 }} {{- include "loki.ingester.livenessProbe" . | nindent 10 }} + {{- include "loki.ingester.startupProbe" . | nindent 10 }} volumeMounts: - name: config mountPath: /etc/loki/config diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index e3dc0cb348d10..0494c98871101 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -1836,6 +1836,8 @@ ingester: 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: {} # -- UpdateStrategy for the ingester StatefulSets. updateStrategy: # -- One of 'OnDelete' or 'RollingUpdate' From d4a628693e800cd48826a199ce319d793d6bab02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:29:12 +0100 Subject: [PATCH 16/27] feat(helm): Parameterize readinessProbe in canary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes the previously hard-coded `readinessProbe` in loki-canary configurable via Helm values. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + production/helm/loki/templates/loki-canary/daemonset.yaml | 8 +++----- production/helm/loki/values.yaml | 8 ++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 2415de2d199a7..37036517501b9 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -44,6 +44,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for the gateway container in the enterprise-gateway pods. - [ENHANCEMENT] Add configurable `startupProbe` to index-gateway. - [ENHANCEMENT] Add configurable `startupProbe` to ingester. +- [ENHANCEMENT] Make `readinessProbe` configurable in loki-canary. ## 6.23.0 diff --git a/production/helm/loki/templates/loki-canary/daemonset.yaml b/production/helm/loki/templates/loki-canary/daemonset.yaml index dc5c6296891c7..ce0c0eef2e3db 100644 --- a/production/helm/loki/templates/loki-canary/daemonset.yaml +++ b/production/helm/loki/templates/loki-canary/daemonset.yaml @@ -93,12 +93,10 @@ spec: envFrom: {{- toYaml . | nindent 12 }} {{- end }} + {{- with .readinessProbe }} readinessProbe: - httpGet: - path: /metrics - port: http-metrics - initialDelaySeconds: 15 - timeoutSeconds: 1 + {{- 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 0494c98871101..28ca7e0c526e9 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -666,6 +666,7 @@ test: digest: null # -- Docker image pull policy pullPolicy: IfNotPresent + # The Loki canary pushes logs to and queries from this loki installation to test # that it's working correctly lokiCanary: @@ -721,6 +722,13 @@ lokiCanary: type: RollingUpdate rollingUpdate: maxUnavailable: 1 + readinessProbe: + httpGet: + path: /metrics + port: http-metrics + initialDelaySeconds: 15 + timeoutSeconds: 1 + ###################################################################################################################### # # Service Accounts and Kubernetes RBAC From 3be90b2b94dba5e586dec62068779c78f294dbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:32:46 +0100 Subject: [PATCH 17/27] feat(helm): Add health probes to loki-canary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes it possible to configure `livenessProbe` and `startupProbe` to the loki-canary container in the loki-canary pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + production/helm/loki/templates/loki-canary/daemonset.yaml | 8 ++++++++ production/helm/loki/values.yaml | 2 ++ 3 files changed, 11 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 37036517501b9..bd940be767a3b 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -45,6 +45,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `startupProbe` to index-gateway. - [ENHANCEMENT] Add configurable `startupProbe` to ingester. - [ENHANCEMENT] Make `readinessProbe` configurable in loki-canary. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to loki-canary. ## 6.23.0 diff --git a/production/helm/loki/templates/loki-canary/daemonset.yaml b/production/helm/loki/templates/loki-canary/daemonset.yaml index ce0c0eef2e3db..b09fa500c8cd0 100644 --- a/production/helm/loki/templates/loki-canary/daemonset.yaml +++ b/production/helm/loki/templates/loki-canary/daemonset.yaml @@ -93,10 +93,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 28ca7e0c526e9..e4dcff685d38c 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -722,12 +722,14 @@ lokiCanary: type: RollingUpdate rollingUpdate: maxUnavailable: 1 + livenessProbe: {} readinessProbe: httpGet: path: /metrics port: http-metrics initialDelaySeconds: 15 timeoutSeconds: 1 + startupProbe: {} ###################################################################################################################### # From 5aef046f58453907430298b64e5a5c7a06231fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:38:49 +0100 Subject: [PATCH 18/27] feat(helm): Add health probes to pattern-ingester MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `livenessProbe` and `startupProbe` to the pattern-ingester container in the pattern-ingester pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../_helpers-pattern-ingester.tpl | 26 +++++++++++++++++++ .../statefulset-pattern-ingester.yaml | 2 ++ production/helm/loki/values.yaml | 3 +++ 4 files changed, 32 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index bd940be767a3b..d3ce5f78ec071 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -46,6 +46,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `startupProbe` to ingester. - [ENHANCEMENT] Make `readinessProbe` configurable in loki-canary. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to loki-canary. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to pattern-ingester. ## 6.23.0 diff --git a/production/helm/loki/templates/pattern-ingester/_helpers-pattern-ingester.tpl b/production/helm/loki/templates/pattern-ingester/_helpers-pattern-ingester.tpl index ee88448f054f5..bd61322cbd271 100644 --- a/production/helm/loki/templates/pattern-ingester/_helpers-pattern-ingester.tpl +++ b/production/helm/loki/templates/pattern-ingester/_helpers-pattern-ingester.tpl @@ -21,6 +21,19 @@ pattern ingester selector labels app.kubernetes.io/component: pattern-ingester {{- end }} +{{/* +pattern ingester livenessProbe +*/}} +{{- define "loki.patternIngester.livenessProbe" }} +{{- if .Values.patternIngester.livenessProbe }} +livenessProbe: + {{- toYaml .Values.patternIngester.livenessProbe | nindent 2 }} +{{- else if .Values.loki.livenessProbe }} +livenessProbe: + {{- toYaml .Values.loki.livenessProbe | nindent 2 }} +{{- end }} +{{- end }} + {{/* pattern ingester readinessProbe */}} @@ -34,6 +47,19 @@ readinessProbe: {{- end }} {{- end }} +{{/* +pattern ingester startupProbe +*/}} +{{- define "loki.patternIngester.startupProbe" }} +{{- if .Values.patternIngester.startupProbe }} +startupProbe: + {{- toYaml .Values.patternIngester.startupProbe | nindent 2 }} +{{- else if .Values.loki.startupProbe }} +startupProbe: + {{- toYaml .Values.loki.startupProbe | nindent 2 }} +{{- end }} +{{- end }} + {{/* pattern ingester priority class name */}} diff --git a/production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml b/production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml index a0b2b8f205fb6..c9d5ce26821b3 100644 --- a/production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml +++ b/production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml @@ -99,7 +99,9 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- include "loki.patternIngester.livenessProbe" . | nindent 10 }} {{- include "loki.patternIngester.readinessProbe" . | nindent 10 }} + {{- include "loki.patternIngester.startupProbe" . | nindent 10 }} volumeMounts: - name: temp mountPath: /tmp diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index e4dcff685d38c..044ab503f7f4b 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -2851,6 +2851,8 @@ patternIngester: readinessProbe: {} # -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe` livenessProbe: {} + # -- startup probe settings for ingester pods. If empty use `loki.livenessProbe` + startupProbe: {} # -- Resource requests and limits for the pattern ingester resources: {} # -- Containers to add to the pattern ingester pods @@ -2910,6 +2912,7 @@ patternIngester: annotations: {} # -- Set this toggle to false to opt out of automounting API credentials for the service account automountServiceAccountToken: true + # -- Configuration for the ruler ruler: # -- The ruler component is optional and can be disabled if desired. From 68739ef565201ad251e19de0fceee13c6f342e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:45:02 +0100 Subject: [PATCH 19/27] feat(helm): Add startupProbe to querier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `startupProbe` to the querier container in the querier pods. It also adds guards for the `readinessProbe` and `livenessProbe`. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../loki/templates/querier/deployment-querier.yaml | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index d3ce5f78ec071..61215178a278e 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -47,6 +47,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Make `readinessProbe` configurable in loki-canary. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to loki-canary. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to pattern-ingester. +- [ENHANCEMENT] Add configurable `startupProbe` to querier. ## 6.23.0 diff --git a/production/helm/loki/templates/querier/deployment-querier.yaml b/production/helm/loki/templates/querier/deployment-querier.yaml index 3165d0dfd39e0..6145b469fc1eb 100644 --- a/production/helm/loki/templates/querier/deployment-querier.yaml +++ b/production/helm/loki/templates/querier/deployment-querier.yaml @@ -104,10 +104,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.livenessProbe }} livenessProbe: - {{- toYaml .Values.loki.livenessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config From e32c7ab777e8ee0290cb258a420fcb354cf044cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:47:48 +0100 Subject: [PATCH 20/27] feat(helm): Add health probes to query-frontend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `livenessProbe` and `startupProbe` to the query-frontend container in the query-frontend pods. It also adds a guard for when the `readinessProbe` is unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../query-frontend/deployment-query-frontend.yaml | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 61215178a278e..e88670dbd2bfb 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -48,6 +48,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to loki-canary. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to pattern-ingester. - [ENHANCEMENT] Add configurable `startupProbe` to querier. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to query-frontend. ## 6.23.0 diff --git a/production/helm/loki/templates/query-frontend/deployment-query-frontend.yaml b/production/helm/loki/templates/query-frontend/deployment-query-frontend.yaml index 0b73fe8ae13b5..428bfadc694da 100644 --- a/production/helm/loki/templates/query-frontend/deployment-query-frontend.yaml +++ b/production/helm/loki/templates/query-frontend/deployment-query-frontend.yaml @@ -96,8 +96,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config From 4bd3969ca46e023915b6c08973901f25d8b7e49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:50:47 +0100 Subject: [PATCH 21/27] feat(helm): Add startupProbe to query-scheduler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `startupProbe` to the query-scheduler container in the query-scheduler pods. Also adds guards for when `livenessProbe` or `readinessProbe` are unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../query-scheduler/deployment-query-scheduler.yaml | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index e88670dbd2bfb..1c89a9e2141de 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -49,6 +49,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to pattern-ingester. - [ENHANCEMENT] Add configurable `startupProbe` to querier. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to query-frontend. +- [ENHANCEMENT] Add configurable `startupProbe` to query-scheduler. ## 6.23.0 diff --git a/production/helm/loki/templates/query-scheduler/deployment-query-scheduler.yaml b/production/helm/loki/templates/query-scheduler/deployment-query-scheduler.yaml index fbb1f284c6416..6590821843dfe 100644 --- a/production/helm/loki/templates/query-scheduler/deployment-query-scheduler.yaml +++ b/production/helm/loki/templates/query-scheduler/deployment-query-scheduler.yaml @@ -90,10 +90,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.livenessProbe }} livenessProbe: - {{- toYaml .Values.loki.livenessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config From 4292176a25f29f3d4e12cd408528f3f708292db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:54:04 +0100 Subject: [PATCH 22/27] feat(helm): Add health probes to read MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `livenessProbe` and `startupProbe` to the loki container in the read pods. Also adds a guard for when the `readinessProbe` is unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../helm/loki/templates/read/deployment-read.yaml | 12 +++++++++++- .../helm/loki/templates/read/statefulset-read.yaml | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 1c89a9e2141de..0f61f35017a74 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -50,6 +50,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `startupProbe` to querier. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to query-frontend. - [ENHANCEMENT] Add configurable `startupProbe` to query-scheduler. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to the loki container in the read pods. ## 6.23.0 diff --git a/production/helm/loki/templates/read/deployment-read.yaml b/production/helm/loki/templates/read/deployment-read.yaml index f024a40fc6d5f..93568917af395 100644 --- a/production/helm/loki/templates/read/deployment-read.yaml +++ b/production/helm/loki/templates/read/deployment-read.yaml @@ -95,8 +95,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config diff --git a/production/helm/loki/templates/read/statefulset-read.yaml b/production/helm/loki/templates/read/statefulset-read.yaml index 93527f9d616da..aa9acc266dc16 100644 --- a/production/helm/loki/templates/read/statefulset-read.yaml +++ b/production/helm/loki/templates/read/statefulset-read.yaml @@ -108,8 +108,12 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + livenessProbe: + {{- toYaml .Values.loki.livenessProbe | nindent 12 }} readinessProbe: {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + startupProbe: + {{- toYaml .Values.loki.startupProbe | nindent 12 }} {{- with .Values.read.lifecycle }} lifecycle: {{- toYaml . | nindent 12 }} From 45660ea0c3bfdad1a38453b6d9d4487e5ceb5265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:56:57 +0100 Subject: [PATCH 23/27] feat(helm): Add health probes to ruler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `livenessProbe` and `startupProbe` to the ruler container in the ruler pods. Also adds a guard for when the `readinessProbe` is unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../helm/loki/templates/ruler/statefulset-ruler.yaml | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 0f61f35017a74..3f64921780699 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -51,6 +51,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to query-frontend. - [ENHANCEMENT] Add configurable `startupProbe` to query-scheduler. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to the loki container in the read pods. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to ruler. ## 6.23.0 diff --git a/production/helm/loki/templates/ruler/statefulset-ruler.yaml b/production/helm/loki/templates/ruler/statefulset-ruler.yaml index f17c4964bd067..a38c647e4f217 100644 --- a/production/helm/loki/templates/ruler/statefulset-ruler.yaml +++ b/production/helm/loki/templates/ruler/statefulset-ruler.yaml @@ -92,8 +92,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config From 4d9ab1cf68f971bf53dc0bb4c0b37162f71b7435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 14:02:03 +0100 Subject: [PATCH 24/27] feat(helm): Add startupProbe to loki-sc-rules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `startupProbe` to the loki-sc-rules sidecar container in the single-binary pods. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + production/helm/loki/templates/single-binary/statefulset.yaml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 3f64921780699..1cb7960a739ce 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -52,6 +52,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `startupProbe` to query-scheduler. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to the loki container in the read pods. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to ruler. +- [ENHANCEMENT] Add configurable `startupProbe` to the loki-sc-rules sidecar container in the single-binary pods. ## 6.23.0 diff --git a/production/helm/loki/templates/single-binary/statefulset.yaml b/production/helm/loki/templates/single-binary/statefulset.yaml index 54f3d925404db..2602e6ff111e0 100644 --- a/production/helm/loki/templates/single-binary/statefulset.yaml +++ b/production/helm/loki/templates/single-binary/statefulset.yaml @@ -136,6 +136,10 @@ spec: readinessProbe: {{- toYaml .Values.sidecar.readinessProbe | nindent 12 }} {{- end }} + {{- if .Values.sidecar.startupProbe }} + startupProbe: + {{- toYaml .Values.sidecar.startupProbe | nindent 12 }} + {{- end }} {{- if .Values.sidecar.resources }} resources: {{- toYaml .Values.sidecar.resources | nindent 12 }} From ed590a7a663deec90712d2f6cc4f6a7db7d26998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 14:04:45 +0100 Subject: [PATCH 25/27] feat(helm): Add startupProbe to table-manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `startupProbe` to the table-manager container in the table-manager pods. Also adds guards for when `livenessProbe` or `readinessProbe` are unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../table-manager/deployment-table-manager.yaml | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 1cb7960a739ce..b773d10578990 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -53,6 +53,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to the loki container in the read pods. - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to ruler. - [ENHANCEMENT] Add configurable `startupProbe` to the loki-sc-rules sidecar container in the single-binary pods. +- [ENHANCEMENT] Add configurable `startupProbe` to table-manager. ## 6.23.0 diff --git a/production/helm/loki/templates/table-manager/deployment-table-manager.yaml b/production/helm/loki/templates/table-manager/deployment-table-manager.yaml index 770629be95bd2..44dbfe466eaf3 100644 --- a/production/helm/loki/templates/table-manager/deployment-table-manager.yaml +++ b/production/helm/loki/templates/table-manager/deployment-table-manager.yaml @@ -73,10 +73,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.livenessProbe }} livenessProbe: - {{- toYaml .Values.loki.livenessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config mountPath: /etc/loki/config From 0a7b6c75c22f498662834dd09550c1eacb27f781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 14:35:07 +0100 Subject: [PATCH 26/27] feat(helm): Add health probes to write MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds configurable `livenessProbe` and `startupProbe` to the loki container in the write pods. Also adds a guard for when the `readinessProbe` is unset. Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 1 + .../helm/loki/templates/write/statefulset-write.yaml | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index b773d10578990..18c335652f05a 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -54,6 +54,7 @@ Entries should include a reference to the pull request that introduced the chang - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to ruler. - [ENHANCEMENT] Add configurable `startupProbe` to the loki-sc-rules sidecar container in the single-binary pods. - [ENHANCEMENT] Add configurable `startupProbe` to table-manager. +- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to write. ## 6.23.0 diff --git a/production/helm/loki/templates/write/statefulset-write.yaml b/production/helm/loki/templates/write/statefulset-write.yaml index fc3b301354db8..7e1b9440ab617 100644 --- a/production/helm/loki/templates/write/statefulset-write.yaml +++ b/production/helm/loki/templates/write/statefulset-write.yaml @@ -114,8 +114,18 @@ spec: {{- end }} securityContext: {{- toYaml .Values.loki.containerSecurityContext | nindent 12 }} + {{- with .Values.loki.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.readinessProbe }} readinessProbe: - {{- toYaml .Values.loki.readinessProbe | nindent 12 }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.loki.startupProbe }} + startupProbe: + {{- toYaml . | nindent 12 }} + {{- end }} {{- if .Values.write.lifecycle }} lifecycle: {{- toYaml .Values.write.lifecycle | nindent 12 }} From 0cc8969117c8c52ce40b301cd0fea0a5b8bd5a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= <7773090+lindhe@users.noreply.github.com> Date: Thu, 12 Dec 2024 14:46:49 +0100 Subject: [PATCH 27/27] chore(helm): Update reference.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Done by running this command: ``` make -C docs sources/setup/install/helm/reference.md ``` Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com> --- docs/sources/setup/install/helm/reference.md | 225 +++++++++++++++++++ 1 file changed, 225 insertions(+) diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 43669ccd0b96d..770f21bb77473 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -60,6 +60,7 @@ This is the generated reference for the Loki Helm Chart values. "hostAliases": [], "initContainers": [], "labels": {}, + "livenessProbe": {}, "nodeSelector": {}, "podSecurityContext": { "runAsGroup": 10001, @@ -79,6 +80,7 @@ This is the generated reference for the Loki Helm Chart values. "annotations": {}, "labels": {} }, + "startupProbe": {}, "strategy": { "type": "RollingUpdate" }, @@ -186,6 +188,15 @@ This is the generated reference for the Loki Helm Chart values. 
 {}
+ + + + adminApi.livenessProbe + object + Liveness probe + 
+{}
+
@@ -253,6 +264,15 @@ This is the generated reference for the Loki Helm Chart values. "labels": {} } + + + + adminApi.startupProbe + object + Startup probe + 
+{}
+
@@ -1158,6 +1178,7 @@ null }, "serviceAnnotations": {}, "serviceLabels": {}, + "startupProbe": {}, "terminationGracePeriodSeconds": 30, "tolerations": [] } @@ -1461,6 +1482,15 @@ null 
 {}
+ + + + bloomGateway.startupProbe + object + startup probe settings for ingester pods. If empty, use `loki.startupProbe` + 
+{}
+
@@ -1549,6 +1579,7 @@ null }, "serviceAnnotations": {}, "serviceLabels": {}, + "startupProbe": {}, "terminationGracePeriodSeconds": 30, "tolerations": [] } @@ -1852,6 +1883,15 @@ null 
 {}
+ + + + bloomPlanner.startupProbe + object + startup probe settings for ingester pods. If empty use `loki.startupProbe` + 
+{}
+
@@ -2305,6 +2345,7 @@ null }, "serviceAnnotations": {}, "serviceLabels": {}, + "startupProbe": {}, "terminationGracePeriodSeconds": 30, "tolerations": [] } @@ -2617,6 +2658,15 @@ null 
 {}
+ + + + compactor.startupProbe + object + liveness probe settings for ingester pods. If empty use `loki.livenessProbe` + 
+{}
+
@@ -3653,6 +3703,7 @@ false "hostAliases": [], "initContainers": [], "labels": {}, + "livenessProbe": {}, "nodeSelector": {}, "podSecurityContext": { "fsGroup": 10001, @@ -3674,6 +3725,7 @@ false "labels": {}, "type": "ClusterIP" }, + "startupProbe": {}, "strategy": { "type": "RollingUpdate" }, @@ -3782,6 +3834,15 @@ false 
 {}
+ + + + enterpriseGateway.livenessProbe + object + Liveness probe + 
+{}
+
@@ -3851,6 +3912,15 @@ false "type": "ClusterIP" } + + + + enterpriseGateway.startupProbe + object + Startup probe + 
+{}
+
@@ -4264,6 +4334,15 @@ false 
 {}
+ + + + gateway.livenessProbe + object + liveness probe for the nginx container in the gateway pods. + 
+{}
+
@@ -4539,6 +4618,15 @@ null 
 "ClusterIP"
+ + + + gateway.startupProbe + object + startup probe for the nginx container in the gateway pods. + 
+{}
+
@@ -5085,6 +5173,7 @@ null "rolloutGroupPrefix": null, "serviceAnnotations": {}, "serviceLabels": {}, + "startupProbe": {}, "terminationGracePeriodSeconds": 300, "tolerations": [], "topologySpreadConstraints": [ @@ -5485,6 +5574,15 @@ false 
 {}
+ + + + ingester.startupProbe + object + startup probe settings for ingester pods. If empty use `loki.startupProbe` + 
+{}
+
@@ -6588,6 +6686,15 @@ null 
 "pod"
+ + + + lokiCanary.livenessProbe + object + + 
+{}
+
@@ -6624,6 +6731,42 @@ null 
 true
+ + + + lokiCanary.readinessProbe.httpGet.path + string + + 
+"/metrics"
+
+ + + + lokiCanary.readinessProbe.httpGet.port + string + + 
+"http-metrics"
+
+ + + + lokiCanary.readinessProbe.initialDelaySeconds + int + + 
+15
+
+ + + + lokiCanary.readinessProbe.timeoutSeconds + int + + 
+1
+
@@ -6651,6 +6794,15 @@ true 
 {}
+ + + + lokiCanary.startupProbe + object + + 
+{}
+
@@ -6736,6 +6888,15 @@ false 
 "1.6.34-alpine"
+ + + + memcached.livenessProbe + object + + 
+{}
+
@@ -6759,6 +6920,24 @@ false 
 null
+ + + + memcached.readinessProbe + object + + 
+{}
+
+ + + + memcached.startupProbe + object + + 
+{}
+
@@ -6821,6 +7000,24 @@ true 
 "v0.15.0"
+ + + + memcachedExporter.livenessProbe + object + + 
+{}
+
+ + + + memcachedExporter.readinessProbe + object + + 
+{}
+
@@ -6839,6 +7036,15 @@ true 
 {}
+ + + + memcachedExporter.startupProbe + object + + 
+{}
+
@@ -8038,6 +8244,7 @@ null }, "serviceAnnotations": {}, "serviceLabels": {}, + "startupProbe": {}, "terminationGracePeriodSeconds": 30, "tolerations": [], "topologySpreadConstraints": [] @@ -8351,6 +8558,15 @@ null 
 {}
+ + + + patternIngester.startupProbe + object + startup probe settings for ingester pods. If empty use `loki.livenessProbe` + 
+{}
+
@@ -10960,6 +11176,15 @@ null 
 false
+ + + + sidecar.startupProbe + object + Startup probe definition. Probe is disabled on the sidecar by default. + 
+{}
+