From 4910b8dca133a1723db575bc11e05056b5b0087c Mon Sep 17 00:00:00 2001
From: Andrew Kostka <andrew.kostka@wikimedia.de>
Date: Wed, 15 Nov 2023 18:23:10 +0000
Subject: [PATCH] chore(elasticsearch): startup probe success if cluster is
 green

---
 .../env/production/elasticsearch-1.values.yaml.gotmpl  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl b/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl
index 1266e2429..d07ec1b4d 100644
--- a/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl
@@ -1,6 +1,7 @@
 image:
   registry: ghcr.io
   repository: wbstack/elasticsearch
+  # TODO: Update with new Elasticsearch image
   tag: 7.10.2-20231013-0
 
 labels:
@@ -45,10 +46,15 @@ data:
     accessModes: [ "ReadWriteOnce" ]
     storageClass: "premium-rwo"
     size: 50Gi
-  startupProbe:
-    enabled: true
+  customStartupProbe:
     periodSeconds: 10
     failureThreshold: 1440
+    initialDelaySeconds: 90
+    timeoutSeconds: 5
+    successThreshold: 1
+    exec:
+      command:
+        - /opt/bitnami/scripts/elasticsearch/healthcheck-cluster.sh
 
 coordinating:
   replicaCount: 0