From 25b453e9901b83357a673fe7138fab938cbf97ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= Date: Mon, 3 Sep 2018 18:45:23 +0200 Subject: [PATCH] [incubator/elasticsearch] Fix "config is not a table" helm warning + fix wrong cluster.env default value in README (#7501) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [incubator/elasticsearch] Fix "config is not a table" helm error by adding {} value to cluster.config. Also change if .Values.something -> with .Values.something. Signed-off-by: Cédric de Saint Martin * [incubator/elasticsearch] Fix wrong cluster.env default value in README. Signed-off-by: Cédric de Saint Martin --- incubator/elasticsearch/Chart.yaml | 2 +- incubator/elasticsearch/README.md | 2 +- incubator/elasticsearch/templates/configmap.yaml | 6 +++--- incubator/elasticsearch/values.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/incubator/elasticsearch/Chart.yaml b/incubator/elasticsearch/Chart.yaml index 78dd5a301c..8702e16975 100755 --- a/incubator/elasticsearch/Chart.yaml +++ b/incubator/elasticsearch/Chart.yaml @@ -1,6 +1,6 @@ name: elasticsearch home: https://www.elastic.co/products/elasticsearch -version: 1.6.0 +version: 1.6.2 appVersion: 6.4.0 description: Flexible and powerful open source, distributed real-time search and analytics engine. diff --git a/incubator/elasticsearch/README.md b/incubator/elasticsearch/README.md index 3270365dd7..1a1161f88f 100644 --- a/incubator/elasticsearch/README.md +++ b/incubator/elasticsearch/README.md @@ -71,7 +71,7 @@ The following table lists the configurable parameters of the elasticsearch chart | `cluster.xpackEnable` | Writes the X-Pack configuration options to the configuration file | `false` | | `cluster.config` | Additional cluster config appended | `{}` | | `cluster.keystoreSecret` | Name of secret holding secure config options in an es keystore | `nil` | -| `cluster.env` | Cluster environment variables | `{}` | +| `cluster.env` | Cluster environment variables | `{MINIMUM_MASTER_NODES: "2"}` | | `client.name` | Client component name | `client` | | `client.replicas` | Client node replicas (deployment) | `2` | | `client.resources` | Client node resources requests & limits | `{} - cpu limit must be an integer` | diff --git a/incubator/elasticsearch/templates/configmap.yaml b/incubator/elasticsearch/templates/configmap.yaml index 6c9cc6d268..694ac43d26 100644 --- a/incubator/elasticsearch/templates/configmap.yaml +++ b/incubator/elasticsearch/templates/configmap.yaml @@ -73,8 +73,8 @@ data: gateway.recover_after_time: ${RECOVER_AFTER_TIME:5m} gateway.recover_after_master_nodes: ${RECOVER_AFTER_MASTER_NODES:2} gateway.recover_after_data_nodes: ${RECOVER_AFTER_DATA_NODES:1} -{{- if .Values.cluster.config }} -{{ toYaml .Values.cluster.config | indent 4 }} +{{- with .Values.cluster.config }} +{{ toYaml . | indent 4 }} {{- end }} {{- if hasPrefix "2." .Values.image.tag }} logging.yml: |- @@ -148,4 +148,4 @@ data: } }" fi - echo "Node ${NODE_NAME} is ready to be used" \ No newline at end of file + echo "Node ${NODE_NAME} is ready to be used" diff --git a/incubator/elasticsearch/values.yaml b/incubator/elasticsearch/values.yaml index 4e195d379a..cff1f7c5c6 100644 --- a/incubator/elasticsearch/values.yaml +++ b/incubator/elasticsearch/values.yaml @@ -20,7 +20,7 @@ cluster: # Some settings must be placed in a keystore, so they need to be mounted in from a secret. # Use this setting to specify the name of the secret # keystoreSecret: eskeystore - config: + config: {} env: # IMPORTANT: https://www.elastic.co/guide/en/elasticsearch/reference/current/important-settings.html#minimum_master_nodes # To prevent data loss, it is vital to configure the discovery.zen.minimum_master_nodes setting so that each master-eligible