From 06b5b3e4a49cb775c559d40f018ddbf53660e32c Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Thu, 26 Sep 2024 19:38:28 +0200
Subject: [PATCH] fix: add tempo s3 storage

---
 kustomizations/tempo/values.yaml | 39 +++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/kustomizations/tempo/values.yaml b/kustomizations/tempo/values.yaml
index 8ba85f48..e15cefc4 100644
--- a/kustomizations/tempo/values.yaml
+++ b/kustomizations/tempo/values.yaml
@@ -1,18 +1,31 @@
 tempo:
   storage:
-  trace:
-    backend: s3
-    s3:
-      bucket: tempo-traces
-      endpoint: http://10.255.241.30:30080
-      access_key: ...                                 # optional. access key when using static credentials.
-      secret_key: ...                                 # optional. secret key when using static credentials.
-      insecure: true                                 # optional. enable if endpoint is http
-    backend: local
-    local:
-      path: /var/tempo/traces
-    wal:
-      path: /var/tempo/wal
+    trace:
+      backend: s3
+      s3:
+        bucket: tempo-traces
+        endpoint: http://10.255.241.30:30080
+        access_key: ${S3SECRET}
+        secret_key: ${S3KEY}
+        insecure: true
+      backend: local
+      local:
+        path: /var/tempo/traces
+      wal:
+        path: /var/tempo/wal
+  extraArgs:
+    - -config.expand-env=true
+  extraEnv:
+  - name: S3KEY
+    valueFrom:
+      secretKeyRef:
+        name: tempo-s3
+        key: AWS_ACCESS_KEY_ID
+  - name: S3SECRET
+    valueFrom:
+      secretKeyRef:
+        name: tempo-s3
+        key: AWS_ACCESS_KEY_SECRET
 
 tempoQuery:
   ingress: