chore: tidy up

Author: iziang

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

@@ -22,11 +22,21 @@ cluster:
 discovery:
 {{- if eq $mode "multi-node" }}
   zen:
-    minimum_master_nodes: 1
+    {{- $masterCount := 0 }}
+    {{- $parts := splitList ";" .ALL_CMP_REPLICA_FQDN }}
+    {{- range $part := $parts }}
+      {{- if hasPrefix "master:" $part }}
+        {{- $masterPart := trimPrefix "master:" $part }}
+        {{- $masters := splitList "," $masterPart }}
+        {{- $masterCount = len $masters }}
+      {{- end }}
+    {{- end }}
+    # Calculate minimum_master_nodes as quorum: (master_count / 2) + 1
+    # This ensures cluster stability and prevents data loss
+    minimum_master_nodes: {{ add (div $masterCount 2) 1 }}
     ping:
       unicast:
         hosts:
-  {{- $parts := splitList ";" .ALL_CMP_REPLICA_FQDN }}
   {{- range $part := $parts }}
     {{- if hasPrefix "master:" $part }}
       {{- $masterPart := trimPrefix "master:" $part }}
@@ -66,7 +76,9 @@ node:
   {{- $myRoles := $roles | splitList "," }}
   {{- if semverCompare "<7.9" $esVersion }}
   {{- range $i, $e := $myRoles }}
+    {{- if ne $e "transform" }}
   {{ $e }}: true
+    {{- end }}
   {{- end }}
   {{- else }}
   roles:

addons/elasticsearch/scripts/member-leave.sh

@@ -26,17 +26,33 @@ if [ $? != 0 ]; then
   exit 1
 fi
 version=${version%.*}
-if awk "BEGIN {exit !($version < 7.8)}"; then
-  url=${endpoint}/_cluster/voting_config_exclusions/$KB_LEAVE_MEMBER_POD_NAME
+# Check if voting_config_exclusions API is supported (available from ES 7.0+)
+if awk "BEGIN {exit !($version >= 7.0)}"; then
+  if awk "BEGIN {exit !($version < 7.8)}"; then
+    url=${endpoint}/_cluster/voting_config_exclusions/$KB_LEAVE_MEMBER_POD_NAME
+  else
+    url=${endpoint}/_cluster/voting_config_exclusions?node_names=$KB_LEAVE_MEMBER_POD_NAME
+  fi
+  curl ${common_options} -v -X POST $url
+  if [ $? != 0 ]; then
+    echo "failed to add node $KB_LEAVE_MEMBER_POD_NAME to voting config exclusion list"
+    echo "may be the voting config exclusion list is full, try to remove it first"
+    curl ${common_options} -X DELETE "${endpoint}/_cluster/voting_config_exclusions?pretty&wait_for_removal=false"
+    exit 1
+  else
+    echo "successfully added node $KB_LEAVE_MEMBER_POD_NAME to voting config exclusion list"
+  fi
 else
-  url=${endpoint}/_cluster/voting_config_exclusions?node_names=$KB_LEAVE_MEMBER_POD_NAME
-fi
-curl ${common_options} -v -X POST $url
-if [ $? != 0 ]; then
-  echo "failed to add node $KB_LEAVE_MEMBER_POD_NAME to voting config exclusion list"
-  echo "may be the voting config exclusion list is full, try to remove it first"
-  curl ${common_options} -X DELETE "${endpoint}/_cluster/voting_config_exclusions?pretty&wait_for_removal=false"
-  exit 1
-else
-  echo "successfully added node $KB_LEAVE_MEMBER_POD_NAME to voting config exclusion list"
+  echo "ES version $version does not support voting_config_exclusions API, skipping node exclusion"
+
+  # For ES 6.x, check if this is a master node and warn about minimum_master_nodes
+  if [[ "$KB_LEAVE_MEMBER_POD_NAME" == *-master-* ]]; then
+    echo "WARNING: Removing master node $KB_LEAVE_MEMBER_POD_NAME from ES $version cluster"
+    echo "Please ensure the remaining master nodes count >= minimum_master_nodes setting"
+    echo "Check cluster health after removal to avoid split-brain scenarios"
+  else
+    echo "Removing data node $KB_LEAVE_MEMBER_POD_NAME, data will be automatically migrated"
+  fi
+
+  echo "Node $KB_LEAVE_MEMBER_POD_NAME will be removed from cluster naturally"
 fi

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

@@ -19,6 +19,8 @@ spec:
           password: Required
     - name: ELASTIC_PASSWORD
       value: $(ELASTIC_USER_PASSWORD)
+    - name: ES_JAVA_OPTS
+      value: "-Des.http.cname_in_publish_address=true"
     - name: KIBANA_SYSTEM_USER_PASSWORD
       valueFrom:
         credentialVarRef:

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

@@ -25,6 +25,8 @@ spec:
           password: Required
     - name: ELASTIC_PASSWORD
       value: $(ELASTIC_USER_PASSWORD)
+    - name: ES_JAVA_OPTS
+      value: "-Des.http.cname_in_publish_address=true"
     - name: KIBANA_SYSTEM_USER_PASSWORD
       valueFrom:
         credentialVarRef:

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

@@ -25,6 +25,8 @@ spec:
           password: Required
     - name: ELASTIC_PASSWORD
       value: $(ELASTIC_USER_PASSWORD)
+    - name: ES_JAVA_OPTS
+      value: "-Des.http.cname_in_publish_address=true"
     - name: KIBANA_SYSTEM_USER_PASSWORD
       valueFrom:
         credentialVarRef: