[stable/kibana] Support custom labels on Service (#5901)

* [stable/kibana] Support custom labels on Service

* [stable/kibana] Process #5901 review comments

- Outdent template `if` and `end` markers
- Document new parameter in `README.md`

See: #5901
See: 857dcc3662
See: https://github.com/kubernetes/charts/pull/5901
See: https://github.com/kubernetes/charts/pull/5901#pullrequestreview-125719949
See: https://github.com/kubernetes/charts/pull/5901#issuecomment-394479332

* Bump minor version for new feature

stable/kibana/Chart.yaml

@@ -1,5 +1,5 @@
 name: kibana
-version: 0.7.0
+version: 0.8.0
 appVersion: 6.3.1
 description: Kibana is an open source data visualization plugin for Elasticsearch
 icon: https://raw.githubusercontent.com/elastic/kibana/master/src/ui/public/icons/kibana-color.svg

stable/kibana/README.md

@@ -61,6 +61,7 @@ Parameter | Description | Default
 `service.loadBalancerIP` | Load Balancer IP address (to use with service.type LoadBalancer) | None:
 `service.type` | type of service | `ClusterIP`
 `service.annotations` | Kubernetes service annotations | None:
+`service.labels` | Kubernetes service labels | None:
 `tolerations` | List of node taints to tolerate | `[]`
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

stable/kibana/templates/service.yaml

@@ -6,6 +6,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  {{- range $key, $value := .Values.service.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
   name: {{ template "kibana.fullname" . }}
   annotations:
     {{- range $key, $value := .Values.service.annotations }}

stable/kibana/values.yaml

@@ -33,6 +33,9 @@ service:
   annotations:
     # Annotation example: setup ssl with aws cert when service.type is LoadBalancer
     # service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-1:EXAMPLE_CERT
+  labels:
+    ## Label example: show service URL in `kubectl cluster-info`
+    # kubernetes.io/cluster-service: "true"
 
 ingress:
   enabled: false