From 73555a2d801b8002af093f9dac8a0cedea6ae3b3 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Thu, 19 Dec 2024 16:00:53 +0100
Subject: [PATCH] fix: update loki, tempo and openfga apps

---
 apps/loki.yaml    |  2 +-
 apps/openfga.yaml | 79 +++++++++++++++++++++--------------------------
 apps/tempo.yaml   |  9 +++---
 3 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/apps/loki.yaml b/apps/loki.yaml
index 121986c5..2759f50e 100644
--- a/apps/loki.yaml
+++ b/apps/loki.yaml
@@ -46,8 +46,8 @@ spec:
             s3:
               endpoint: http://10.255.241.30:30080
               region: tos
-              secretAccessKey: ${S3SECRET}
               accessKeyId: ${S3KEY}
+              secretAccessKey: ${S3SECRET}
               s3ForcePathStyle: true
               http_config:
                 insecure_skip_verify: true
diff --git a/apps/openfga.yaml b/apps/openfga.yaml
index 49514ef0..179c9674 100644
--- a/apps/openfga.yaml
+++ b/apps/openfga.yaml
@@ -1,47 +1,40 @@
 apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
+kind: Application
 metadata:
-  name: openfga
+  name: staging-openfga
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
 spec:
-  goTemplate: true
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-        hostname: openfga.adm.oceanbox.io
-        autoSync: false
-        prune: true
-      - cluster: https://kubernetes.default.svc
-        env: staging
-        hostname: openfga.dev.oceanbox.io
-        autoSync: true
-        prune: true
-  template:
-    metadata:
-      name: '{{ .env }}-openfga'
-    spec:
-      project: aux
-      destination:
-        namespace: idp
-        server: '{{ .cluster }}'
-      sources:
-        - repoURL: https://openfga.github.io/helm-charts
-          targetRevision: 0.2.12
-          chart: openfga
-          helm:
-            valueFiles:
-              - $values/values/openfga/values.yaml
-              - $values/values/openfga/values-{{ .env }}.yaml
-        - repoURL: https://gitlab.com/oceanbox/manifests.git
-          targetRevision: main
-          ref: values
-  templatePatch: |
-    {{- if .autoSync }}
-    spec:
-      syncPolicy:
-        automated:
-          prune: {{ .prune }}
-          selfHeal: false
-    {{- end }}
+  destination:
+    namespace: openfga
+    server: https://kubernetes.default.svc
+  project: aux
+  # ignoreDifferences:
+  # - group: apps
+  #   kind: StatefulSet
+  #   jsonPointers:
+  #   - /spec/persistentVolumeClaimRetentionPolicy
+  syncPolicy:
+    managedNamespaceMetadata:
+      labels:
+        component: aux
+    syncOptions:
+      - CreateNamespace=true
+      - ApplyOutOfSyncOnly=true
+    automated:
+      prune: true
+      selfHeal: true
+  sources:
+  - repoURL: https://openfga.github.io/helm-charts
+    targetRevision: 0.2.19
+    chart: openfga
+    helm:
+      valueFiles:
+      - $values/values/openfga/values.yaml
+      - $values/values/openfga/values-staging.yaml
+  - repoURL: https://gitlab.com/oceanbox/manifests.git
+    targetRevision: main
+    ref: values
diff --git a/apps/tempo.yaml b/apps/tempo.yaml
index 413ec320..32727b61 100644
--- a/apps/tempo.yaml
+++ b/apps/tempo.yaml
@@ -34,11 +34,11 @@ spec:
               backend: s3
               s3:
                 bucket: tempo-traces
-                endpoint: http://10.255.241.30:30080
-                access_key: ${S3SECRET}
-                secret_key: ${S3KEY}
+                endpoint: 10.255.241.30:30080
+                access_key: ${S3KEY}
+                secret_key: ${S3SECRET}
+                forcepathstyle: true
                 insecure: true
-              backend: local
               local:
                 path: /var/tempo/traces
               wal:
@@ -46,6 +46,7 @@ spec:
           metricsGenerator:
             enabled: true
             remoteWriteUrl: "http://prom-prometheus.prometheus:9090/api/v1/write"
+          extraArgs: { config.expand-env=true }
           extraEnv:
           - name: S3KEY
             valueFrom: