From 3c67bc2ad40ac0adaf96e5792fbced2b8b95378f Mon Sep 17 00:00:00 2001 From: Robert Van Voorhees Date: Sat, 13 Jul 2019 19:31:03 -0400 Subject: [PATCH] Allow default TLS certs rather than requiring secret name for tls section. (#15499) Signed-off-by: Robert Van Voorhees --- stable/grafana/Chart.yaml | 2 +- stable/grafana/templates/ingress.yaml | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 4a0c9776be..b04f8f3ded 100755 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 3.5.10 +version: 3.5.11 appVersion: 6.2.5 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/templates/ingress.yaml b/stable/grafana/templates/ingress.yaml index 13e581da3b..ab27eb0d20 100644 --- a/stable/grafana/templates/ingress.yaml +++ b/stable/grafana/templates/ingress.yaml @@ -22,13 +22,7 @@ metadata: spec: {{- if .Values.ingress.tls }} tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} +{{ toYaml .Values.ingress.tls | indent 4 }} {{- end }} rules: {{- range .Values.ingress.hosts }}