From 9e5636f872522b09bc2f6128312c447708c9c8c0 Mon Sep 17 00:00:00 2001
From: Simen Kirkvik <simen.kirkvik@oceanbox.io>
Date: Wed, 12 Nov 2025 13:37:07 +0100
Subject: [PATCH] Move staging openfga to ns staging-openfga

---
 helmfile.d/openfga.yaml.gotmpl            | 8 ++++++++
 values/argo/manifests/sys-project.yaml    | 2 ++
 values/openfga/manifests/openfga.yaml     | 4 ++++
 values/openfga/values/values-staging.yaml | 2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/helmfile.d/openfga.yaml.gotmpl b/helmfile.d/openfga.yaml.gotmpl
index 1291d3e1..85e7def3 100644
--- a/helmfile.d/openfga.yaml.gotmpl
+++ b/helmfile.d/openfga.yaml.gotmpl
@@ -10,7 +10,11 @@ commonLabels:
 
 releases:
 - name: {{ .Environment.Name }}-openfga
+  {{- if eq .Environment.Name "prod" }}
   namespace: openfga
+  {{- else }}
+  namespace: {{ .Environment.Name }}-openfga
+  {{- end }}
   chart: openfga/openfga
   version: 0.2.45
   condition: openfga.enabled
@@ -22,7 +26,11 @@ releases:
   - ../values/openfga/kustomize/{{ .Environment.Name }}
   missingFileHandler: Info
 - name: manifests
+  {{- if eq .Environment.Name "prod" }}
   namespace: openfga
+  {{- else }}
+  namespace: {{ .Environment.Name }}-openfga
+  {{- end }}
   chart: manifests
   condition: openfga.enabled
   missingFileHandler: Info
diff --git a/values/argo/manifests/sys-project.yaml b/values/argo/manifests/sys-project.yaml
index ef9ff0bc..95108076 100644
--- a/values/argo/manifests/sys-project.yaml
+++ b/values/argo/manifests/sys-project.yaml
@@ -62,6 +62,8 @@ spec:
     server: https://kubernetes.default.svc
   - namespace: openfga
     server: https://kubernetes.default.svc
+  - namespace: staging-openfga
+    server: https://kubernetes.default.svc
   - namespace: dapr-system
     server: https://kubernetes.default.svc
   - namespace: rook-ceph
diff --git a/values/openfga/manifests/openfga.yaml b/values/openfga/manifests/openfga.yaml
index d3df295c..f64e3afe 100644
--- a/values/openfga/manifests/openfga.yaml
+++ b/values/openfga/manifests/openfga.yaml
@@ -10,7 +10,11 @@ metadata:
   - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
+    {{- if eq .Values.openfga.env "prod" }}
     namespace: openfga
+    {{- else }}
+    namespace: {{ .Values.openfga.env }}-openfga
+    {{- end }}
     server: https://kubernetes.default.svc
   project: sys
   sources:
diff --git a/values/openfga/values/values-staging.yaml b/values/openfga/values/values-staging.yaml
index f64b98de..d49bb394 100644
--- a/values/openfga/values/values-staging.yaml
+++ b/values/openfga/values/values-staging.yaml
@@ -27,7 +27,7 @@ extraObjects:
     kind: Cluster
     metadata:
       name: staging-openfga-db
-      namespace: openfga
+      namespace: staging-openfga
     spec:
       instances: 1
       imageName: ghcr.io/cloudnative-pg/postgresql:17-bookworm