Merge branch 'master' into updated-crds

This commit is contained in:
chgl 2021-02-13 18:50:56 +01:00
commit 99d68b7ae3
5 changed files with 1937 additions and 1929 deletions

View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.12.5 appVersion: v2.12.5
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
name: argo name: argo
version: 0.15.4 version: 0.16.0
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

@ -14,6 +14,9 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
{{- range $key, $value := .Values.server.ingress.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations: annotations:
{{- range $key, $value := .Values.server.ingress.annotations }} {{- range $key, $value := .Values.server.ingress.annotations }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}

View file

@ -226,6 +226,11 @@ server:
# kubernetes.io/ingress.class: nginx # kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true" # kubernetes.io/tls-acme: "true"
## Labels to be added to the web ingress.
##
# labels:
# use-cloudflare-solver: "true"
## Hostnames. ## Hostnames.
## Must be provided if Ingress is enabled. ## Must be provided if Ingress is enabled.
## ##