From 7d4deeb94841d51d5a6a2f35acb46bd7edcaedfd Mon Sep 17 00:00:00 2001
From: Abdullah Tariq <2349604+abdullah7@users.noreply.github.com>
Date: Tue, 9 Nov 2021 09:39:55 +0100
Subject: [PATCH] [bitnami/kibana] Add custom labels option to the service in
 Kibana chart (#8047)

* Add custom labels option to the service in Kibana chart

* Generate README through readme-generator-for-helm

Co-authored-by: Abdullah Tariq <abdullah.tariq@flixbus.com>
---
 bitnami/kibana/Chart.yaml             | 2 +-
 bitnami/kibana/README.md              | 1 +
 bitnami/kibana/templates/service.yaml | 3 +++
 bitnami/kibana/values.yaml            | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bitnami/kibana/Chart.yaml b/bitnami/kibana/Chart.yaml
index 2de9ec75d..6a778f6da 100644
--- a/bitnami/kibana/Chart.yaml
+++ b/bitnami/kibana/Chart.yaml
@@ -25,4 +25,4 @@ name: kibana
 sources:
   - https://github.com/bitnami/bitnami-docker-kibana
   - https://www.elastic.co/products/kibana
-version: 9.0.10
+version: 9.1.0
diff --git a/bitnami/kibana/README.md b/bitnami/kibana/README.md
index 0d4486117..1a1504bf4 100644
--- a/bitnami/kibana/README.md
+++ b/bitnami/kibana/README.md
@@ -125,6 +125,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `service.nodePort`                     | Specify the nodePort value for the LoadBalancer and NodePort service types                                                                                | `""`                     |
 | `service.externalTrafficPolicy`        | Enable client source IP preservation                                                                                                                      | `Cluster`                |
 | `service.annotations`                  | Annotations for Kibana service (evaluated as a template)                                                                                                  | `{}`                     |
+| `service.labels`                       | Extra labels for Kibana service                                                                                                                           | `{}`                     |
 | `service.loadBalancerIP`               | loadBalancerIP if Kibana service type is `LoadBalancer`                                                                                                   | `""`                     |
 | `service.extraPorts`                   | Extra ports to expose in the service (normally used with the `sidecar` value)                                                                             | `[]`                     |
 | `ingress.enabled`                      | Enable ingress controller resource                                                                                                                        | `false`                  |
diff --git a/bitnami/kibana/templates/service.yaml b/bitnami/kibana/templates/service.yaml
index cd37215d0..cb49e80b0 100644
--- a/bitnami/kibana/templates/service.yaml
+++ b/bitnami/kibana/templates/service.yaml
@@ -3,6 +3,9 @@ kind: Service
 metadata:
   name: {{ include "common.names.fullname" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+{{- if .Values.service.labels }}
+{{- include "common.tplvalues.render" (dict "value" .Values.service.labels "context" $) | nindent 4 }}
+{{- end }}
 {{- if or (and .Values.metrics.enabled .Values.metrics.service.annotations) .Values.service.annotations }}
   annotations:
   {{- if and .Values.metrics.enabled .Values.metrics.service.annotations }}
diff --git a/bitnami/kibana/values.yaml b/bitnami/kibana/values.yaml
index 8aeebe290..efd917060 100644
--- a/bitnami/kibana/values.yaml
+++ b/bitnami/kibana/values.yaml
@@ -240,6 +240,9 @@ service:
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
   ##
   annotations: {}
+  ## @param service.labels Extra labels for Kibana service
+  ##
+  labels: {}
   ## @param service.loadBalancerIP loadBalancerIP if Kibana service type is `LoadBalancer`
   ## ref: http://kubernetes.io/docs/user-guide/services/#type-loadbalancer
   ##