[kibana] - Add additionals labels

elastic · Jul 17, 2019 · e3edaa1 · e3edaa1
1 parent 581b083
commit e3edaa1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/kibana/README.md b/kibana/README.md
@@ -69,6 +69,7 @@ helm install --name kibana elastic/kibana --version 7.2.0 --set imageTag=7.2.0
 | `tolerations`             | Configurable [tolerations](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/)                                                                                                                                                                                                                                                            | `[]`                                                                                                                      |
 | `ingress`                 | Configurable [ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) to expose the Kibana service. See [`values.yaml`](./values.yaml) for an example                                                                                                                                                                                       | `enabled: false`                                                                                                          |
 | `service`                 | Configurable [service](https://kubernetes.io/docs/concepts/services-networking/service/) to expose the Kibana service. See [`values.yaml`](./values.yaml) for an example                                                                                                                                                                                       | `type: ClusterIP`<br>`port: 5601`<br>`nodePort:`<br>`annotations: {}`                                                     |
+| `labels`                 | Configurable [label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Kibana pods                                                                                                                                     | `{}`                                                                                                                      |
 
 ## Examples
 

diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml
@@ -5,6 +5,9 @@ metadata:
   labels:
     app: {{ .Chart.Name }}
     release: {{ .Release.Name | quote }}
+    {{- range $key, $value := .Values.labels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicas }}
   strategy:

diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py
@@ -355,4 +355,12 @@ def test_override_imagePullPolicy():
 
     r = helm_template(config)
     c = r['deployment'][name]['spec']['template']['spec']['containers'][0]
-    assert c['imagePullPolicy'] == 'Always'
+    assert c['imagePullPolicy'] == 'Always'
+
+  def test_adding_pod_labels():
+     config = '''
+ labels:
+   app.kubernetes.io/name: kibana
+ '''
+     r = helm_template(config)
+     assert r['daemonset'][name]['metadata']['labels']['app.kubernetes.io/name'] == 'kibana'
diff --git a/kibana/values.yaml b/kibana/values.yaml
@@ -24,6 +24,9 @@ image: "docker.elastic.co/kibana/kibana"
 imageTag: "7.2.0"
 imagePullPolicy: "IfNotPresent"
 
+# additionals labels
+labels: {}
+
 podAnnotations: {}
   # iam.amazonaws.com/role: es-cluster