Merge pull request #1736 from bitnami/fixName

[bitnami/elasticsearch] Fix nameOverride issue

bitnami/elasticsearch/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: elasticsearch
-version: 10.0.0
+version: 10.1.0
 appVersion: 7.5.0
 description: A highly scalable open-source full-text search and analytics engine
 keywords:

bitnami/elasticsearch/README.md

@@ -247,10 +247,9 @@ The following table lists the configurable parameters of the Elasticsearch chart
 
 ### Kibana Parameters
 
-| `kibana.enabled`               | Use bundled Kibana                                                                  | `false`                                                                                 |
+| `global.kibanaEnabled`         | Use bundled Kibana                                                                  | `false`                                                                                 |
 | `kibana.elasticsearch.hosts`   | Array containing hostnames for the ES instances. Used to generate the URL           | `{{ include "elasticsearch.coordinating.fullname" . }}` Coordinating service (fullname) |
 | `kibana.elasticsearch.port`    | Port to connect Kibana and ES instance. Used to generate the URL                    | `9200`                                                                                  |
-| `kibana.nameOverride`          | String to partially override elasticsearch.fullname template in the kibana subchart | `elasticsearch`                                                                         |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
@@ -442,8 +441,8 @@ This chart includes a `values-production.yaml` file where you can find some para
 
 - Enable bundled Kibana:
 ```diff
-- kibana.enabled: false
-+ kibana.enabled: true
+- global.kibanaEnabled: false
++ global.kibanaEnabled: true
 ```
 
 ### Default kernel settings
@@ -458,8 +457,8 @@ You can disable the initContainer using the `sysctlImage.enabled=false` paramete
 
 ### Enable bundled Kibana
 
-This Elasticsearch chart contains Kibana as subchart, you can enable it just setting the `kibana.enabled=true` parameter. It is enabled by default using the `values-production.yaml` file.
-If you want to modify the `nameOverride` parameter in the Elasticsearch chart, you also need to set the same value for the `kibana.nameOverride` in order to use the same value in both charts.
+This Elasticsearch chart contains Kibana as subchart, you can enable it just setting the `global.kibanaEnabled=true` parameter. It is enabled by default using the `values-production.yaml` file.
+To see the notes with some operational instructions from the Kibana chart, please use the `--render-subchart-notes` as part of your `helm install` command, in this way you can see the Kibana and ES notes in your terminal.
 
 ## Persistence
 

bitnami/elasticsearch/requirements.lock

@@ -2,5 +2,5 @@ dependencies:
 - name: kibana
   repository: https://charts.bitnami.com/bitnami
   version: 5.0.0
-digest: sha256:25180f145e2b144df74901fa1825cedd396faa2d5d1881a45b28d61a9e000bde
-generated: "2019-12-12T18:42:40.963383539Z"
+digest: sha256:4970b5ac3743b773c6608e77e28eb0928d45c3379bbe6660a35d8d4ef07613df
+generated: "2019-12-13T12:46:10.381126027Z"

bitnami/elasticsearch/requirements.yaml

@@ -2,4 +2,4 @@ dependencies:
   - name: kibana
     version: 5.x.x
     repository: https://charts.bitnami.com/bitnami
-    condition: kibana.enabled
+    condition: global.kibanaEnabled

bitnami/elasticsearch/templates/_helpers.tpl

@@ -126,9 +126,13 @@ Create a default fully qualified coordinating name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "elasticsearch.coordinating.fullname" -}}
+{{- if .Values.global.kibanaEnabled -}}
+{{- printf "%s-%s" .Release.Name .Values.global.coordinating.name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s-%s" .Release.Name $name .Values.global.coordinating.name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
 
 {{/*
 Create a default fully qualified data name.

bitnami/elasticsearch/values-production.yaml

@@ -11,6 +11,7 @@ global:
   ##
   coordinating:
     name: coordinating-only
+  kibanaEnabled: true
 
 ## Bitnami Elasticsearch image version
 ## ref: https://hub.docker.com/r/bitnami/elasticsearch/tags/
@@ -734,14 +735,10 @@ metrics:
     # selector:
     #   prometheus: my-prometheus
 
-## Enable bundled Kibana
+## Bundled Kibana parameters
 ##
 kibana:
-  enabled: true
   elasticsearch:
     hosts:
       - '{{ include "elasticsearch.coordinating.fullname" . }}'
     port: 9200
-  ## String to partially override elasticsearch.fullname template in the kibana subchart
-  ##
-  nameOverride: elasticsearch

bitnami/elasticsearch/values.yaml

@@ -11,6 +11,7 @@ global:
   ##
   coordinating:
     name: coordinating-only
+  kibanaEnabled: false
 
 ## Bitnami Elasticsearch image version
 ## ref: https://hub.docker.com/r/bitnami/elasticsearch/tags/
@@ -734,14 +735,10 @@ metrics:
     # selector:
     #   prometheus: my-prometheus
 
-## Enable bundled Kibana
+## Bundled Kibana parameters
 ##
 kibana:
-  enabled: false
   elasticsearch:
     hosts:
       - '{{ include "elasticsearch.coordinating.fullname" . }}'
     port: 9200
-  ## String to partially override elasticsearch.fullname template in the kibana subchart
-  ##
-  nameOverride: elasticsearch