Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/elasticsearch/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.0.2
version: 1.1.0-alpha.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
10 changes: 8 additions & 2 deletions addons/elasticsearch/configs/elasticsearch-6.yml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,14 @@ node:
{{- $myRoles := $roles | splitList "," }}
{{- if semverCompare "<7.9" $esVersion }}
{{- range $i, $e := $myRoles }}
{{- if ne $e "transform" }}
{{ $e }}: true
{{- if eq $e "master" }}
master: true
data: false
{{- else if eq $e "data" }}
master: false
data: true
{{- else }}
{{ $e }}: true
{{- end }}
{{- end }}
{{- else }}
Expand Down
10 changes: 9 additions & 1 deletion addons/elasticsearch/configs/elasticsearch-7.yml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,15 @@ node:
{{- $myRoles := $roles | splitList "," }}
{{- if semverCompare "<7.9" $esVersion }}
{{- range $i, $e := $myRoles }}
{{ $e }}: true
{{- if eq $e "master" }}
master: true
data: false
{{- else if eq $e "data" }}
master: false
data: true
{{- else }}
{{ $e }}: true
{{- end }}
{{- end }}
{{- else }}
roles:
Expand Down
2 changes: 1 addition & 1 deletion addons/elasticsearch/templates/cmpd-es-data-6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
clusterVarRef:
clusterName: Required
- name: ELASTICSEARCH_ROLES
value: data
value: data,ingest
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
- name: ALL_CMP_REPLICA_LIST
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion addons/elasticsearch/templates/cmpd-es-data-7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
clusterVarRef:
clusterName: Required
- name: ELASTICSEARCH_ROLES
value: data
value: data,ingest
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
- name: ALL_CMP_REPLICA_LIST
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion addons/elasticsearch/templates/cmpd-es-data-8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
clusterVarRef:
clusterName: Required
- name: ELASTICSEARCH_ROLES
value: data
value: data,ingest
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
- name: ALL_CMP_REPLICA_LIST
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion addons/elasticsearch/templates/cmpd-es-master-6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ spec:
clusterVarRef:
clusterName: Required
- name: ELASTICSEARCH_ROLES
value: master
value: master,ingest
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
- name: ALL_CMP_REPLICA_LIST
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion addons/elasticsearch/templates/cmpd-es-master-7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
clusterVarRef:
clusterName: Required
- name: ELASTICSEARCH_ROLES
value: master
value: master,ingest
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
- name: ALL_CMP_REPLICA_LIST
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion addons/elasticsearch/templates/cmpd-es-master-8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
clusterVarRef:
clusterName: Required
- name: ELASTICSEARCH_ROLES
value: master
value: master,ingest
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
- name: ALL_CMP_REPLICA_LIST
valueFrom:
Expand Down