Skip to content

Commit f34eef8

Browse files
committed
fix: set role config of es
1 parent 595f000 commit f34eef8

File tree

8 files changed

+22
-9
lines changed

8 files changed

+22
-9
lines changed

addons/elasticsearch/configs/elasticsearch-6.yml.tpl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,14 @@ node:
8787
{{- $myRoles := $roles | splitList "," }}
8888
{{- if semverCompare "<7.9" $esVersion }}
8989
{{- range $i, $e := $myRoles }}
90-
{{- if ne $e "transform" }}
91-
{{ $e }}: true
90+
{{- if eq $e "master" }}
91+
master: true
92+
data: false
93+
{{- else if eq $e "data" }}
94+
master: false
95+
data: true
96+
{{- else }}
97+
{{ $e }}: true
9298
{{- end }}
9399
{{- end }}
94100
{{- else }}

addons/elasticsearch/configs/elasticsearch-7.yml.tpl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,14 @@ node:
9090
{{- $myRoles := $roles | splitList "," }}
9191
{{- if semverCompare "<7.9" $esVersion }}
9292
{{- range $i, $e := $myRoles }}
93-
{{ $e }}: true
93+
{{- if eq $e "master" }}
94+
master: true
95+
data: false
96+
{{- else if eq $e "data" }}
97+
master: false
98+
data: true
99+
{{- else }}
100+
{{ $e }}: true
94101
{{- end }}
95102
{{- else }}
96103
roles:

addons/elasticsearch/templates/cmpd-es-data-6.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
clusterVarRef:
7070
clusterName: Required
7171
- name: ELASTICSEARCH_ROLES
72-
value: data
72+
value: data,ingest
7373
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
7474
- name: ALL_CMP_REPLICA_LIST
7575
valueFrom:

addons/elasticsearch/templates/cmpd-es-data-7.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
clusterVarRef:
6868
clusterName: Required
6969
- name: ELASTICSEARCH_ROLES
70-
value: data
70+
value: data,ingest
7171
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
7272
- name: ALL_CMP_REPLICA_LIST
7373
valueFrom:

addons/elasticsearch/templates/cmpd-es-data-8.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
clusterVarRef:
6868
clusterName: Required
6969
- name: ELASTICSEARCH_ROLES
70-
value: data
70+
value: data,ingest
7171
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
7272
- name: ALL_CMP_REPLICA_LIST
7373
valueFrom:

addons/elasticsearch/templates/cmpd-es-master-6.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
clusterVarRef:
6767
clusterName: Required
6868
- name: ELASTICSEARCH_ROLES
69-
value: master
69+
value: master,ingest
7070
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
7171
- name: ALL_CMP_REPLICA_LIST
7272
valueFrom:

addons/elasticsearch/templates/cmpd-es-master-7.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
clusterVarRef:
6565
clusterName: Required
6666
- name: ELASTICSEARCH_ROLES
67-
value: master
67+
value: master,ingest
6868
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
6969
- name: ALL_CMP_REPLICA_LIST
7070
valueFrom:

addons/elasticsearch/templates/cmpd-es-master-8.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
clusterVarRef:
6565
clusterName: Required
6666
- name: ELASTICSEARCH_ROLES
67-
value: master
67+
value: master,ingest
6868
{{/* ALL_CMP_REPLICA_LIST ='master:podName0,podName1,podName2;data:podName0,podName1'*/}}
6969
- name: ALL_CMP_REPLICA_LIST
7070
valueFrom:

0 commit comments

Comments
 (0)