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 508da749)

d87bc838 Add conditionals around Loki scalable config

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: