Merge pull request #380 from fatmcgav/tweak_es_readiness_command

[elasticsearch] Tweak the 'readinessProbe' command to verify that master nodes are available.
elastic · Nov 21, 2019 · f2c8815 · f2c8815
2 parents aa5394a + 7af11b1
commit f2c8815
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
@@ -211,8 +211,8 @@ spec:
                 }
 
                 if [ -f "${START_FILE}" ]; then
-                    echo 'Elasticsearch is already running, lets check the node is healthy'
-                    http "/"
+                    echo 'Elasticsearch is already running, lets check the node is healthy and there are master nodes available'
+                    http "/_cluster/health?timeout=0s"
                 else
                     echo 'Waiting for elasticsearch cluster to become cluster to be ready (request params: "{{ .Values.clusterHealthCheckParams }}" )'
                     if http "/_cluster/health?{{ .Values.clusterHealthCheckParams }}" ; then

diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py
@@ -107,6 +107,7 @@ def test_defaults():
 
     assert 'curl' in c['readinessProbe']['exec']['command'][-1]
     assert 'http://127.0.0.1:9200' in c['readinessProbe']['exec']['command'][-1]
+    assert '/_cluster/health?timeout=0s' in c['readinessProbe']['exec']['command'][-1]
 
     # Resources
     assert c['resources'] == {