Adding support for custom labels on grafana svc (#4172)

stable/grafana/Chart.yaml

@@ -1,5 +1,5 @@
 name: grafana
-version: 1.2.0
+version: 1.2.1
 appVersion: 5.0.4
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.net

stable/grafana/README.md

@@ -39,6 +39,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `service.type`             | Kubernetes service type | `ClusterIP` |
 | `service.port`             | Kubernetes port where service is exposed| `9000` |
 | `service.annotations`      | Service annotations | `80` |
+| `service.labels`           | Custom labels                       | `{}`
 | `ingress.enabled`          | Enables Ingress | `false` |
 | `ingress.annotations`      | Ingress annotations | `{}` |
 | `ingress.hosts`            | Ingress accepted hostnames | `[]` |

stable/grafana/templates/service.yaml

@@ -7,6 +7,9 @@ metadata:
     chart: {{ template "grafana.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- if .Values.service.labels }}
+{{ toYaml .Values.service.labels | indent 4 }}
+{{- end }}
 {{- with .Values.service.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}

stable/grafana/values.yaml

@@ -31,6 +31,7 @@ service:
   type: ClusterIP
   port: 80
   annotations: {}
+  labels: {}
 
 ingress:
   enabled: false