From 9939da51cfabe465ccb730a88976ce2a6b26112e Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Fri, 13 Nov 2020 14:42:39 -0800 Subject: [PATCH 1/4] fix(argo): Map the /tmp directory into server pods. (#498) --- charts/argo/Chart.yaml | 4 ++-- charts/argo/templates/server-deployment.yaml | 9 ++++++--- charts/argo/values.yaml | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 744996b6..ceabe44b 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: v2.11.3 +appVersion: v2.11.7 description: A Helm chart for Argo Workflows name: argo -version: 0.13.2 +version: 0.13.3 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml index bfaa3e97..6fc6aa45 100644 --- a/charts/argo/templates/server-deployment.yaml +++ b/charts/argo/templates/server-deployment.yaml @@ -67,16 +67,20 @@ spec: value: {{ .Values.server.baseHref | quote }} resources: {{- toYaml .Values.server.resources | nindent 12 }} - {{- with .Values.server.volumeMounts }} volumeMounts: + - name: tmp + mountPath: /tmp + {{- with .Values.server.volumeMounts }} {{- toYaml . | nindent 12}} {{- end }} {{- with .Values.images.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.server.volumes }} volumes: + - name: tmp + emptyDir: {} + {{- with .Values.server.volumes }} {{- toYaml . | nindent 8}} {{- end }} {{- with .Values.server.nodeSelector }} @@ -94,5 +98,4 @@ spec: {{- if .Values.server.priorityClassName }} priorityClassName: {{ .Values.server.priorityClassName }} {{- end }} - {{- end -}} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index a6cceec0..4ab21912 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -7,7 +7,7 @@ images: # Secrets with credentials to pull images from a private registry pullSecrets: [] # - name: argo-pull-secret - tag: v2.11.3 + tag: v2.11.7 crdVersion: v1alpha1 installCRD: true From c99716bc2036efc74a46bdd76da5a9630ccd786b Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Mon, 16 Nov 2020 11:07:02 -0800 Subject: [PATCH 2/4] fix(argo): Volume indents. (#500) Signed-off-by: Vlad Losev --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-deployment.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index ceabe44b..6c46cbfe 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v2.11.7 description: A Helm chart for Argo Workflows name: argo -version: 0.13.3 +version: 0.13.4 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml index 6fc6aa45..bae59607 100644 --- a/charts/argo/templates/server-deployment.yaml +++ b/charts/argo/templates/server-deployment.yaml @@ -71,7 +71,7 @@ spec: - name: tmp mountPath: /tmp {{- with .Values.server.volumeMounts }} - {{- toYaml . | nindent 12}} + {{- toYaml . | nindent 10}} {{- end }} {{- with .Values.images.pullSecrets }} imagePullSecrets: @@ -81,7 +81,7 @@ spec: - name: tmp emptyDir: {} {{- with .Values.server.volumes }} - {{- toYaml . | nindent 8}} + {{- toYaml . | nindent 6}} {{- end }} {{- with .Values.server.nodeSelector }} nodeSelector: From e4d67ae6e9460204f7a40ede6cb9de3a2b5b4b80 Mon Sep 17 00:00:00 2001 From: Michael Seiwald Date: Mon, 16 Nov 2020 22:49:59 +0100 Subject: [PATCH 3/4] feat: Add support for Argo links (#497) Signed-off-by: Michael Seiwald --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/workflow-controller-config-map.yaml | 3 +++ charts/argo/values.yaml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 6c46cbfe..2fbb2cfb 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v2.11.7 description: A Helm chart for Argo Workflows name: argo -version: 0.13.4 +version: 0.13.5 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 2c182c60..2f2faf93 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -81,3 +81,6 @@ data: {{- with .Values.controller.workflowRestrictions }} workflowRestrictions: {{- toYaml . | nindent 6 }} {{- end }} + {{- with .Values.controller.links }} + links: {{- toYaml . | nindent 6 }} + {{- end }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 4ab21912..1a4c5f28 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -129,6 +129,8 @@ controller: # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ # PriorityClass: system-cluster-critical priorityClassName: "" + # https://argoproj.github.io/argo/links/ + links: [] # executor controls how the init and wait container should be customized executor: From d265f7dd75a9b45a25d832a2bdf653a4925e618d Mon Sep 17 00:00:00 2001 From: dbseel Date: Tue, 17 Nov 2020 13:32:02 -0500 Subject: [PATCH 4/4] feat: Add parallelism to argo-helm chart (#482) * feat: Add parallelism to argo-helm chart Signed-off-by: David Seel * Parallelism null by default Signed-off-by: David Seel --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/workflow-controller-config-map.yaml | 3 +++ charts/argo/values.yaml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 2fbb2cfb..7ac88c50 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v2.11.7 description: A Helm chart for Argo Workflows name: argo -version: 0.13.5 +version: 0.13.6 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 2f2faf93..94b0bad6 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -16,6 +16,9 @@ data: {{- end }} {{- end }} containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }} + {{- if .Values.controller.parallelism }} + parallelism: {{ .Values.controller.parallelism }} + {{- end }} {{- if or .Values.executor.resources .Values.executor.env .Values.executor.securityContext}} executor: {{- with .Values.executor.resources }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 1a4c5f28..4fa4cd7a 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -36,6 +36,8 @@ controller: image: # Overrides .images.tag if defined. tag: "" + # parallelism dictates how many workflows can be running at the same time + parallelism: # podAnnotations is an optional map of annotations to be applied to the controller Pods podAnnotations: {} # Optional labels to add to the controller pods