From 8101e49f529da6cb3f06aa521140f9cb91eb3c14 Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 12 Dec 2019 14:49:00 -0600 Subject: [PATCH 1/2] Allow user to override readiness timeout --- pkg/controller/elasticsearch/nodespec/readiness_probe.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/elasticsearch/nodespec/readiness_probe.go b/pkg/controller/elasticsearch/nodespec/readiness_probe.go index 171d3fd985..7271b48e06 100644 --- a/pkg/controller/elasticsearch/nodespec/readiness_probe.go +++ b/pkg/controller/elasticsearch/nodespec/readiness_probe.go @@ -30,7 +30,7 @@ const ReadinessProbeScriptConfigKey = "readiness-probe-script.sh" const ReadinessProbeScript string = ` #!/usr/bin/env bash # Consider a node to be healthy if it responds to a simple GET on "/_cat/nodes?local" -CURL_TIMEOUT=3 +${CURL_TIMEOUT:=3} # Check if PROBE_PASSWORD_PATH is set, otherwise fall back to its former name in 1.0.0.beta-1: PROBE_PASSWORD_FILE if [[ -z "${PROBE_PASSWORD_PATH}" ]]; then From 0ae9ba1245bea6e7fbdd7cc9195822a011e9ff57 Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 12 Dec 2019 14:57:50 -0600 Subject: [PATCH 2/2] Fix a woopsie --- pkg/controller/elasticsearch/nodespec/readiness_probe.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/elasticsearch/nodespec/readiness_probe.go b/pkg/controller/elasticsearch/nodespec/readiness_probe.go index 7271b48e06..e9d77e1bd0 100644 --- a/pkg/controller/elasticsearch/nodespec/readiness_probe.go +++ b/pkg/controller/elasticsearch/nodespec/readiness_probe.go @@ -30,7 +30,7 @@ const ReadinessProbeScriptConfigKey = "readiness-probe-script.sh" const ReadinessProbeScript string = ` #!/usr/bin/env bash # Consider a node to be healthy if it responds to a simple GET on "/_cat/nodes?local" -${CURL_TIMEOUT:=3} +CURL_TIMEOUT=${CURL_TIMEOUT:=3} # Check if PROBE_PASSWORD_PATH is set, otherwise fall back to its former name in 1.0.0.beta-1: PROBE_PASSWORD_FILE if [[ -z "${PROBE_PASSWORD_PATH}" ]]; then