From 8982d3655457262d556f9ab54eedcdbd54b67a39 Mon Sep 17 00:00:00 2001 From: Kirill Makhonin Date: Thu, 27 Dec 2018 13:09:03 +0300 Subject: [PATCH] [#313] Use template for enabling EDI --- deploy/helms/legion/templates/_helpers.tpl | 2 +- deploy/helms/legion/templates/edi/edi-server.yaml | 2 +- deploy/helms/legion/templates/metrics/grafana.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/helms/legion/templates/_helpers.tpl b/deploy/helms/legion/templates/_helpers.tpl index 2282f20b8..3aa0241e3 100644 --- a/deploy/helms/legion/templates/_helpers.tpl +++ b/deploy/helms/legion/templates/_helpers.tpl @@ -5,7 +5,7 @@ Create dex Ingress auth annotations */}} {{- define "dex-ingress-annotations" }} {{- if .Values.auth.enabled -}} - {{- range $key, $value := .Values.edi.auth.annotations }} + {{- range $key, $value := .Values.auth.annotations }} {{ $key }}: {{ $value | quote }} {{- end }} {{- end }} diff --git a/deploy/helms/legion/templates/edi/edi-server.yaml b/deploy/helms/legion/templates/edi/edi-server.yaml index c361cabd9..76a6a38e4 100644 --- a/deploy/helms/legion/templates/edi/edi-server.yaml +++ b/deploy/helms/legion/templates/edi/edi-server.yaml @@ -115,7 +115,7 @@ metadata: {{- range $key, $value := .Values.edi.ingress.annotations }} {{ $key }}: {{ $value | quote }} {{- end }} - {{- template "dex-ingress-annotations" }} + {{- template "dex-ingress-annotations" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} diff --git a/deploy/helms/legion/templates/metrics/grafana.yaml b/deploy/helms/legion/templates/metrics/grafana.yaml index 27fe810b5..5a82f7da5 100644 --- a/deploy/helms/legion/templates/metrics/grafana.yaml +++ b/deploy/helms/legion/templates/metrics/grafana.yaml @@ -84,7 +84,7 @@ metadata: {{- range $key, $value := .Values.grafana.ingress.annotations }} {{ $key }}: {{ $value | quote }} {{- end }} - {{- template "dex-ingress-annotations" }} + {{- template "dex-ingress-annotations" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }}