From 1aea2c41798972ff0077108f926bb9095f3f9deb Mon Sep 17 00:00:00 2001
From: Artyom Bakhtin
Date: Thu, 11 Feb 2021 13:40:56 +0300
Subject: [PATCH] feat: allow custom labels in server ingress (#575)
Signed-off-by: Artyom Bakhtin
---
charts/argo/Chart.yaml | 2 +-
charts/argo/templates/server-ingress.yaml | 3 +++
charts/argo/values.yaml | 5 +++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 4582dd29..a00271cc 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.12.5
description: A Helm chart for Argo Workflows
name: argo
-version: 0.15.4
+version: 0.16.0
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-ingress.yaml b/charts/argo/templates/server-ingress.yaml
index eb0f37e0..6eab3f50 100644
--- a/charts/argo/templates/server-ingress.yaml
+++ b/charts/argo/templates/server-ingress.yaml
@@ -14,6 +14,9 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
+ {{- range $key, $value := .Values.server.ingress.labels }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
annotations:
{{- range $key, $value := .Values.server.ingress.annotations }}
{{ $key }}: {{ $value | quote }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 75642af8..43dc94ae 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -226,6 +226,11 @@ server:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
+ ## Labels to be added to the web ingress.
+ ##
+ # labels:
+ # use-cloudflare-solver: "true"
+
## Hostnames.
## Must be provided if Ingress is enabled.
##