fix: set role config of es (#2450)

(cherry picked from commit e381e3d)

Author: kizuna-lek

addons/elasticsearch/Chart.yaml

@@ -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

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

@@ -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 }}

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

@@ -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:

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

@@ -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:

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

@@ -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:

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

@@ -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:

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

@@ -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:

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

@@ -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:

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

@@ -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: