From c36720ef4eef6e705806b56d8a3d578b11c88cb5 Mon Sep 17 00:00:00 2001
From: Tom Neuber <tomneuber@web.de>
Date: Mon, 30 Sep 2024 19:11:18 +0200
Subject: [PATCH] app-files/core-deployments.yaml: replace argocd-ingress with
 the entire argo deployment

---
 app-files/core-deployments.yaml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app-files/core-deployments.yaml b/app-files/core-deployments.yaml
index 3fe9d20..52a988f 100644
--- a/app-files/core-deployments.yaml
+++ b/app-files/core-deployments.yaml
@@ -32,14 +32,24 @@ spec:
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: argocd-ingress
+  name: argocd
   namespace: argocd
 spec:
   project: default
-  source:
-    repoURL: https://git.ar21.de/yolokube/core-deployments.git
-    targetRevision: HEAD
-    path: argo
+  sources:
+    - repoURL: https://argoproj.github.io/argo-helm
+      chart: argo-cd
+      targetRevision: 7.6.6
+      helm:
+        releaseName: argo
+        valueFiles:
+        - $values/argo/values.yaml
+    - repoURL: https://git.ar21.de/yolokube/core-deployments.git
+      targetRevision: HEAD
+      ref: values
+    - repoURL: https://git.ar21.de/yolokube/core-deployments.git
+      targetRevision: HEAD
+      path: argo
   destination:
     server: https://kubernetes.default.svc
     namespace: argocd
@@ -47,7 +57,8 @@ spec:
     syncOptions:
     - CreateNamespace=true
     automated:
-      prune: true
+      selfHeal: true
+      prune: false
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application