From 7a10da0db524d0164e33998a671a4574e28d39d6 Mon Sep 17 00:00:00 2001 From: Pavel Dmytrenko Date: Wed, 6 Mar 2019 18:20:11 +0200 Subject: [PATCH] [stable/kibana] Add customizable service selector (#11957) * [stable/kibana] Implement customizable service selector Signed-off-by: Pavel Dmytrenko * [stable/kibana] Add CI test Signed-off-by: Pavel Dmytrenko * [stable/kibana] Update README Signed-off-by: Pavel Dmytrenko * [stable/kibana] Bump version Signed-off-by: Pavel Dmytrenko --- stable/kibana/Chart.yaml | 2 +- stable/kibana/README.md | 1 + stable/kibana/ci/service-values.yaml | 4 ++++ stable/kibana/templates/service.yaml | 3 +++ stable/kibana/values.yaml | 1 + 5 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 stable/kibana/ci/service-values.yaml diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml index 756b32f7ed26..1a37fcae985d 100644 --- a/stable/kibana/Chart.yaml +++ b/stable/kibana/Chart.yaml @@ -1,5 +1,5 @@ name: kibana -version: 1.5.2 +version: 1.6.0 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 497c847ba31d..b2c42d351090 100644 --- a/stable/kibana/README.md +++ b/stable/kibana/README.md @@ -81,6 +81,7 @@ The following table lists the configurable parameters of the kibana chart and th | `service.clusterIP` | static clusterIP or None for headless services | None: | | `service.annotations` | Kubernetes service annotations | None: | | `service.labels` | Kubernetes service labels | None: | +| `service.selector` | Kubernetes service selector | `{}` | | `tolerations` | List of node taints to tolerate | `[]` | | `dashboardImport.timeout` | Time in seconds waiting for Kibana to be in green overall state | `60` | | `dashboardImport.xpackauth.enabled` | Enable Xpack auth | `false` | diff --git a/stable/kibana/ci/service-values.yaml b/stable/kibana/ci/service-values.yaml new file mode 100644 index 000000000000..cebf52add1bc --- /dev/null +++ b/stable/kibana/ci/service-values.yaml @@ -0,0 +1,4 @@ +--- +service: + selector: + foo: bar diff --git a/stable/kibana/templates/service.yaml b/stable/kibana/templates/service.yaml index 064d470f6515..4416c45b1af1 100644 --- a/stable/kibana/templates/service.yaml +++ b/stable/kibana/templates/service.yaml @@ -48,6 +48,9 @@ spec: selector: app: {{ template "kibana.name" . }} release: {{ .Release.Name }} +{{- range $key, $value := .Values.service.selector }} + {{ $key }}: {{ $value | quote }} +{{- end }} {{- if .Values.service.loadBalancerIP }} loadBalancerIP: {{ .Values.service.loadBalancerIP }} {{- end }} diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml index 615474370c70..6cf400321b48 100644 --- a/stable/kibana/values.yaml +++ b/stable/kibana/values.yaml @@ -57,6 +57,7 @@ service: # kubernetes.io/cluster-service: "true" ## Limit load balancer source ips to list of CIDRs (where available) # loadBalancerSourceRanges: [] + selector: {} ingress: enabled: false