Merge branch 'master' into master

This commit is contained in:
Alex Collins 2020-04-28 10:16:23 -07:00 committed by GitHub
commit b896d69e37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions

View file

@ -54,3 +54,6 @@ data:
{{- if .Values.controller.persistence }}
persistence:
{{ toYaml .Values.controller.persistence | indent 6 }}{{- end }}
{{- if .Values.controller.workflowDefaults }}
workflowDefaults:
{{ toYaml .Values.controller.workflowDefaults | indent 6 }}{{- end }}

View file

@ -51,6 +51,10 @@ controller:
# passwordSecret:
# name: argo-postgres-config
# key: password
workflowDefaults: {} # Only valid for 2.7+
# spec:
# ttlStrategy:
# secondsAfterCompletion: 84600
telemetryConfig:
enabled: false
path: /telemetry