UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 1f27a54f authored by Michael Martin's avatar Michael Martin
Browse files

Merge branch 'loki-196-bugfix-monolith-minio-error' into 'master'

fix (loki): guard monolith local storage config with minio enablement check

Closes big-bang/product/packages/loki#196

See merge request !5133
parents 6cbcf4d4 95e3effc
No related branches found
No related tags found
1 merge request!5133fix (loki): guard monolith local storage config with minio enablement check
Pipeline #3629600 passed
......@@ -70,7 +70,7 @@ loki:
bind_addr:
- ${MY_POD_IP}
storage:
{{- if (eq .Values.loki.strategy "monolith") }}
{{- if (and (eq .Values.loki.strategy "monolith") (not (dig "minio" "enabled" false .Values.loki.values))) }}
type: "filesystem"
{{- else }}
type: "s3"
......@@ -82,7 +82,7 @@ loki:
accessKeyId: {{ .Values.loki.objectStorage.accessKey }}
secretAccessKey: {{ .Values.loki.objectStorage.accessSecret }}
{{- end }}
{{- if (eq .Values.loki.strategy "monolith") }}
{{- if (and (eq .Values.loki.strategy "monolith") (not (dig "minio" "enabled" false .Values.loki.values))) }}
rulerConfig:
storage:
type: local
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment