Merge remote-tracking branch 'upstream/master'

2020-04-29 10:54:12 +02:00 · 2020-04-29 10:54:12 +02:00 · 93ba845abb
commit 93ba845abb
parent a1695d272a 3baf6c81c7
3 changed files with 8 additions and 1 deletions
--- a/2
+++ b/2
@ -7,7 +7,7 @@
 /charts/argo-events @jbehling

 # Argo Workflows
-/charts/argo @benjaminws
+/charts/argo @benjaminws @stefansedich

 # Argo Rollouts
 /charts/argo-rollouts @cabrinha
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@ -49,3 +49,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 }}
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@ -47,6 +47,10 @@ controller:
    #    passwordSecret:
    #      name: argo-postgres-config
    #      key: password
+  workflowDefaults: {}  # Only valid for 2.7+
+  #  spec:
+  #    ttlStrategy:
+  #      secondsAfterCompletion: 84600
  telemetryConfig:
    enabled: false
    path: /telemetry