From: Szekeres, Balazs (Nokia - HU/Budapest) <balazs.szekeres@nokia.com>
Date: Thu, 4 Jul 2019 10:52:53 +0000 (+0200)
Subject: Elastic manifest update
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=8d60fd97862a7ed62458a7d435498d0669a218b4;p=ta%2Fcaas-install.git

Elastic manifest update

Setted EXPECTED_MASTER_NODES, EXPECTED_DATA_NODES,
RECOVER_AFTER_MASTER_NODES and RECOVER_AFTER_DATA_NODES env.
variables. Now elastic can run any with any data/master node number.

Change-Id: I64588e8aa2400f83a571a189c7fd18b9d4a0c2eb
Signed-off-by: Szekeres, Balazs (Nokia - HU/Budapest) <balazs.szekeres@nokia.com>
---

diff --git a/SPECS/infra-charts.spec b/SPECS/infra-charts.spec
index 8ff0562..b51e721 100644
--- a/SPECS/infra-charts.spec
+++ b/SPECS/infra-charts.spec
@@ -15,7 +15,7 @@
 %define COMPONENT infra-charts
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 11
+%define RPM_MINOR_VERSION 12
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
diff --git a/infra-charts/templates/elasticsearch-data-statefulset.yaml b/infra-charts/templates/elasticsearch-data-statefulset.yaml
index c74bf34..baa591a 100644
--- a/infra-charts/templates/elasticsearch-data-statefulset.yaml
+++ b/infra-charts/templates/elasticsearch-data-statefulset.yaml
@@ -60,6 +60,14 @@ spec:
               fieldPath: metadata.name
         - name: CLUSTER_INITIAL_MASTER_NODES
           value: '{{ .Values.elasticsearch.clustermasternodes }}'
+        - name: EXPECTED_MASTER_NODES
+          value: '{{ .Values.elasticsearch.master.replicas }}'
+        - name: EXPECTED_DATA_NODES
+          value: '{{ .Values.elasticsearch.data.replicas }}'
+        - name: RECOVER_AFTER_MASTER_NODES
+          value: '{{ .Values.elasticsearch.master.replicas }}'
+        - name: RECOVER_AFTER_DATA_NODES
+          value: '{{ .Values.elasticsearch.data.replicas }}'
         - name: NODE_MASTER
           value: "false"
         - name: NODE_INGEST
diff --git a/infra-charts/templates/elasticsearch-master-statefulset.yaml b/infra-charts/templates/elasticsearch-master-statefulset.yaml
index 373714c..2fe1a90 100644
--- a/infra-charts/templates/elasticsearch-master-statefulset.yaml
+++ b/infra-charts/templates/elasticsearch-master-statefulset.yaml
@@ -59,6 +59,14 @@ spec:
               fieldPath: metadata.name
         - name: CLUSTER_INITIAL_MASTER_NODES
           value: '{{ .Values.elasticsearch.clustermasternodes }}'
+        - name: EXPECTED_MASTER_NODES
+          value: '{{ .Values.elasticsearch.master.replicas }}'
+        - name: EXPECTED_DATA_NODES
+          value: '{{ .Values.elasticsearch.data.replicas }}'
+        - name: RECOVER_AFTER_MASTER_NODES
+          value: '{{ .Values.elasticsearch.master.replicas }}'
+        - name: RECOVER_AFTER_DATA_NODES
+          value: '{{ .Values.elasticsearch.data.replicas }}'
         - name: NODE_MASTER
           value: "true"
         - name: NODE_INGEST