From ffac33e4fe0e90928768ad966c5644d3b4c3a373 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@itpartner.no>
Date: Mon, 12 Feb 2024 15:15:51 +0100
Subject: [PATCH] fix: merge dex config and deployment

---
 charts/dex/manifests/config.yaml | 25 -------------------------
 charts/dex/manifests/dex.yaml    |  3 +++
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 charts/dex/manifests/config.yaml

diff --git a/charts/dex/manifests/config.yaml b/charts/dex/manifests/config.yaml
deleted file mode 100644
index 13a74587..00000000
--- a/charts/dex/manifests/config.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: dex-config
-  namespace: argocd
-spec:
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-      - cluster: https://kubernetes.default.svc
-        env: staging
-  template:
-    metadata:
-      name: '{{ env }}-dex-config'
-    spec:
-      project: atlantis
-      destination:
-        server: https://kubernetes.default.svc
-        namespace: idp
-      sources:
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: dev
-        path: 'charts/dex/{{ env }}'
diff --git a/charts/dex/manifests/dex.yaml b/charts/dex/manifests/dex.yaml
index df14e635..e51744a6 100644
--- a/charts/dex/manifests/dex.yaml
+++ b/charts/dex/manifests/dex.yaml
@@ -22,6 +22,9 @@ spec:
         server: https://kubernetes.default.svc
         namespace: idp
       sources:
+      - repoURL: https://gitlab.com/oceanbox/manifests.git
+        targetRevision: dev
+        path: 'charts/dex/{{ env }}'
       - repoURL: https://charts.dexidp.io
         targetRevision: 0.16.0
         chart: dex