helm/grafana: Allow to set custom Service labels (#1426)

See: e131164c42

helm/grafana/Chart.yaml

@@ -8,4 +8,4 @@ maintainers:
 name: grafana
 sources:
 - https://github.com/coreos/prometheus-operator
-version: 0.0.34
+version: 0.0.35

helm/grafana/README.md

@@ -54,6 +54,7 @@ Parameter | Description | Default
 `service.annotations` | Annotations to be added to the Grafana Service | `{}`
 `service.clusterIP` | Cluster-internal IP address for Grafana Service | `""`
 `service.externalIPs` | List of external IP addresses at which the Grafana Service will be available | `[]`
+`service.labels` | Labels for Grafana Service | `{}`
 `service.loadBalancerIP` | External IP address to assign to Grafana Service | `""`
 `service.loadBalancerSourceRanges` | List of client IPs allowed to access Grafana Service | `[]`
 `service.nodePort` | Port to expose Grafana Service on each node | `30902`

helm/grafana/templates/svc.yaml

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

helm/grafana/values.yaml

@@ -54,6 +54,10 @@ service:
   ##
   externalIPs: []
 
+  ## Labels to be added to the Service
+  ##
+  labels: {}
+
   ## External IP address to assign to Alertmanager Service
   ## Only used if service.type is 'LoadBalancer' and supported by cloud provider
   ##

helm/kube-prometheus/Chart.yaml

@@ -7,4 +7,4 @@ maintainers:
 name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.80
+version: 0.0.81

helm/kube-prometheus/requirements.yaml

@@ -59,7 +59,7 @@ dependencies:
     condition: deployExporterNode
 
   - name: grafana
-    version: 0.0.34
+    version: 0.0.35
     #e2e-repository: file://../grafana
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
     condition: deployGrafana