From 3e13665eac6d47b0d76fbf86d5226bc417081cf7 Mon Sep 17 00:00:00 2001
From: nold <nold@gnu.one>
Date: Fri, 18 Mar 2022 21:58:39 +0100
Subject: [PATCH] Fix(argocd)

---
 projects/argocd/project.yml        |  1 -
 projects/argocd/values/argocd.yaml | 32 ++++++++++++++----------------
 projects/heqet-apps/project.yml    |  2 +-
 values.yaml                        |  1 +
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/projects/argocd/project.yml b/projects/argocd/project.yml
index a05e0691..e4b0cf23 100644
--- a/projects/argocd/project.yml
+++ b/projects/argocd/project.yml
@@ -2,7 +2,6 @@ config:
   description: ArgoCD - Continous Deployment from Git
 apps:
 - name: argocd
-  namespace: argo
   repoURL: https://argoproj.github.io/argo-helm
   chart: argo-cd
   targetRevision: 3.35.4
diff --git a/projects/argocd/values/argocd.yaml b/projects/argocd/values/argocd.yaml
index 42ab2324..50ed6bdd 100644
--- a/projects/argocd/values/argocd.yaml
+++ b/projects/argocd/values/argocd.yaml
@@ -121,16 +121,16 @@ server:
       g, ArgoCDAdmins, role:admin
 
   # Mount public CA cert
-  volumeMounts:
-  - name: certificate
-    mountPath: /etc/ssl/certs/ca.crt
-    subPath: ca
+  volumeMounts: []
+#  - name: certificate
+#    mountPath: /etc/ssl/certs/ca.crt
+#    subPath: ca
 
-  volumes:
-  - name: certificate
-    secret:
-      secretName: ca-cert
-      defaultMode: 420
+  volumes: []
+#  - name: certificate
+#    secret:
+#      secretName: ca-cert
+#      defaultMode: 420
 
   additionalApplications: []
 
@@ -160,15 +160,13 @@ repoServer:
         prometheus.io/port: '8084'
       servicePort: 8084
 
-  volumes:
-  - name: var-files
-    emptyDir: {}
-  - name: plugins
-    emptyDir: {}
+#  volumes:
+#    - name: cmp-plugins
+#      emptyDir: {}
 
-  volumeMounts:
-  - mountPath: /home/argocd/cmp-server/plugins
-    name: plugins
+#  volumeMounts:
+#  - mountPath: /home/argocd/cmp-server/plugins
+#    name: cmp-plugins
 
   initContainers:
   - name: copy-cmp-server
diff --git a/projects/heqet-apps/project.yml b/projects/heqet-apps/project.yml
index 06736d90..b677028f 100644
--- a/projects/heqet-apps/project.yml
+++ b/projects/heqet-apps/project.yml
@@ -3,7 +3,7 @@ config:
   existingNamespace: argocd
 
 apps:
-  - name: heqet-apps
+  - name: apps-of-heqet
     existingNamespace: argocd
     repoURL: https://github.com/nold360/hive-apps
     path: .
diff --git a/values.yaml b/values.yaml
index c00c62da..eb7ffb63 100644
--- a/values.yaml
+++ b/values.yaml
@@ -1,6 +1,7 @@
 # Default values that are used for creating ArgoCD `Application` definitions
 # You can add all supported heqet config options here
 defaults:
+  argocdNamespace: argocd
   # ArgoCD Project
   project: "default"