github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-09-05 12:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[incubator/elasticsearch] Fix "config is not a table" helm warning + fix wrong cluster.env default value in README (#7501)

Browse Source 
* [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 <cdesaintmartin@wiremind.fr>

* [incubator/elasticsearch] Fix wrong cluster.env default value in README.

Signed-off-by: Cédric de Saint Martin <cdesaintmartin@wiremind.fr>
This commit is contained in:
Cédric de Saint Martin
2018-09-03 09:45:23 -07:00
committed by k8s-ci-robot
parent 1f3139d07b
commit 25b453e990
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
incubator/elasticsearch/Chart.yaml
+1 -1
View File
@@ -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.
incubator/elasticsearch/README.md
+1 -1
View File
@@ -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` |
incubator/elasticsearch/templates/configmap.yaml
+3 -3
View File
@@ -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"
echo "Node ${NODE_NAME} is ready to be used"
incubator/elasticsearch/values.yaml
+1 -1
View File
@@ -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