[stable/kibana] Fix initContainers indentation (helm#11324)

* [stable/kibana] Fix indentation for initContainers Signed-off-by: Pavel Dmytrenko <[email protected]> * [stable/kibana] Add test case Signed-off-by: Pavel Dmytrenko <[email protected]> * [stable/kibana] Bump version Signed-off-by: Pavel Dmytrenko <[email protected]> * [stable/kibana] Simplify dashboardImport testcase Signed-off-by: Pavel Dmytrenko <[email protected]> * [stable/kibana] Add testcase for all init container types Signed-off-by: Pavel Dmytrenko <[email protected]> * [stable/kibana] Update logtrail plugin to v6.6.0 compatible Signed-off-by: Pavel Dmytrenko <[email protected]>
agolo · Feb 18, 2019 · 482af9c · 482af9c
1 parent 155659d
commit 482af9c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git 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
@@ -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 <plugin_name,version,url> 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
@@ -5,5 +5,5 @@ plugins:
   reset: false
   # Use <plugin_name,version,url> 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
@@ -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
@@ -163,7 +163,7 @@ plugins:
   # Use <plugin_name,version,url> 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: