CA_CERT deleted, it's not need for elastic w/o auth
This commit is contained in:
parent
68f9ecdd97
commit
39bd5cdc2c
@ -54,8 +54,8 @@ extraEnvs:
|
||||
secretKeyRef:
|
||||
name: elasticsearch-master-credentials
|
||||
key: password
|
||||
- name: CA_CERT
|
||||
value: "/usr/share/elasticsearch/config/http-certs/ca.crt"
|
||||
# - name: CA_CERT
|
||||
# value: "/usr/share/elasticsearch/config/http-certs/ca.crt"
|
||||
- name: ES_URL
|
||||
value: "http://elasticsearch-master:9200"
|
||||
- name: TEMPLATE_PATH_1
|
||||
@ -589,7 +589,7 @@ postStart:
|
||||
MAX_RETRIES="${MAX_RETRIES:-30}"
|
||||
RETRY_INTERVAL="${RETRY_INTERVAL:-5}"
|
||||
# Validate required env vars
|
||||
REQUIRED_VARS=("CA_CERT" "ES_USERNAME" "ELASTIC_PASSWORD" "ES_URL" "TEMPLATE_PATH_1" "TEMPLATE_PATH_2" "TEMPLATE_PATH_3")
|
||||
REQUIRED_VARS=( "ES_USERNAME" "ELASTIC_PASSWORD" "ES_URL" "TEMPLATE_PATH_1" "TEMPLATE_PATH_2" "TEMPLATE_PATH_3")
|
||||
for var in "${REQUIRED_VARS[@]}"; do
|
||||
if [ -z "${!var:-}" ]; then
|
||||
echo "[postStart] ERROR: Required env var '$var' is not set!" >&2
|
||||
@ -598,7 +598,7 @@ postStart:
|
||||
done
|
||||
echo "[postStart] Waiting for Elasticsearch at $ES_URL to be ready..." >&2
|
||||
for ((i=1; i<=MAX_RETRIES; i++)); do
|
||||
if /usr/bin/curl --cacert "$CA_CERT" -s -u "$ES_USERNAME:$ELASTIC_PASSWORD" "$ES_URL" >/dev/null; then
|
||||
if /usr/bin/curl -s -u "$ES_USERNAME:$ELASTIC_PASSWORD" "$ES_URL" >/dev/null; then
|
||||
echo "[postStart] Elasticsearch is up after $i attempts!" >&2
|
||||
break
|
||||
fi
|
||||
@ -613,7 +613,7 @@ postStart:
|
||||
for idx in "chat:$TEMPLATE_PATH_1" "message:$TEMPLATE_PATH_2" "user:$TEMPLATE_PATH_3"; do
|
||||
name="${idx%%:*}"
|
||||
path="${idx##*:}"
|
||||
if ! /usr/bin/curl --cacert "$CA_CERT" -X PUT "$ES_URL/$name" \
|
||||
if ! /usr/bin/curl -X PUT "$ES_URL/$name" \
|
||||
-u "$ES_USERNAME:$ELASTIC_PASSWORD" \
|
||||
-H 'Content-Type: application/json' \
|
||||
--data-binary @"$path"; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user