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

Signed-off-by: Marco Kilchhofer <marco@kilchhofer.info>
This commit is contained in:
Marco Kilchhofer 2021-03-08 23:13:34 +01:00
parent ff388f8f94
commit 1148824185
2 changed files with 12 additions and 3 deletions

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.15.0 version: 2.15.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:

View file

@ -1,4 +1,5 @@
{{- $redisHa := (index .Values "redis-ha") -}} {{- $redisHa := (index .Values "redis-ha") -}}
{{- $containerSecurityContext := .Values.repoServer.containerSecurityContext | default dict }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -82,7 +83,7 @@ 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 }} {{- if or .Values.openshift.enabled $containerSecurityContext.readOnlyRootFilesystem }}
- mountPath: /app/config/gpg/keys - mountPath: /app/config/gpg/keys
name: gpg-keyring name: gpg-keyring
{{- end }} {{- end }}
@ -94,6 +95,10 @@ spec:
- mountPath: /app/config/tls - mountPath: /app/config/tls
name: tls-certs name: tls-certs
{{- end }} {{- end }}
{{- if $containerSecurityContext.readOnlyRootFilesystem }}
- mountPath: /tmp
name: tmp-dir
{{- end }}
ports: ports:
- name: repo-server - name: repo-server
containerPort: {{ .Values.repoServer.containerPort }} containerPort: {{ .Values.repoServer.containerPort }}
@ -142,7 +147,7 @@ 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 }} {{- if or .Values.openshift.enabled $containerSecurityContext.readOnlyRootFilesystem }}
- emptyDir: {} - emptyDir: {}
name: gpg-keyring name: gpg-keyring
{{- end }} {{- end }}
@ -156,6 +161,10 @@ spec:
name: argocd-tls-certs-cm name: argocd-tls-certs-cm
name: tls-certs name: tls-certs
{{- end }} {{- end }}
{{- if $containerSecurityContext.readOnlyRootFilesystem }}
- emptyDir: {}
name: tmp-dir
{{- end }}
{{- if .Values.repoServer.initContainers }} {{- if .Values.repoServer.initContainers }}
initContainers: initContainers:
{{- toYaml .Values.repoServer.initContainers | nindent 6 }} {{- toYaml .Values.repoServer.initContainers | nindent 6 }}