From 2c5ab7c26d900aa31d0fb538b60eb0aa2148ded2 Mon Sep 17 00:00:00 2001
From: Rico Pahlisch <pahli88@googlemail.com>
Date: Fri, 30 Mar 2018 00:23:03 +0200
Subject: [PATCH] add pull secret option and enable adding additional
 commandline args (#4508)

---
 stable/kibana/Chart.yaml                |  2 +-
 stable/kibana/README.md                 |  2 ++
 stable/kibana/templates/deployment.yaml | 10 ++++++++++
 stable/kibana/values.yaml               |  3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml
index 9c193e496d..53707200e6 100644
--- a/stable/kibana/Chart.yaml
+++ b/stable/kibana/Chart.yaml
@@ -1,5 +1,5 @@
 name: kibana
-version: 0.3.0
+version: 0.4.0
 appVersion: 6.0.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 54f06c4ed2..fdeb92ba93 100644
--- a/stable/kibana/README.md
+++ b/stable/kibana/README.md
@@ -43,6 +43,8 @@ Parameter | Description | Default
 `image.pullPolicy` | Image pull policy | `IfNotPresent`
 `image.repository` | Image repository | `kibana`
 `image.tag` | Image tag | `6.0.0`
+`image.pullSecrets` |Specify image pull secrets | `nil`
+`commandline.args` | add additional commandline args | `nil`
 `ingress.enabled` | Enables Ingress | `false`
 `ingress.annotations` | Ingress annotations | None:
 `ingress.hosts` | Ingress accepted hostnames | None:
diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml
index 1abce468e3..36634e1ad1 100644
--- a/stable/kibana/templates/deployment.yaml
+++ b/stable/kibana/templates/deployment.yaml
@@ -23,6 +23,12 @@ spec:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.commandline.args }}
+        args:
+          - "/bin/bash"
+          - "/usr/local/bin/kibana-docker"
+{{ toYaml .Values.commandline.args | indent 10 }}
+        {{- end }}
         env:
         {{- range $key, $value := .Values.env }}
         - name: "{{ $key }}"
@@ -42,6 +48,10 @@ spec:
         #     port: {{ .Values.service.internalPort }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
+    {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.image.pullSecrets | indent 8 }}
+    {{- end }}
     {{- if .Values.affinity }}
       affinity:
 {{ toYaml .Values.affinity | indent 8 }}
diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml
index 368ae1012f..d86210634e 100644
--- a/stable/kibana/values.yaml
+++ b/stable/kibana/values.yaml
@@ -3,6 +3,9 @@ image:
   tag: "6.0.0"
   pullPolicy: "IfNotPresent"
 
+commandline:
+  args:
+
 env:
   # All Kibana configuration options are adjustable via env vars.
   # To adjust a config option to an env var uppercase + replace `.` with `_`