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:
parent
1148824185
commit
56022b9874
1 changed files with 0 additions and 9 deletions
|
@ -1,5 +1,4 @@
|
||||||
{{- $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:
|
||||||
|
@ -83,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 or .Values.openshift.enabled $containerSecurityContext.readOnlyRootFilesystem }}
|
|
||||||
- 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
|
||||||
|
@ -95,10 +92,8 @@ spec:
|
||||||
- mountPath: /app/config/tls
|
- mountPath: /app/config/tls
|
||||||
name: tls-certs
|
name: tls-certs
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if $containerSecurityContext.readOnlyRootFilesystem }}
|
|
||||||
- mountPath: /tmp
|
- mountPath: /tmp
|
||||||
name: tmp-dir
|
name: tmp-dir
|
||||||
{{- end }}
|
|
||||||
ports:
|
ports:
|
||||||
- name: repo-server
|
- name: repo-server
|
||||||
containerPort: {{ .Values.repoServer.containerPort }}
|
containerPort: {{ .Values.repoServer.containerPort }}
|
||||||
|
@ -147,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 or .Values.openshift.enabled $containerSecurityContext.readOnlyRootFilesystem }}
|
|
||||||
- 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
|
||||||
|
@ -161,10 +154,8 @@ spec:
|
||||||
name: argocd-tls-certs-cm
|
name: argocd-tls-certs-cm
|
||||||
name: tls-certs
|
name: tls-certs
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if $containerSecurityContext.readOnlyRootFilesystem }}
|
|
||||||
- emptyDir: {}
|
- emptyDir: {}
|
||||||
name: tmp-dir
|
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 }}
|
||||||
|
|
Loading…
Reference in a new issue