add optional volume mount to secret argocd-repo-server-tls according to 7a68880e2e

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>
This commit is contained in:
Marcel Hoyer 2021-04-07 15:42:57 +02:00
parent 73ec55fff2
commit ea08caa0a1
3 changed files with 41 additions and 2 deletions

View file

@ -92,8 +92,10 @@ spec:
timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.readinessProbe.successThreshold }} successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }} failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
{{- if .Values.controller.volumeMounts }}
volumeMounts: volumeMounts:
- mountPath: /app/config/controller/tls
name: argocd-repo-server-tls
{{- if .Values.controller.volumeMounts }}
{{- toYaml .Values.controller.volumeMounts | nindent 10}} {{- toYaml .Values.controller.volumeMounts | nindent 10}}
{{- end }} {{- end }}
resources: resources:
@ -115,8 +117,19 @@ spec:
hostAliases: hostAliases:
{{ toYaml . | indent 6 }} {{ toYaml . | indent 6 }}
{{- end }} {{- end }}
{{- if .Values.controller.volumes }}
volumes: volumes:
- name: argocd-repo-server-tls
secret:
items:
- key: tls.crt
path: tls.crt
- key: tls.key
path: tls.key
- key: ca.crt
path: ca.crt
optional: true
secretName: argocd-repo-server-tls
{{- if .Values.controller.volumes }}
{{- toYaml .Values.controller.volumes | nindent 8 }} {{- toYaml .Values.controller.volumes | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.controller.priorityClassName }} {{- if .Values.controller.priorityClassName }}

View file

@ -81,6 +81,8 @@ spec:
- mountPath: /app/config/tls - mountPath: /app/config/tls
name: tls-certs name: tls-certs
{{- end }} {{- end }}
- mountPath: /app/config/reposerver/tls
name: argocd-repo-server-tls
- mountPath: /tmp - mountPath: /tmp
name: tmp-dir name: tmp-dir
ports: ports:
@ -143,6 +145,17 @@ spec:
name: argocd-tls-certs-cm name: argocd-tls-certs-cm
name: tls-certs name: tls-certs
{{- end }} {{- end }}
- name: argocd-repo-server-tls
secret:
items:
- key: tls.crt
path: tls.crt
- key: tls.key
path: tls.key
- key: ca.crt
path: ca.crt
optional: true
secretName: argocd-repo-server-tls
- emptyDir: {} - emptyDir: {}
name: tmp-dir name: tmp-dir
{{- if .Values.repoServer.initContainers }} {{- if .Values.repoServer.initContainers }}

View file

@ -80,6 +80,8 @@ spec:
- mountPath: /app/config/tls - mountPath: /app/config/tls
name: tls-certs name: tls-certs
{{- end }} {{- end }}
- mountPath: /app/config/server/tls
name: argocd-repo-server-tls
ports: ports:
- name: {{ .Values.server.name }} - name: {{ .Values.server.name }}
containerPort: {{ .Values.server.containerPort }} containerPort: {{ .Values.server.containerPort }}
@ -149,6 +151,17 @@ spec:
name: argocd-tls-certs-cm name: argocd-tls-certs-cm
name: tls-certs name: tls-certs
{{- end }} {{- end }}
- name: argocd-repo-server-tls
secret:
items:
- key: tls.crt
path: tls.crt
- key: tls.key
path: tls.key
- key: ca.crt
path: ca.crt
optional: true
secretName: argocd-repo-server-tls
{{- if .Values.server.priorityClassName }} {{- if .Values.server.priorityClassName }}
priorityClassName: {{ .Values.server.priorityClassName }} priorityClassName: {{ .Values.server.priorityClassName }}
{{- end }} {{- end }}