From e5bbf77a010ea1ff91cbb0ca973794d60411df2b Mon Sep 17 00:00:00 2001
From: Marco van Zijl <marco@mvzijl.nl>
Date: Sun, 9 Nov 2025 20:42:09 +0100
Subject: [PATCH] Refactor S3 configuration in Loki values.yaml to use
 environment variables for bucket names and credentials

---
 apps/logging/loki/values.yaml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/apps/logging/loki/values.yaml b/apps/logging/loki/values.yaml
index b1ef751..aa58d61 100644
--- a/apps/logging/loki/values.yaml
+++ b/apps/logging/loki/values.yaml
@@ -47,12 +47,12 @@ loki:
         ruler: loki-logs
         admin: loki-logs
       s3:
-        endpoint: rook-ceph-rgw-ceph-objectstore.rook-ceph.svc:80
-        region: us-east-1
+        s3forcepathstyle: true
+        bucketnames: ${BUCKET_NAME}
+        endpoint: ${BUCKET_HOST}:${BUCKET_PORT}
+        access_key_id: "${AWS_ACCESS_KEY_ID}"
+        secret_access_key: "${AWS_SECRET_ACCESS_KEY}"
         insecure: true
-        s3ForcePathStyle: true
-        accessKeyId: ${AWS_ACCESS_KEY_ID}
-        secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
     
     # Limits and retention
     limits_config:
@@ -109,16 +109,8 @@ loki:
         memory: 1Gi
     
     extraEnv:
-      - name: AWS_ACCESS_KEY_ID
-        valueFrom:
-          secretKeyRef:
-            name: loki-logs
-            key: AWS_ACCESS_KEY_ID
-      - name: AWS_SECRET_ACCESS_KEY
-        valueFrom:
-          secretKeyRef:
-            name: loki-logs
-            key: AWS_SECRET_ACCESS_KEY
+      - secretRef:
+          name: loki-logs
   
   # Gateway
   gateway: