Elastic: 3 Masters config

Add a new parameter "combinedDataAndMaster" to the elasticsearch
chart that when set true will cause elasticsearch data nodes to
be configured as master capable.

Story: 2005733
Task: 36769

Change-Id: Ic8722d5bf9cfc3a1db270bd7b544ec62c905dfa9
Signed-off-by: Kevin Smith <kevin.smith@windriver.com>

monitor-helm/centos/monitor-helm.spec

@@ -24,6 +24,7 @@ Patch03: 0003-helm-chart-changes-for-stx-monitor.patch
 Patch04: 0004-ipv6-helm-chart-changes.patch
 Patch05: 0005-decouple-config.patch
 Patch06: 0006-add-system-info.patch
+Patch07: 0007-three-masters.patch
 
 BuildRequires: helm
 
@@ -38,6 +39,7 @@ Monitor Helm charts
 %patch04 -p1
 %patch05 -p1
 %patch06 -p1
+%patch07 -p1
 
 %build
 # initialize helm and build the toolkit

monitor-helm/files/0007-three-masters.patch

@@ -0,0 +1,40 @@
+From 876e674e26400dcbbee5ee52b6cd7c9b430063f7 Mon Sep 17 00:00:00 2001
+From: Kevin Smith <kevin.smith@windriver.com>
+Date: Mon, 23 Sep 2019 13:29:06 -0400
+Subject: [PATCH 1/1] three masters
+
+---
+ stable/elasticsearch/templates/data-statefulset.yaml | 2 +-
+ stable/elasticsearch/values.yaml                     | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/stable/elasticsearch/templates/data-statefulset.yaml b/stable/elasticsearch/templates/data-statefulset.yaml
+index 44b6be1..69b54cd 100644
+--- a/stable/elasticsearch/templates/data-statefulset.yaml
++++ b/stable/elasticsearch/templates/data-statefulset.yaml
+@@ -114,7 +114,7 @@ spec:
+         - name: DISCOVERY_SERVICE
+           value: {{ template "elasticsearch.fullname" . }}-discovery
+         - name: NODE_MASTER
+-          value: "false"
++          value: {{ .Values.data.combinedDataAndMaster | quote }}
+         - name: PROCESSORS
+           valueFrom:
+             resourceFieldRef:
+diff --git a/stable/elasticsearch/values.yaml b/stable/elasticsearch/values.yaml
+index 37321dc..a4b65b7 100644
+--- a/stable/elasticsearch/values.yaml
++++ b/stable/elasticsearch/values.yaml
+@@ -222,6 +222,9 @@ data:
+     drain:  # drain the node before stopping it and re-integrate it into the cluster after start
+       enabled: true
+ 
++  # If below is true, data nodes will also be master capable
++  combinedDataAndMaster: false
++
+ ## Sysctl init container to setup vm.max_map_count
+ # see https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html
+ # and https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration-memory.html#mlockall
+-- 
+1.8.3.1
+