Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 1 deletions

diff --git a/vendor/elastic_stack/values.yaml b/vendor/elastic_stack/values.yaml
index 8b71e5b2c2c..9355a9b6b81 100644
--- a/vendor/elastic_stack/values.yaml
+++ b/vendor/elastic_stack/values.yaml
@@ -8,7 +8,7 @@ elasticsearch:
   client:
     replicas: 1
   data:
-    replicas: 1
+    replicas: 2
 
 kibana:
   enabled: false
diff --git a/vendor/elastic_stack/wait-for-elasticsearch.sh b/vendor/elastic_stack/wait-for-elasticsearch.sh
new file mode 100755
index 00000000000..1423af2e10b
--- /dev/null
+++ b/vendor/elastic_stack/wait-for-elasticsearch.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/
+IFS=$'\n\t'
+set -euo pipefail
+
+HOST="$1"
+
+printf 'Waiting for ES to be reachable ...'
+until $(wget -O- -q "$HOST" &>/dev/null); do
+    printf '.'
+    sleep 1
+done
+echo " OK!"
+
+printf 'Waiting for ES to be healthy ...'
+while : ; do
+    HEALTH="$(wget -O- -q "$HOST/_cat/health?h=status" 2> /dev/null)"
+    HEALTH="$(echo "$HEALTH" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+    ([ "$HEALTH" != "green" ] && printf '.' && sleep 1) || break
+done
+echo " OK!"
+
+echo "Elastic Search is up!"