From cf57a71a154a1a8a19f5f9d3980d60eb3efd80c8 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Thu, 27 Jan 2022 11:15:05 +0100
Subject: [PATCH] fix(argo-cd): Add custom volume as Helm working dir (#1103)

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-cd/Chart.yaml                     |  5 ++---
 .../argocd-repo-server/deployment.yaml        | 22 +++++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 54972bdb..3f125b49 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.2.3
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.32.0
+version: 3.32.1
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -21,5 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Update to Argo-CD v2.2.3"
-    - "[Changed]: Update Redis to v6.2.6"
+    - "[Fixed]: Add custom volume as Helm working dir (sync with upstream manifests)"
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index a18f21b6..8ca198af 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -54,16 +54,20 @@ spec:
         {{- if .Values.repoServer.containerSecurityContext }}
         securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}
         {{- end }}
-{{- if or (.Values.repoServer.env) (.Values.openshift.enabled) }}
         env:
-{{- if .Values.repoServer.env }}
-{{- toYaml .Values.repoServer.env | nindent 8 }}
-{{- end }}
-{{- if .Values.openshift.enabled }}
+        - name: HELM_CACHE_HOME
+          value: /helm-working-dir
+        - name: HELM_CONFIG_HOME
+          value: /helm-working-dir
+        - name: HELM_DATA_HOME
+          value: /helm-working-dir
+        {{- if .Values.repoServer.env }}
+          {{- toYaml .Values.repoServer.env | nindent 8 }}
+        {{- end }}
+        {{- if .Values.openshift.enabled }}
         - name: USER_NAME
           value: argocd
-{{- end }}
-{{- end }}
+        {{- end }}
         {{- with .Values.repoServer.envFrom }}
         envFrom: {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -87,6 +91,8 @@ spec:
           name: argocd-repo-server-tls
         - mountPath: /tmp
           name: tmp-dir
+        - mountPath: /helm-working-dir
+          name: helm-working-dir
         - mountPath: /home/argocd/cmp-server/plugins
           name: plugins
         ports:
@@ -166,6 +172,8 @@ spec:
           name: argocd-tls-certs-cm
         name: tls-certs
       {{- end }}
+      - name: helm-working-dir
+        emptyDir: {}
       - name: argocd-repo-server-tls
         secret:
           items: