From ea08caa0a132c8024924b0ee79a59e79c7451db3 Mon Sep 17 00:00:00 2001
From: Marcel Hoyer <mhoyer@pixelplastic.de>
Date: Wed, 7 Apr 2021 15:42:57 +0200
Subject: [PATCH] add optional volume mount to secret `argocd-repo-server-tls`
 according to
 https://github.com/argoproj/argo-cd/commit/7a68880e2ea825afb0076637b51b1e9b26a9c8f0

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>
---
 .../deployment.yaml                             | 17 +++++++++++++++--
 .../argocd-repo-server/deployment.yaml          | 13 +++++++++++++
 .../templates/argocd-server/deployment.yaml     | 13 +++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
index 6fe98a24..7c87bce8 100755
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -92,8 +92,10 @@ spec:
           timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
           successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
           failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
-{{- if .Values.controller.volumeMounts }}
         volumeMounts:
+        - mountPath: /app/config/controller/tls
+          name: argocd-repo-server-tls
+{{- if .Values.controller.volumeMounts }}
 {{- toYaml .Values.controller.volumeMounts | nindent 10}}
 {{- end }}
         resources:
@@ -115,8 +117,19 @@ spec:
       hostAliases:
 {{ toYaml . | indent 6 }}
 {{- end }}
-{{- if .Values.controller.volumes }}
       volumes:
+      - name: argocd-repo-server-tls
+        secret:
+          items:
+          - key: tls.crt
+            path: tls.crt
+          - key: tls.key
+            path: tls.key
+          - key: ca.crt
+            path: ca.crt
+          optional: true
+          secretName: argocd-repo-server-tls
+{{- if .Values.controller.volumes }}
 {{- toYaml .Values.controller.volumes | nindent 8 }}
 {{- end }}
 {{- if .Values.controller.priorityClassName }}
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 47f04d9d..7350db37 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -81,6 +81,8 @@ spec:
         - mountPath: /app/config/tls
           name: tls-certs
         {{- end }}
+        - mountPath: /app/config/reposerver/tls
+          name: argocd-repo-server-tls
         - mountPath: /tmp
           name: tmp-dir
         ports:
@@ -143,6 +145,17 @@ spec:
           name: argocd-tls-certs-cm
         name: tls-certs
       {{- end }}
+      - name: argocd-repo-server-tls
+        secret:
+          items:
+          - key: tls.crt
+            path: tls.crt
+          - key: tls.key
+            path: tls.key
+          - key: ca.crt
+            path: ca.crt
+          optional: true
+          secretName: argocd-repo-server-tls
       - emptyDir: {}
         name: tmp-dir
       {{- if .Values.repoServer.initContainers }}
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index 4ae1c4c2..d12c8446 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -80,6 +80,8 @@ spec:
         - mountPath: /app/config/tls
           name: tls-certs
         {{- end }}
+        - mountPath: /app/config/server/tls
+          name: argocd-repo-server-tls
         ports:
         - name: {{ .Values.server.name }}
           containerPort: {{ .Values.server.containerPort }}
@@ -149,6 +151,17 @@ spec:
           name: argocd-tls-certs-cm
         name: tls-certs
       {{- end }}
+      - name: argocd-repo-server-tls
+        secret:
+          items:
+          - key: tls.crt
+            path: tls.crt
+          - key: tls.key
+            path: tls.key
+          - key: ca.crt
+            path: ca.crt
+          optional: true
+          secretName: argocd-repo-server-tls
 {{- if .Values.server.priorityClassName }}
       priorityClassName: {{ .Values.server.priorityClassName }}
 {{- end }}