From 702ca8f0ea5d150938a8e7650841d31d3357c0ac Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 27 Oct 2020 15:43:39 +0100
Subject: [PATCH] [elasticsearch] add coordinator node to multi test (#854)

This commit add a coordinator node group to elasticsearch multi test.
This also add ml and remote_cluster_client roles to default values.
---
 elasticsearch/examples/multi/Makefile       |  2 ++
 elasticsearch/examples/multi/README.md      |  6 ++++--
 elasticsearch/examples/multi/client.yml     | 14 ++++++++++++++
 elasticsearch/examples/multi/data.yml       |  2 ++
 elasticsearch/examples/multi/master.yml     |  2 ++
 elasticsearch/examples/multi/test/goss.yaml |  2 +-
 elasticsearch/values.yaml                   |  2 ++
 7 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 elasticsearch/examples/multi/client.yml

diff --git a/elasticsearch/examples/multi/Makefile b/elasticsearch/examples/multi/Makefile
index 836ec2e0f..9682966cd 100644
--- a/elasticsearch/examples/multi/Makefile
+++ b/elasticsearch/examples/multi/Makefile
@@ -8,9 +8,11 @@ RELEASE := helm-es-multi-master
 install:
 	helm upgrade --wait --timeout=600 --install --values ./master.yml $(PREFIX)-master ../../
 	helm upgrade --wait --timeout=600 --install --values ./data.yml $(PREFIX)-data ../../
+	helm upgrade --wait --timeout=600 --install --values ./client.yml $(PREFIX)-client ../../
 
 test: install goss
 
 purge:
 	helm del --purge $(PREFIX)-master
 	helm del --purge $(PREFIX)-data
+	helm del --purge $(PREFIX)-client
diff --git a/elasticsearch/examples/multi/README.md b/elasticsearch/examples/multi/README.md
index 750439b94..7368bb1be 100644
--- a/elasticsearch/examples/multi/README.md
+++ b/elasticsearch/examples/multi/README.md
@@ -1,14 +1,15 @@
 # Multi
 
-This example deploy an Elasticsearch 6.8.14-SNAPSHOT cluster composed of 2 different Helm
+This example deploy an Elasticsearch 6.8.14-SNAPSHOT cluster composed of 3 different Helm
 releases:
 
 - `helm-es-multi-master` for the 3 master nodes using [master values][]
 - `helm-es-multi-data` for the 3 data nodes using [data values][]
+- `helm-es-multi-client` for the 3 client nodes using [client values][]
 
 ## Usage
 
-* Deploy the 2 Elasticsearch releases: `make install`
+* Deploy the 3 Elasticsearch releases: `make install`
 
 * You can now setup a port forward to query Elasticsearch API:
 
@@ -22,6 +23,7 @@ releases:
 You can also run [goss integration tests][] using `make test`
 
 
+[client values]: https://github.com/elastic/helm-charts/tree/6.8/elasticsearch/examples/multi/client.yml
 [data values]: https://github.com/elastic/helm-charts/tree/6.8/elasticsearch/examples/multi/data.yml
 [goss integration tests]: https://github.com/elastic/helm-charts/tree/6.8/elasticsearch/examples/multi/test/goss.yaml
 [master values]: https://github.com/elastic/helm-charts/tree/6.8/elasticsearch/examples/multi/master.yml
diff --git a/elasticsearch/examples/multi/client.yml b/elasticsearch/examples/multi/client.yml
new file mode 100644
index 000000000..dbe5b05aa
--- /dev/null
+++ b/elasticsearch/examples/multi/client.yml
@@ -0,0 +1,14 @@
+---
+
+clusterName: "multi"
+nodeGroup: "client"
+
+roles:
+  master: "false"
+  ingest: "false"
+  data: "false"
+  ml: "false"
+  remote_cluster_client: "false"
+
+persistence:
+  enabled: false
diff --git a/elasticsearch/examples/multi/data.yml b/elasticsearch/examples/multi/data.yml
index ecc689337..2e3a90935 100644
--- a/elasticsearch/examples/multi/data.yml
+++ b/elasticsearch/examples/multi/data.yml
@@ -7,3 +7,5 @@ roles:
   master: "false"
   ingest: "true"
   data: "true"
+  ml: "false"
+  remote_cluster_client: "false"
diff --git a/elasticsearch/examples/multi/master.yml b/elasticsearch/examples/multi/master.yml
index 2ca4cca8e..6b8c08293 100644
--- a/elasticsearch/examples/multi/master.yml
+++ b/elasticsearch/examples/multi/master.yml
@@ -7,3 +7,5 @@ roles:
   master: "true"
   ingest: "false"
   data: "false"
+  ml: "false"
+  remote_cluster_client: "false"
diff --git a/elasticsearch/examples/multi/test/goss.yaml b/elasticsearch/examples/multi/test/goss.yaml
index 18cb25063..794416b8f 100644
--- a/elasticsearch/examples/multi/test/goss.yaml
+++ b/elasticsearch/examples/multi/test/goss.yaml
@@ -5,5 +5,5 @@ http:
     body:
       - 'green'
       - '"cluster_name":"multi"'
-      - '"number_of_nodes":6'
+      - '"number_of_nodes":9'
       - '"number_of_data_nodes":3'
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 59a873015..bd53efdb0 100755
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -12,6 +12,8 @@ roles:
   master: "true"
   ingest: "true"
   data: "true"
+  remote_cluster_client: "true"
+# ml: "true" # ml is not availble with elasticsearch-oss
 
 replicas: 3
 minimumMasterNodes: 2