From abb6c818f6633646992cc5579136bf1a92135803 Mon Sep 17 00:00:00 2001
From: Sander Rodenhuis <53382213+srodenhuis@users.noreply.github.com>
Date: Thu, 1 Aug 2024 13:32:43 +0200
Subject: [PATCH] fix: loki auth for multi-tenancy (#1662)

Co-authored-by: Jehoszafat Zimnowoda <17126497+j-zimnowoda@users.noreply.github.com>
---
 values/loki/loki.gotmpl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/values/loki/loki.gotmpl b/values/loki/loki.gotmpl
index cee319a5a4..6667185bd9 100644
--- a/values/loki/loki.gotmpl
+++ b/values/loki/loki.gotmpl
@@ -2,6 +2,7 @@
 {{- $l:= $v.apps.loki }}
 {{- $obj := $v.obj.provider }}
 {{- $bu := $v.obj.buckets }}
+{{- $useObjectStorage := eq $obj.type "minioLocal" "linode" }}
 
 nameOverride: loki
 
@@ -23,6 +24,7 @@ serviceMonitor:
 loki:
   podAnnotations:
     sidecar.istio.io/inject: "false"
+  auth_enabled: true
   schemaConfig:
     configs:
     - from: 2020-09-07
@@ -32,7 +34,7 @@ loki:
       index:
         prefix: loki_index_
         period: 24h
-  {{- if eq $obj.type "minioLocal" "linode" }}
+  {{- if $useObjectStorage }}
   storageConfig:
     boltdb_shipper:
       active_index_directory: /var/loki/index
@@ -57,6 +59,13 @@ loki:
       {{- end }} 
   {{- end }}
 
+  structuredConfig:
+    auth_enabled: true
+    {{- if $useObjectStorage }}
+    compactor:
+      shared_store: s3
+    {{- end }}
+
 ingester:
   resources: {{- $l.resources.ingester | toYaml | nindent 4 }}
   podAnnotations: