From 482af9cb85f2955836f99ae828ca0c0c3a393ff2 Mon Sep 17 00:00:00 2001 From: Pavel Dmytrenko Date: Tue, 19 Feb 2019 00:15:29 +0200 Subject: [PATCH] [stable/kibana] Fix initContainers indentation (#11324) * [stable/kibana] Fix indentation for initContainers Signed-off-by: Pavel Dmytrenko * [stable/kibana] Add test case Signed-off-by: Pavel Dmytrenko * [stable/kibana] Bump version Signed-off-by: Pavel Dmytrenko * [stable/kibana] Simplify dashboardImport testcase Signed-off-by: Pavel Dmytrenko * [stable/kibana] Add testcase for all init container types Signed-off-by: Pavel Dmytrenko * [stable/kibana] Update logtrail plugin to v6.6.0 compatible Signed-off-by: Pavel Dmytrenko --- stable/kibana/Chart.yaml | 2 +- .../kibana/ci/initcontainers-all-values.yaml | 22 +++++++++++++++++++ stable/kibana/ci/plugin-install.yaml | 2 +- stable/kibana/templates/deployment.yaml | 4 ++-- stable/kibana/values.yaml | 2 +- 5 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 stable/kibana/ci/initcontainers-all-values.yaml diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml index 7fb1e9f799..756b32f7ed 100644 --- a/stable/kibana/Chart.yaml +++ b/stable/kibana/Chart.yaml @@ -1,5 +1,5 @@ name: kibana -version: 1.5.1 +version: 1.5.2 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/ci/initcontainers-all-values.yaml b/stable/kibana/ci/initcontainers-all-values.yaml new file mode 100644 index 0000000000..986c21fd38 --- /dev/null +++ b/stable/kibana/ci/initcontainers-all-values.yaml @@ -0,0 +1,22 @@ +--- +# enable all init container types + +# A dashboard is defined by a name and a string with the json payload or the download url +dashboardImport: + dashboards: + k8s: https://raw.githubusercontent.com/monotek/kibana-dashboards/master/k8s-fluentd-elasticsearch.json + +# Enable the plugin init container with plugins retrieved from an URL +plugins: + enabled: true + reset: false + # Use to add/upgrade plugin + values: + - logtrail,0.1.31,https://github.com/sivasamyk/logtrail/releases/download/v0.1.31/logtrail-6.6.0-0.1.31.zip + # - other_plugin + +# Add your own init container +initContainers: + echo-container: + image: "busybox" + command: ['sh', '-c', 'echo Hello from init container! && sleep 3'] diff --git a/stable/kibana/ci/plugin-install.yaml b/stable/kibana/ci/plugin-install.yaml index 57912bd619..8e9284a60f 100644 --- a/stable/kibana/ci/plugin-install.yaml +++ b/stable/kibana/ci/plugin-install.yaml @@ -5,5 +5,5 @@ plugins: reset: false # Use to add/upgrade plugin values: - - logtrail,0.1.30,https://github.com/sivasamyk/logtrail/releases/download/v0.1.30/logtrail-6.4.3-0.1.30.zip + - logtrail,0.1.31,https://github.com/sivasamyk/logtrail/releases/download/v0.1.31/logtrail-6.6.0-0.1.31.zip # - other_plugin diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml index b7377f09de..1daf0d3385 100644 --- a/stable/kibana/templates/deployment.yaml +++ b/stable/kibana/templates/deployment.yaml @@ -36,8 +36,8 @@ spec: initContainers: {{- if .Values.initContainers }} {{- range $key, $value := .Values.initContainers }} - - name: "{{ $key }}" -{{ toYaml $value | indent 10 }} + - name: "{{ $key }}" +{{ toYaml $value | indent 8 }} {{- end }} {{- end }} {{- if .Values.dashboardImport.dashboards }} diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml index b547edec37..615474370c 100644 --- a/stable/kibana/values.yaml +++ b/stable/kibana/values.yaml @@ -163,7 +163,7 @@ plugins: # Use to add/upgrade plugin values: # - elastalert-kibana-plugin,1.0.1,https://github.com/bitsensor/elastalert-kibana-plugin/releases/download/1.0.1/elastalert-kibana-plugin-1.0.1-6.4.2.zip - # - logtrail,0.1.30,https://github.com/sivasamyk/logtrail/releases/download/v0.1.30/logtrail-6.4.2-0.1.30.zip + # - logtrail,0.1.31,https://github.com/sivasamyk/logtrail/releases/download/v0.1.31/logtrail-6.6.0-0.1.31.zip # - other_plugin persistentVolumeClaim: