X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-monitor-armada-app%2Fmonitor-helm%2F0007-three-masters.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-monitor-armada-app%2Fmonitor-helm%2F0007-three-masters.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=7714545f0d3338db0a50e25590474ad34b06c1af;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0007-three-masters.patch b/meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0007-three-masters.patch
deleted file mode 100644
index 7714545..0000000
--- a/meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0007-three-masters.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
-