From b9b55874fbf5fa3e89c8837b105512087d6f12ec Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Tue, 3 Dec 2019 15:24:57 +0000 Subject: [PATCH 1/7] First changes --- bitnami/elasticsearch/Chart.yaml | 2 +- bitnami/elasticsearch/README.md | 7 +++++++ bitnami/elasticsearch/requirements.yaml | 5 +++++ bitnami/elasticsearch/values-production.yaml | 5 +++++ bitnami/elasticsearch/values.yaml | 5 +++++ 5 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 bitnami/elasticsearch/requirements.yaml diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml index 63d77b584..5506065ad 100644 --- a/bitnami/elasticsearch/Chart.yaml +++ b/bitnami/elasticsearch/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: elasticsearch -version: 9.0.4 +version: 9.1.0 appVersion: 7.5.0 description: A highly scalable open-source full-text search and analytics engine keywords: diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md index fbb64055b..f350384d9 100644 --- a/bitnami/elasticsearch/README.md +++ b/bitnami/elasticsearch/README.md @@ -244,6 +244,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `volumePermissions.image.tag` | Init container volume-permissions image tag | `stretch` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `Always` | | `volumePermissions.resources` | Init container resource requests/limit | `nil` | +| `kibana.enabled` | Use bundled Kibana | `false` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, @@ -433,6 +434,12 @@ This chart includes a `values-production.yaml` file where you can find some para + metrics.enabled: true ``` +- Enable bundled Kibana: +```diff +- kibana.enabled: false ++ kibana.enabled: true +``` + ### Default kernel settings Currently, Elasticsearch requires some changes in the kernel of the host machine to work as expected. If those values are not set in the underlying operating system, the ES containers fail to boot with ERROR messages. More information about these requirements can be found in the links below: diff --git a/bitnami/elasticsearch/requirements.yaml b/bitnami/elasticsearch/requirements.yaml new file mode 100644 index 000000000..541e8ea9d --- /dev/null +++ b/bitnami/elasticsearch/requirements.yaml @@ -0,0 +1,5 @@ +dependencies: +- name: kibana + version: 4.x.x + repository: https://charts.bitnami.com/bitnami + condition: kibana.enabled diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml index f1ea455f0..06d8183fd 100644 --- a/bitnami/elasticsearch/values-production.yaml +++ b/bitnami/elasticsearch/values-production.yaml @@ -730,3 +730,8 @@ metrics: ## # selector: # prometheus: my-prometheus + +## Enable bundled Kibana +## +kibana: + enabled: false diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml index dc4f9415f..f6612e41a 100644 --- a/bitnami/elasticsearch/values.yaml +++ b/bitnami/elasticsearch/values.yaml @@ -730,3 +730,8 @@ metrics: ## # selector: # prometheus: my-prometheus + +## Enable bundled Kibana +## +kibana: + enabled: false From 830bd6952156b582fac23438c564309158275915 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Wed, 4 Dec 2019 14:23:47 +0000 Subject: [PATCH 2/7] Initial attempt --- bitnami/elasticsearch/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml index f6612e41a..1521e8503 100644 --- a/bitnami/elasticsearch/values.yaml +++ b/bitnami/elasticsearch/values.yaml @@ -735,3 +735,7 @@ metrics: ## kibana: enabled: false + elasticsearch: + hosts: + - {{ include "influxdb.fullname" . }} + port: 9200 From 2cfe825c8cd2e554bd132dc9479f69734fea0c3f Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Wed, 11 Dec 2019 09:44:20 +0000 Subject: [PATCH 3/7] [bitnami/elasticsearch] Add Kibana as dependency --- bitnami/elasticsearch/Chart.yaml | 2 +- bitnami/elasticsearch/README.md | 19 +++++++++++++++++-- bitnami/elasticsearch/requirements.yaml | 2 +- bitnami/elasticsearch/templates/_helpers.tpl | 2 +- bitnami/elasticsearch/values-production.yaml | 14 ++++++++++++-- bitnami/elasticsearch/values.yaml | 12 +++++++++--- 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml index 5506065ad..800a87a25 100644 --- a/bitnami/elasticsearch/Chart.yaml +++ b/bitnami/elasticsearch/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: elasticsearch -version: 9.1.0 +version: 10.0.0 appVersion: 7.5.0 description: A highly scalable open-source full-text search and analytics engine keywords: diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md index f350384d9..9e5af4c0b 100644 --- a/bitnami/elasticsearch/README.md +++ b/bitnami/elasticsearch/README.md @@ -57,6 +57,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `global.imageRegistry` | Global Docker image registry | `nil` | | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | | `global.storageClass` | Global storage class for dynamic provisioning | `nil` | +| `global.coordinating.name` | Coordinating-only node pod name at global level to be used also in the Kibana subchart | `coordinating-only` | | `image.registry` | Elasticsearch image registry | `docker.io` | | `image.repository` | Elasticsearch image repository | `bitnami/elasticsearch` | | `image.tag` | Elasticsearch image tag | `{TAG_NAME}` | @@ -103,7 +104,6 @@ The following table lists the configurable parameters of the Elasticsearch chart | `master.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded | `5` | | `clusterDomain` | Kubernetes cluster domain | `cluster.local` | | `discovery.name` | Discover node pod name | `discovery` | -| `coordinating.name` | Coordinating-only node pod name | `coordinating-only` | | `coordinating.replicas` | Desired number of Elasticsearch coordinating-only nodes | `2` | | `coordinating.heapSize` | Coordinating-only node heap size | `128m` | | `coordinating.antiAffinity` | Coordinating-only node pod anti-affinity policy | `soft` | @@ -244,7 +244,13 @@ The following table lists the configurable parameters of the Elasticsearch chart | `volumePermissions.image.tag` | Init container volume-permissions image tag | `stretch` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `Always` | | `volumePermissions.resources` | Init container resource requests/limit | `nil` | -| `kibana.enabled` | Use bundled Kibana | `false` | + +### Kibana Parameters + +| `kibana.enabled` | 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 UR | `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, @@ -450,6 +456,11 @@ Currently, Elasticsearch requires some changes in the kernel of the host machine This chart uses a **privileged** initContainer to change those settings in the Kernel by running: `sysctl -w vm.max_map_count=262144 && sysctl -w fs.file-max=65536`. You can disable the initContainer using the `sysctlImage.enabled=false` parameter. +### Enable bundled Kibana + +This Elasticsearch chart contains Kibana as subchart, you can enable it just setting the `kibana.enabled=true` parameter. +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. + ## Persistence The [Bitnami Elasticsearch](https://github.com/bitnami/bitnami-docker-elasticsearch) image stores the Elasticsearch data at the `/bitnami/elasticsearch/data` path of the container. @@ -467,6 +478,10 @@ You can enable this initContainer by setting `volumePermissions.enabled` to `tru ## Notable changes +### 10.0.0 + +In this version, Kibana was added as dependant chart. More info about how to enable and work with this bundled Kibana in the ["Enable bundled Kibana"](#enable-bundled-kibana) section. + ### 9.0.0 Elasticsearch master nodes store the cluster status at `/bitnami/elasticsearch/data`. Among other things this includes the UUID of the elasticsearch cluster. Without a persistent data store for this data, the UUID of a cluster could change if k8s node(s) hosting the es master nodes go down and are scheduled on some other master node. In the event that this happens, the data nodes will no longer be able to join a cluster as the uuid changed resulting in a broken cluster. diff --git a/bitnami/elasticsearch/requirements.yaml b/bitnami/elasticsearch/requirements.yaml index 541e8ea9d..61fcb3d1b 100644 --- a/bitnami/elasticsearch/requirements.yaml +++ b/bitnami/elasticsearch/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: kibana - version: 4.x.x + version: 5.x.x repository: https://charts.bitnami.com/bitnami condition: kibana.enabled diff --git a/bitnami/elasticsearch/templates/_helpers.tpl b/bitnami/elasticsearch/templates/_helpers.tpl index f8ef301cc..6be58dd18 100644 --- a/bitnami/elasticsearch/templates/_helpers.tpl +++ b/bitnami/elasticsearch/templates/_helpers.tpl @@ -127,7 +127,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this */}} {{- define "elasticsearch.coordinating.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s-%s" .Release.Name $name .Values.coordinating.name | trunc 63 | trimSuffix "-" -}} +{{- printf "%s-%s-%s" .Release.Name $name .Values.global.coordinating.name | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml index 06d8183fd..3379aeebe 100644 --- a/bitnami/elasticsearch/values-production.yaml +++ b/bitnami/elasticsearch/values-production.yaml @@ -2,11 +2,15 @@ ## Please, note that this will override the image parameters, including dependencies, configured to use the global value ## Current available global Docker image parameters: imageRegistry and imagePullSecrets ## -# global: +global: # imageRegistry: myRegistryName # imagePullSecrets: # - myRegistryKeySecretName # storageClass: myStorageClass + ## Coordinating name to be used in the Kibana subchart (service name) + ## + coordinating: + name: coordinating-only ## Bitnami Elasticsearch image version ## ref: https://hub.docker.com/r/bitnami/elasticsearch/tags/ @@ -238,7 +242,6 @@ master: ## Elasticsearch coordinating-only node parameters ## coordinating: - name: coordinating-only ## Number of coordinating-only node(s) replicas to deploy ## replicas: 2 @@ -735,3 +738,10 @@ metrics: ## kibana: enabled: false + elasticsearch: + hosts: + - '{{ include "elasticsearch.coordinating.fullname" . }}' + port: 9200 + ## String to partially override elasticsearch.fullname template in the kibana subchart + ## + nameOverride: elasticsearch diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml index 1521e8503..b81185faf 100644 --- a/bitnami/elasticsearch/values.yaml +++ b/bitnami/elasticsearch/values.yaml @@ -2,11 +2,15 @@ ## Please, note that this will override the image parameters, including dependencies, configured to use the global value ## Current available global Docker image parameters: imageRegistry and imagePullSecrets ## -# global: +global: # imageRegistry: myRegistryName # imagePullSecrets: # - myRegistryKeySecretName # storageClass: myStorageClass + ## Coordinating name to be used in the Kibana subchart (service name) + ## + coordinating: + name: coordinating-only ## Bitnami Elasticsearch image version ## ref: https://hub.docker.com/r/bitnami/elasticsearch/tags/ @@ -238,7 +242,6 @@ master: ## Elasticsearch coordinating-only node parameters ## coordinating: - name: coordinating-only ## Number of coordinating-only node(s) replicas to deploy ## replicas: 2 @@ -737,5 +740,8 @@ kibana: enabled: false elasticsearch: hosts: - - {{ include "influxdb.fullname" . }} + - '{{ include "elasticsearch.coordinating.fullname" . }}' port: 9200 + ## String to partially override elasticsearch.fullname template in the kibana subchart + ## + nameOverride: elasticsearch From 5080ee90a3ab440af197c6de633d8fb4556a931c Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Wed, 11 Dec 2019 10:00:08 +0000 Subject: [PATCH 4/7] Enabled by default for production --- bitnami/elasticsearch/README.md | 2 +- bitnami/elasticsearch/values-production.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md index 9e5af4c0b..6487bb9bf 100644 --- a/bitnami/elasticsearch/README.md +++ b/bitnami/elasticsearch/README.md @@ -458,7 +458,7 @@ 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. +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. ## Persistence diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml index 3379aeebe..8bb793998 100644 --- a/bitnami/elasticsearch/values-production.yaml +++ b/bitnami/elasticsearch/values-production.yaml @@ -737,7 +737,7 @@ metrics: ## Enable bundled Kibana ## kibana: - enabled: false + enabled: true elasticsearch: hosts: - '{{ include "elasticsearch.coordinating.fullname" . }}' From 820f9842681d846aa9c9519061c92cf8463fddff Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Wed, 11 Dec 2019 10:01:29 +0000 Subject: [PATCH 5/7] Fix typo --- bitnami/elasticsearch/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md index 6487bb9bf..d4aa4bb35 100644 --- a/bitnami/elasticsearch/README.md +++ b/bitnami/elasticsearch/README.md @@ -249,7 +249,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `kibana.enabled` | 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 UR | `9200` | +| `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, From ded96535edfe52ff86dfdf08b83b9bd97a88d57f Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Wed, 11 Dec 2019 10:21:46 +0000 Subject: [PATCH 6/7] Fix indentation --- bitnami/elasticsearch/requirements.yaml | 8 ++++---- bitnami/elasticsearch/values-production.yaml | 10 +++++----- bitnami/elasticsearch/values.yaml | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bitnami/elasticsearch/requirements.yaml b/bitnami/elasticsearch/requirements.yaml index 61fcb3d1b..08fffed29 100644 --- a/bitnami/elasticsearch/requirements.yaml +++ b/bitnami/elasticsearch/requirements.yaml @@ -1,5 +1,5 @@ dependencies: -- name: kibana - version: 5.x.x - repository: https://charts.bitnami.com/bitnami - condition: kibana.enabled + - name: kibana + version: 5.x.x + repository: https://charts.bitnami.com/bitnami + condition: kibana.enabled diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml index 8bb793998..a15e106c9 100644 --- a/bitnami/elasticsearch/values-production.yaml +++ b/bitnami/elasticsearch/values-production.yaml @@ -3,10 +3,10 @@ ## Current available global Docker image parameters: imageRegistry and imagePullSecrets ## global: -# imageRegistry: myRegistryName -# imagePullSecrets: -# - myRegistryKeySecretName -# storageClass: myStorageClass + # imageRegistry: myRegistryName + # imagePullSecrets: + # - myRegistryKeySecretName + # storageClass: myStorageClass ## Coordinating name to be used in the Kibana subchart (service name) ## coordinating: @@ -740,7 +740,7 @@ kibana: enabled: true elasticsearch: hosts: - - '{{ include "elasticsearch.coordinating.fullname" . }}' + - '{{ include "elasticsearch.coordinating.fullname" . }}' port: 9200 ## String to partially override elasticsearch.fullname template in the kibana subchart ## diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml index b81185faf..6b227c22b 100644 --- a/bitnami/elasticsearch/values.yaml +++ b/bitnami/elasticsearch/values.yaml @@ -3,10 +3,10 @@ ## Current available global Docker image parameters: imageRegistry and imagePullSecrets ## global: -# imageRegistry: myRegistryName -# imagePullSecrets: -# - myRegistryKeySecretName -# storageClass: myStorageClass + # imageRegistry: myRegistryName + # imagePullSecrets: + # - myRegistryKeySecretName + # storageClass: myStorageClass ## Coordinating name to be used in the Kibana subchart (service name) ## coordinating: @@ -740,7 +740,7 @@ kibana: enabled: false elasticsearch: hosts: - - '{{ include "elasticsearch.coordinating.fullname" . }}' + - '{{ include "elasticsearch.coordinating.fullname" . }}' port: 9200 ## String to partially override elasticsearch.fullname template in the kibana subchart ## From 2ecf65c6df74bdc5494823a0718297486e848589 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Thu, 12 Dec 2019 18:43:01 +0000 Subject: [PATCH 7/7] Add requirements.lock --- bitnami/elasticsearch/requirements.lock | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 bitnami/elasticsearch/requirements.lock diff --git a/bitnami/elasticsearch/requirements.lock b/bitnami/elasticsearch/requirements.lock new file mode 100644 index 000000000..80f18828c --- /dev/null +++ b/bitnami/elasticsearch/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: kibana + repository: https://charts.bitnami.com/bitnami + version: 5.0.0 +digest: sha256:25180f145e2b144df74901fa1825cedd396faa2d5d1881a45b28d61a9e000bde +generated: "2019-12-12T18:42:40.963383539Z"