From 2d494148b482f3506319921a81bdc46958d28485 Mon Sep 17 00:00:00 2001 From: Ryan Garcia <garcia.ryan@solute.us> Date: Fri, 22 Apr 2022 13:57:45 +0000 Subject: [PATCH] Merge branch 'loki-scalable-conditionals' into 'master' Add conditionals around Loki scalable config See merge request platform-one/big-bang/bigbang!1558 (cherry picked from commit 508da7493c6c4978ae659135f87a6821f302687a) d87bc838 Add conditionals around Loki scalable config --- chart/templates/logging/loki/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chart/templates/logging/loki/values.yaml b/chart/templates/logging/loki/values.yaml index 8e70521a73..68380a37ac 100644 --- a/chart/templates/logging/loki/values.yaml +++ b/chart/templates/logging/loki/values.yaml @@ -25,6 +25,7 @@ monitoring: istio: enabled: {{ .Values.istio.enabled }} +{{- if (eq .Values.loki.strategy "scalable") }} global: createGlobalConfig: true existingSecretForConfig: loki-config @@ -42,6 +43,7 @@ minio: enabled: true {{- end }} {{- end }} +{{- end }} {{- if .Values.istio.enabled }} podAnnotations: -- GitLab