github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/elasticsearch] disable all xpack features in es5 when cluster.xpackEnable: false (#9490)

Browse Source 
* [stable/elasticsearch] disable all xpack features in es5 when cluster.xpackEnable: false

Signed-off-by: Cameron Attard <cameron.attard@siteminder.com>

* [stable/elasticsearch] omit xpack.ml configuration for appVersion < 5.4

Signed-off-by: Cameron Attard <cameron.attard@siteminder.com>

* [stable/elasticsearch] bump chart version

Signed-off-by: Cameron Attard <cameron.attard@siteminder.com>
This commit is contained in:
Cameron Attard
2019-01-24 05:57:21 -08:00
committed by Kubernetes Prow Robot
parent b2cce48668
commit 87d4f5cf6b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/elasticsearch/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
name: elasticsearch
home: https://www.elastic.co/products/elasticsearch
version: 1.17.0
version: 1.17.1
appVersion: 6.5.4
description: Flexible and powerful open source, distributed real-time search and analytics
engine.
stable/elasticsearch/templates/configmap.yaml
+9
View File
@@ -41,10 +41,19 @@ data:
{{- if .Values.cluster.xpackEnable }}
# see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
{{- if .Values.appVersion gt 5.4 or .Values.appVersion eq 5.4 }}
xpack.ml.enabled: ${XPACK_ML_ENABLED:false}
{{- end }}
xpack.monitoring.enabled: ${XPACK_MONITORING_ENABLED:false}
xpack.security.enabled: ${XPACK_SECURITY_ENABLED:false}
xpack.watcher.enabled: ${XPACK_WATCHER_ENABLED:false}
{{- else }}
{{- if .Values.appVersion gt 5.4 or .Values.appVersion eq 5.4 }}
xpack.ml.enabled: false
{{- end }}
xpack.monitoring.enabled: false
xpack.security.enabled: false
xpack.watcher.enabled: false
{{- end }}
{{- else if hasPrefix "6." .Values.appVersion }}
# see https://github.com/kubernetes/kubernetes/issues/3595