[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

@@ -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

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 | `{}` |

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 }}

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