From eb16df15daa24b1d61ee95c957d127d0e35ee448 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Tue, 9 Mar 2021 21:53:06 +0100
Subject: [PATCH] fix(argo-cd): Mount emptyDir on repoServer for /tmp and
 /app/config/gpg/keys (#619)

* fix: Mount emptyDir on repoServer when using read-only FS

Signed-off-by: Marco Kilchhofer <marco@kilchhofer.info>

* fix: Mount emptyDir on repoServer for /tmp and /app/config/gpg/keys

The emptyDir for /app/config/gpg/keys was already implemented in the plain
manifests in the main project: https://github.com/argoproj/argo-cd/pull/4136

Signed-off-by: Marco Kilchhofer <marco@kilchhofer.info>
---
 charts/argo-cd/Chart.yaml                                 | 2 +-
 .../argo-cd/templates/argocd-repo-server/deployment.yaml  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 9bd0a5dc..681d58a3 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.8.4
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.16.0
+version: 2.16.1
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index a75c1283..a73dd08f 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -82,10 +82,8 @@ spec:
         {{- if .Values.repoServer.volumeMounts }}
 {{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
         {{- end }}
-        {{- if .Values.openshift.enabled }}
         - mountPath: /app/config/gpg/keys
           name: gpg-keyring
-        {{- end }}
         {{- if .Values.configs.knownHosts }}
         - mountPath: /app/config/ssh
           name: ssh-known-hosts
@@ -94,6 +92,8 @@ spec:
         - mountPath: /app/config/tls
           name: tls-certs
         {{- end }}
+        - mountPath: /tmp
+          name: tmp-dir
         ports:
         - name: repo-server
           containerPort: {{ .Values.repoServer.containerPort }}
@@ -142,10 +142,8 @@ spec:
       {{- if .Values.repoServer.volumes }}
 {{- toYaml .Values.repoServer.volumes | nindent 6}}
       {{- end }}
-      {{- if .Values.openshift.enabled }}
       - emptyDir: {}
         name: gpg-keyring
-      {{- end }}
       {{- if .Values.configs.knownHosts }}
       - configMap:
           name: argocd-ssh-known-hosts-cm
@@ -156,6 +154,8 @@ spec:
           name: argocd-tls-certs-cm
         name: tls-certs
       {{- end }}
+      - emptyDir: {}
+        name: tmp-dir
       {{- if .Values.repoServer.initContainers }}
       initContainers:
 {{- toYaml .Values.repoServer.initContainers | nindent 6 }}