DevFW-CICD/argocd-helm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-cd): Mount emptyDir on repoServer for /tmp and /app/config/gpg/keys (#619)

Browse source 
* 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>
This commit is contained in:
Marco Kilchhofer 2021-03-09 21:53:06 +01:00 committed by GitHub
parent 4b0358d20f
commit eb16df15da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 1.8.4 appVersion: 1.8.4
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 2.16.0 version: 2.16.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

8
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -82,10 +82,8 @@ spec:
{{- if .Values.repoServer.volumeMounts }} {{- if .Values.repoServer.volumeMounts }}
{{- toYaml .Values.repoServer.volumeMounts | nindent 8}} {{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
{{- end }} {{- end }}
{{- if .Values.openshift.enabled }}
- mountPath: /app/config/gpg/keys - mountPath: /app/config/gpg/keys
name: gpg-keyring name: gpg-keyring
{{- end }}
{{- if .Values.configs.knownHosts }} {{- if .Values.configs.knownHosts }}
- mountPath: /app/config/ssh - mountPath: /app/config/ssh
name: ssh-known-hosts name: ssh-known-hosts
@ -94,6 +92,8 @@ spec:
- mountPath: /app/config/tls - mountPath: /app/config/tls
name: tls-certs name: tls-certs
{{- end }} {{- end }}
- mountPath: /tmp
name: tmp-dir
ports: ports:
- name: repo-server - name: repo-server
containerPort: {{ .Values.repoServer.containerPort }} containerPort: {{ .Values.repoServer.containerPort }}
@ -142,10 +142,8 @@ spec:
{{- if .Values.repoServer.volumes }} {{- if .Values.repoServer.volumes }}
{{- toYaml .Values.repoServer.volumes | nindent 6}} {{- toYaml .Values.repoServer.volumes | nindent 6}}
{{- end }} {{- end }}
{{- if .Values.openshift.enabled }}
- emptyDir: {} - emptyDir: {}
name: gpg-keyring name: gpg-keyring
{{- end }}
{{- if .Values.configs.knownHosts }} {{- if .Values.configs.knownHosts }}
- configMap: - configMap:
name: argocd-ssh-known-hosts-cm name: argocd-ssh-known-hosts-cm
@ -156,6 +154,8 @@ spec:
name: argocd-tls-certs-cm name: argocd-tls-certs-cm
name: tls-certs name: tls-certs
{{- end }} {{- end }}
- emptyDir: {}
name: tmp-dir
{{- if .Values.repoServer.initContainers }} {{- if .Values.repoServer.initContainers }}
initContainers: initContainers:
{{- toYaml .Values.repoServer.initContainers | nindent 6 }} {{- toYaml .Values.repoServer.initContainers | nindent 6 }}