[bitnami/opensearch] Fix readiness/liveness probe not working if "res…

…tEncryption: false" in values.yaml (#47340) Signed-off-by: Andrea Rabbaglietti <rabbagliettiandrea@gmail.com>
bitnami · Sep 5, 2023 · 213b2f7 · 213b2f7
1 parent e9d5592
commit 213b2f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh b/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh
@@ -940,7 +940,8 @@ elasticsearch_healthcheck() {
 
     host=$(get_elasticsearch_hostname)
 
-    is_boolean_yes "$DB_ENABLE_SECURITY" && is_boolean_yes "$DB_ENABLE_REST_TLS" && protocol="https" && command_args+=("-k" "--user" "${DB_USERNAME}:${DB_PASSWORD}")
+    is_boolean_yes "$DB_ENABLE_SECURITY" && command_args+=("-k" "--user" "${DB_USERNAME}:${DB_PASSWORD}")
+    is_boolean_yes "$DB_ENABLE_REST_TLS" && protocol="https"
 
     # Combination of --silent, --output and --write-out allows us to obtain both the status code and the request body
     output=$(mktemp)

diff --git a/bitnami/opensearch/2/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh b/bitnami/opensearch/2/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh
@@ -940,8 +940,9 @@ elasticsearch_healthcheck() {
 
     host=$(get_elasticsearch_hostname)
 
-    is_boolean_yes "$DB_ENABLE_SECURITY" && is_boolean_yes "$DB_ENABLE_REST_TLS" && protocol="https" && command_args+=("-k" "--user" "${DB_USERNAME}:${DB_PASSWORD}")
-
+    is_boolean_yes "$DB_ENABLE_SECURITY" && command_args+=("-k" "--user" "${DB_USERNAME}:${DB_PASSWORD}")
+    is_boolean_yes "$DB_ENABLE_REST_TLS" && protocol="https"
+
     # Combination of --silent, --output and --write-out allows us to obtain both the status code and the request body
     output=$(mktemp)
     command_args+=("-o" "$output" "${protocol}://${host}:${DB_HTTP_PORT_NUMBER}/_cluster/health?local=true")