Merge branch 'master' into master

This commit is contained in:
Stefan Sedich 2020-11-16 13:21:19 -08:00 committed by GitHub
commit d6f153c930
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions

View file

@ -1,8 +1,8 @@
apiVersion: v1 apiVersion: v1
appVersion: v2.11.3 appVersion: v2.11.7
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
name: argo name: argo
version: 0.13.3 version: 0.13.5
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
maintainers: maintainers:

View file

@ -67,17 +67,21 @@ spec:
value: {{ .Values.server.baseHref | quote }} value: {{ .Values.server.baseHref | quote }}
resources: resources:
{{- toYaml .Values.server.resources | nindent 12 }} {{- toYaml .Values.server.resources | nindent 12 }}
{{- with .Values.server.volumeMounts }}
volumeMounts: volumeMounts:
{{- toYaml . | nindent 12}} - name: tmp
mountPath: /tmp
{{- with .Values.server.volumeMounts }}
{{- toYaml . | nindent 10}}
{{- end }} {{- end }}
{{- with .Values.images.pullSecrets }} {{- with .Values.images.pullSecrets }}
imagePullSecrets: imagePullSecrets:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.server.volumes }}
volumes: volumes:
{{- toYaml . | nindent 8}} - name: tmp
emptyDir: {}
{{- with .Values.server.volumes }}
{{- toYaml . | nindent 6}}
{{- end }} {{- end }}
{{- with .Values.server.nodeSelector }} {{- with .Values.server.nodeSelector }}
nodeSelector: nodeSelector:
@ -94,5 +98,4 @@ spec:
{{- if .Values.server.priorityClassName }} {{- if .Values.server.priorityClassName }}
priorityClassName: {{ .Values.server.priorityClassName }} priorityClassName: {{ .Values.server.priorityClassName }}
{{- end }} {{- end }}
{{- end -}} {{- end -}}

View file

@ -7,7 +7,7 @@ images:
# Secrets with credentials to pull images from a private registry # Secrets with credentials to pull images from a private registry
pullSecrets: [] pullSecrets: []
# - name: argo-pull-secret # - name: argo-pull-secret
tag: v2.11.3 tag: v2.11.7
crdVersion: v1alpha1 crdVersion: v1alpha1
installCRD: true installCRD: true