From 87da274c8feebdcbd99c979828b095a965d3ec3c Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@itpartner.no>
Date: Thu, 1 Feb 2024 08:48:53 +0100
Subject: [PATCH] fix: make dex an app-of-apps to manage resources sensibly

---
 dex/{applicationset.yaml => app/dex.yaml}         |  1 -
 dex/app/resources.yaml                            | 15 +++++++++++++++
 dex/application.yaml                              | 15 +++++++++++++++
 .../cnpg-cluster.yaml => resources/cluster.yaml}  |  0
 dex/{manifests => resources}/cnp.yaml             |  0
 dex/{manifests => resources}/dex-config.yaml      |  0
 dex/{manifests => resources}/dex-volumes.yaml     |  0
 7 files changed, 30 insertions(+), 1 deletion(-)
 rename dex/{applicationset.yaml => app/dex.yaml} (96%)
 create mode 100644 dex/app/resources.yaml
 create mode 100644 dex/application.yaml
 rename dex/{manifests/cnpg-cluster.yaml => resources/cluster.yaml} (100%)
 rename dex/{manifests => resources}/cnp.yaml (100%)
 rename dex/{manifests => resources}/dex-config.yaml (100%)
 rename dex/{manifests => resources}/dex-volumes.yaml (100%)

diff --git a/dex/applicationset.yaml b/dex/app/dex.yaml
similarity index 96%
rename from dex/applicationset.yaml
rename to dex/app/dex.yaml
index 4903a7ab..479b89fe 100644
--- a/dex/applicationset.yaml
+++ b/dex/app/dex.yaml
@@ -31,5 +31,4 @@ spec:
             - $values/dex/{{ env }}-values.yaml
       - repoURL: https://gitlab.com/oceanbox/manifests.git
         targetRevision: HEAD
-        path: dex/manifests
         ref: values
diff --git a/dex/app/resources.yaml b/dex/app/resources.yaml
new file mode 100644
index 00000000..68c29b2a
--- /dev/null
+++ b/dex/app/resources.yaml
@@ -0,0 +1,15 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: dex-resources
+  namespace: argocd
+spec:
+  project: atlantis
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: idp
+  source:
+    repoURL: https://gitlab.com/oceanbox/manifests.git
+    targetRevision: HEAD
+    path: dex/resources
+
diff --git a/dex/application.yaml b/dex/application.yaml
new file mode 100644
index 00000000..732909f8
--- /dev/null
+++ b/dex/application.yaml
@@ -0,0 +1,15 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: dex
+  namespace: argocd
+spec:
+  project: atlantis
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: idp
+  source:
+    repoURL: https://gitlab.com/oceanbox/manifests.git
+    targetRevision: HEAD
+    path: dex/app
+
diff --git a/dex/manifests/cnpg-cluster.yaml b/dex/resources/cluster.yaml
similarity index 100%
rename from dex/manifests/cnpg-cluster.yaml
rename to dex/resources/cluster.yaml
diff --git a/dex/manifests/cnp.yaml b/dex/resources/cnp.yaml
similarity index 100%
rename from dex/manifests/cnp.yaml
rename to dex/resources/cnp.yaml
diff --git a/dex/manifests/dex-config.yaml b/dex/resources/dex-config.yaml
similarity index 100%
rename from dex/manifests/dex-config.yaml
rename to dex/resources/dex-config.yaml
diff --git a/dex/manifests/dex-volumes.yaml b/dex/resources/dex-volumes.yaml
similarity index 100%
rename from dex/manifests/dex-volumes.yaml
rename to dex/resources/dex-volumes.yaml