Merge remote-tracking branch 'upstream/master'

This commit is contained in:
chgl 2020-04-18 16:38:38 +02:00
commit f7837f693e

View file

@ -6,9 +6,9 @@ items:
- apiVersion: argoproj.io/v1alpha1
kind: AppProject
metadata:
{{- if .additionalProjects }}
{{- if .additionalAnnotations }}
annotations:
{{- range $key, $value := .additionalProjects }}
{{- range $key, $value := .additionalAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
@ -43,4 +43,4 @@ items:
{{- toYaml .roles | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}