From 3badbb3d961bcd2fcb1194af3fbc568346945982 Mon Sep 17 00:00:00 2001
From: Tostaza <161521091+Tostaza@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:10:21 +0100
Subject: [PATCH] fix(helm): Add conditional to include ruler config only when
 enabled (#15385)

---
 production/helm/loki/CHANGELOG.md | 1 +
 production/helm/loki/values.yaml  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index 45809c0f4597f..e96e637490e54 100644
--- a/production/helm/loki/CHANGELOG.md
+++ b/production/helm/loki/CHANGELOG.md
@@ -13,6 +13,7 @@ Entries should include a reference to the pull request that introduced the chang
 
 [//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
 
+- [BUGFIX] Add conditional to include ruler config only if `ruler.enabled=true`
 - [BUGFIX] Disables the Helm test pod when `test.enabled=false`.
 
 ## 6.23.0
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index e2340822d0045..92546ff585d85 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -205,7 +205,9 @@ loki:
     {{- toYaml .Values.loki.testSchemaConfig | nindent 2}}
     {{- end }}
 
+    {{- if .Values.ruler.enabled }}
     {{ include "loki.rulerConfig" . }}
+    {{- end }}
 
     {{- if or .Values.tableManager.retention_deletes_enabled .Values.tableManager.retention_period }}
     table_manager: