From 10d9afbd622a8d0504188109c8d9ed98ff20ecac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Lindh=C3=A9?=
<7773090+lindhe@users.noreply.github.com>
Date: Tue, 2 Dec 2025 11:03:57 +0100
Subject: [PATCH 1/3] feat(helm): Guard readinessProbe in enterpriseGateway
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>
---
production/helm/loki/CHANGELOG.md | 1 +
.../loki/templates/gateway/deployment-gateway-enterprise.yaml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index 29c2da475df1f..34a1e931da152 100644
--- a/production/helm/loki/CHANGELOG.md
+++ b/production/helm/loki/CHANGELOG.md
@@ -20,6 +20,7 @@ Entries should include a reference to the pull request that introduced the chang
- [ENHANCEMENT] Add support for configuring `volumeAttributesClassName` for `volumeClaimTemplates`. [#19719](https://github.com/grafana/loki/pull/19719)
- [BUGFIX] Don't fail for missing bucket name, if minio is enabled. [#19745](https://github.com/grafana/loki/pull/19745)
- [BUGFIX] Add startupProbe to read pod [#19708](https://github.com/grafana/loki/pull/19708)
+- [ENHANCEMENT] Add guards to the `readinessProbe` of the `gateway` container in the `enterprise-gateway` pods, in case the value is empty [#20074](https://github.com/grafana/loki/pull/20074)
## 6.46.0
diff --git a/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml b/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
index 482046a336638..d34380c9b1df8 100644
--- a/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
+++ b/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
@@ -115,8 +115,10 @@ spec:
- name: http-metrics
containerPort: 3100
protocol: TCP
+ {{- with .Values.enterpriseGateway.readinessProbe }}
readinessProbe:
- {{- toYaml .Values.enterpriseGateway.readinessProbe | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
resources:
{{- toYaml .Values.enterpriseGateway.resources | nindent 12 }}
securityContext:
From d5c9a5a4a391dd136382625382c8300876f59200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Lindh=C3=A9?=
<7773090+lindhe@users.noreply.github.com>
Date: Tue, 2 Dec 2025 11:07:15 +0100
Subject: [PATCH 2/3] 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` in 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 +
.../templates/gateway/deployment-gateway-enterprise.yaml | 8 ++++++++
production/helm/loki/values.yaml | 4 ++++
3 files changed, 13 insertions(+)
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index 34a1e931da152..16a775befede5 100644
--- a/production/helm/loki/CHANGELOG.md
+++ b/production/helm/loki/CHANGELOG.md
@@ -21,6 +21,7 @@ Entries should include a reference to the pull request that introduced the chang
- [BUGFIX] Don't fail for missing bucket name, if minio is enabled. [#19745](https://github.com/grafana/loki/pull/19745)
- [BUGFIX] Add startupProbe to read pod [#19708](https://github.com/grafana/loki/pull/19708)
- [ENHANCEMENT] Add guards to the `readinessProbe` of the `gateway` container in the `enterprise-gateway` pods, in case the value is empty [#20074](https://github.com/grafana/loki/pull/20074)
+- [ENHANCEMENT] Makes it possible to configure livenessProbe and startupProbe in the gateway container in the enterprise-gateway pods [#20074](https://github.com/grafana/loki/pull/20074)
## 6.46.0
diff --git a/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml b/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
index d34380c9b1df8..173487a4316a4 100644
--- a/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
+++ b/production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
@@ -115,10 +115,18 @@ spec:
- name: http-metrics
containerPort: 3100
protocol: TCP
+ {{- with .Values.enterpriseGateway.livenessProbe }}
+ livenessProbe:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
{{- with .Values.enterpriseGateway.readinessProbe }}
readinessProbe:
{{- 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 f231e41d7aec8..986f1b6223efc 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -1310,12 +1310,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 355170711281c20752ac2229be9fb6c611164010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Lindh=C3=A9?=
<7773090+lindhe@users.noreply.github.com>
Date: Tue, 2 Dec 2025 11:28:37 +0100
Subject: [PATCH 3/3] chore(helm): Update reference.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Done via the following command:
```
docker run -it --rm -v "$(pwd):/go" --entrypoint bash -e BUILD_IN_CONTAINER=false grafana/loki-build-image:0.34.7.1 -c 'git config --global --add safe.directory /go; make -BC docs sources/setup/install/helm/reference.md'
```
Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>
---
docs/sources/setup/install/helm/reference.md | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
index 3acdd12d4d2a1..b6ac9f27cd99c 100644
--- a/docs/sources/setup/install/helm/reference.md
+++ b/docs/sources/setup/install/helm/reference.md
@@ -4409,6 +4409,7 @@ false
"hostUsers": "nil",
"initContainers": [],
"labels": {},
+ "livenessProbe": {},
"nodeSelector": {},
"podSecurityContext": {
"fsGroup": 10001,
@@ -4430,6 +4431,7 @@ false
"labels": {},
"type": "ClusterIP"
},
+ "startupProbe": {},
"strategy": {
"type": "RollingUpdate"
},
@@ -4547,6 +4549,15 @@ false
{}
+ |
+
+
+ | enterpriseGateway.livenessProbe |
+ object |
+ Liveness probe |
+
+{}
+
|
@@ -4616,6 +4627,15 @@ false
"type": "ClusterIP"
}
+
+
+
+ | enterpriseGateway.startupProbe |
+ object |
+ Startup probe |
+
+{}
+
|