From bf8bf9bea45962453800c813863433446c042c7d Mon Sep 17 00:00:00 2001
From: wjeanneau <william.jeanneau@gmail.com>
Date: Thu, 10 May 2018 02:16:53 -0400
Subject: [PATCH] [stable/grafana] Add custom labels on grafana ingress (#5299)

* [stable/grafana] Add custom labels on grafana ingress

* [stable/grafana] Increase chart version
---
 stable/grafana/Chart.yaml             | 2 +-
 stable/grafana/README.md              | 1 +
 stable/grafana/templates/ingress.yaml | 3 +++
 stable/grafana/values.yaml            | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index b81009e3ce..24212cb915 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 1.4.0
+version: 1.5.0
 appVersion: 5.0.4
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.net
diff --git a/stable/grafana/README.md b/stable/grafana/README.md
index 92744942aa..e347245435 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -42,6 +42,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `service.labels`           | Custom labels                       | `{}`
 | `ingress.enabled`          | Enables Ingress | `false` |
 | `ingress.annotations`      | Ingress annotations | `{}` |
+| `ingress.labels`           | Custom labels                       | `{}`
 | `ingress.hosts`            | Ingress accepted hostnames | `[]` |
 | `ingress.tls`              | Ingress TLS configuration | `[]` |
 | `resources`                | CPU/Memory resource requests/limits | `{}` |
diff --git a/stable/grafana/templates/ingress.yaml b/stable/grafana/templates/ingress.yaml
index 9a48840f7f..307166f324 100644
--- a/stable/grafana/templates/ingress.yaml
+++ b/stable/grafana/templates/ingress.yaml
@@ -11,6 +11,9 @@ metadata:
     chart: {{ template "grafana.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- if .Values.ingress.labels }}
+{{ toYaml .Values.ingress.labels | indent 4 }}
+{{- end }}
 {{- with .Values.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index dca1e4683b..768adeefc3 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -38,6 +38,7 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+  labels: {}
   path: /
   hosts:
     - chart-example.local