From 98d84f53da5bdfcbfe74afc9eab453e167cff554 Mon Sep 17 00:00:00 2001
From: Elad Shmitanka <elad@myheritage.com>
Date: Wed, 19 Jul 2023 15:27:28 +0300
Subject: [PATCH] fix(argocd): Add CA to argocd-server is ingress enabled

Signed-off-by: Elad Shmitanka <elad@myheritage.com>
---
 .../templates/argocd-server/deployment.yaml    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index a40a6976..fad9ada2 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -303,6 +303,11 @@ spec:
           name: styles
         - mountPath: /tmp
           name: tmp
+        {{- if .Values.server.certificate.enabled -}}
+        - mountPath: /etc/ssl/certs/ingress-ca-certificates.crt
+          name: ingress-ca-certificate
+          subPath: ca.crt
+        {{- end }}
         {{- if .Values.server.extensions.enabled }}
         - mountPath: /tmp/extensions
           name: extensions
@@ -423,17 +428,22 @@ spec:
             path: ca.crt
       - name: argocd-dex-server-tls
         secret:
-          {{- if .Values.server.certificate.enabled -}}
-          secretName: {{ .Values.server.certificate.secretName }}
-          {{- else }}
           secretName: argocd-dex-server-tls
-          {{- end }}
           optional: true
           items:
           - key: tls.crt
             path: tls.crt
           - key: ca.crt
             path: ca.crt
+      {{- if .Values.server.certificate.enabled -}}
+      - name: ingress-ca-certificate
+        secret:
+          secretName: {{ .Values.server.certificate.secretName }}
+          optional: true
+          items:
+            - key: ca.crt
+              path: ca.crt
+      {{- end }}
       {{- if .Values.server.hostNetwork }}
       hostNetwork: {{ .Values.server.hostNetwork }}
       {{- end }}