From d23cbbe404e46cfdcade980e409d76439574ae5a Mon Sep 17 00:00:00 2001
From: "Javier J. Salmeron Garcia" <jsalmeron@vmware.com>
Date: Fri, 20 Sep 2019 11:39:52 +0200
Subject: [PATCH] Apply more changes

---
 bitnami/kibana/Chart.yaml                     |  1 +
 bitnami/kibana/templates/_helpers.tpl         | 28 ++-----------------
 .../templates/tests/test-connection.yaml      |  2 +-
 bitnami/kibana/values-production.yaml         |  2 +-
 bitnami/kibana/values.yaml                    |  2 +-
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/bitnami/kibana/Chart.yaml b/bitnami/kibana/Chart.yaml
index d8f94c529..c884e00ed 100644
--- a/bitnami/kibana/Chart.yaml
+++ b/bitnami/kibana/Chart.yaml
@@ -4,6 +4,7 @@ appVersion: 7.3.2
 description: Kibana is an open source, browser based analytics and search dashboard for Elasticsearch.
 version: 0.0.1
 keywords:
+- kibana
 - analitics
 - monitoring
 - metrics
diff --git a/bitnami/kibana/templates/_helpers.tpl b/bitnami/kibana/templates/_helpers.tpl
index ff80a0522..242f3486b 100644
--- a/bitnami/kibana/templates/_helpers.tpl
+++ b/bitnami/kibana/templates/_helpers.tpl
@@ -41,34 +41,12 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Return the proper Docker Image Registry Secret Names
 */}}
 {{- define "kibana.imagePullSecrets" -}}
-{{/*
-Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
-but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
-Also, we can not use a single if because lazy evaluation is not an option
-*/}}
-{{- if .Values.global }}
-{{- if .Values.global.imagePullSecrets }}
+{{- $imagePullSecrets := coalesce .Values.global.imagePullSecrets .Values.image.pullSecrets .Values.volumePermissions.image.pullSecrets -}}
+{{- if $imagePullSecrets }}
 imagePullSecrets:
-{{- range .Values.global.imagePullSecrets }}
+{{- range $imagePullSecrets }}
   - name: {{ . }}
-{{- end }}
-{{- else if or .Values.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
-imagePullSecrets:
-{{- range .Values.image.pullSecrets }}
-  - name: {{ . }}
-{{- end }}
-{{- range .Values.volumePermissions.image.pullSecrets }}
-  - name: {{ . }}
-{{- end }}
 {{- end -}}
-{{- else if or .Values.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
-imagePullSecrets:
-{{- range .Values.image.pullSecrets }}
-  - name: {{ . }}
-{{- end }}
-{{- range .Values.volumePermissions.image.pullSecrets }}
-  - name: {{ . }}
-{{- end }}
 {{- end -}}
 {{- end -}}
 
diff --git a/bitnami/kibana/templates/tests/test-connection.yaml b/bitnami/kibana/templates/tests/test-connection.yaml
index 2901c945c..b9e125f02 100644
--- a/bitnami/kibana/templates/tests/test-connection.yaml
+++ b/bitnami/kibana/templates/tests/test-connection.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   containers:
     - name: wget
-      image: busybox
+      image: bitnami/minideb
       command: ['wget']
       args:  ['{{ include "kibana.fullname" . }}:{{ .Values.service.port }}']
   restartPolicy: Never
diff --git a/bitnami/kibana/values-production.yaml b/bitnami/kibana/values-production.yaml
index bbcc82791..f075cb73a 100644
--- a/bitnami/kibana/values-production.yaml
+++ b/bitnami/kibana/values-production.yaml
@@ -2,7 +2,7 @@
 ## Please, note that this will override the image parameters, including dependencies, configured to use the global value
 ## Current available global Docker image parameters: imageRegistry, imagePullSecrets and storageClass
 ##
-# global:
+global: {}
 #   imageRegistry: myRegistryName
 #   imagePullSecrets:
 #     - myRegistryKeySecretName
diff --git a/bitnami/kibana/values.yaml b/bitnami/kibana/values.yaml
index 1fe9efe8d..83bc6327b 100644
--- a/bitnami/kibana/values.yaml
+++ b/bitnami/kibana/values.yaml
@@ -2,7 +2,7 @@
 ## Please, note that this will override the image parameters, including dependencies, configured to use the global value
 ## Current available global Docker image parameters: imageRegistry, imagePullSecrets and storageClass
 ##
-# global:
+global: {}
 #   imageRegistry: myRegistryName
 #   imagePullSecrets:
 #     - myRegistryKeySecretName