From d701bf906871a90f795dad58d98768a0a79021fc Mon Sep 17 00:00:00 2001 From: pytimer Date: Mon, 11 Feb 2019 04:15:11 +0800 Subject: [PATCH] [stable/kibana] Add pod custom labels (#11260) Signed-off-by: pytimer --- stable/kibana/Chart.yaml | 2 +- stable/kibana/README.md | 1 + stable/kibana/templates/deployment.yaml | 3 +++ stable/kibana/values.yaml | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml index 5badfd1636..7fb1e9f799 100644 --- a/stable/kibana/Chart.yaml +++ b/stable/kibana/Chart.yaml @@ -1,5 +1,5 @@ name: kibana -version: 1.5.0 +version: 1.5.1 appVersion: 6.6.0 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 diff --git a/stable/kibana/README.md b/stable/kibana/README.md index 976997e44b..497c847ba3 100644 --- a/stable/kibana/README.md +++ b/stable/kibana/README.md @@ -57,6 +57,7 @@ The following table lists the configurable parameters of the kibana chart and th | `ingress.tls` | Ingress TLS configuration | None: | | `nodeSelector` | node labels for pod assignment | `{}` | | `podAnnotations` | annotations to add to each pod | `{}` | +| `podLabels` | labels to add to each pod | `{}` | | `replicaCount` | desired number of pods | `1` | | `revisionHistoryLimit` | revisionHistoryLimit | `3` | | `serviceAccountName` | DEPRECATED: use serviceAccount.name | `nil` | diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml index 695579a36f..b7377f09de 100644 --- a/stable/kibana/templates/deployment.yaml +++ b/stable/kibana/templates/deployment.yaml @@ -24,6 +24,9 @@ spec: labels: app: {{ template "kibana.name" . }} release: "{{ .Release.Name }}" +{{- if .Values.podLabels }} +{{ toYaml .Values.podLabels | indent 8 }} +{{- end }} spec: serviceAccountName: {{ template "kibana.serviceAccountName" . }} {{- if .Values.priorityClassName }} diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml index 69b44a571c..b547edec37 100644 --- a/stable/kibana/values.yaml +++ b/stable/kibana/values.yaml @@ -138,6 +138,9 @@ podAnnotations: {} replicaCount: 1 revisionHistoryLimit: 3 +# Custom labels for pod assignment +podLabels: {} + # To export a dashboard from a running Kibana 6.3.x use: # curl --user : -XGET https://kibana.yourdomain.com:5601/api/kibana/dashboards/export?dashboard= > my-dashboard.json # A dashboard is defined by a name and a string with the json payload or the download url