gitea_admin/cw-infra-apps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CA_CERT deleted, it's not need for elastic w/o auth

Browse Source
This commit is contained in:
Leo Sok 2025-07-24 12:07:01 +03:00
parent 68f9ecdd97
commit 39bd5cdc2c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
elasticsearch/values.yaml
View File

@ -54,8 +54,8 @@ extraEnvs:
secretKeyRef: secretKeyRef:
name: elasticsearch-master-credentials name: elasticsearch-master-credentials
key: password key: password
- name: CA_CERT # - name: CA_CERT
value: "/usr/share/elasticsearch/config/http-certs/ca.crt" # value: "/usr/share/elasticsearch/config/http-certs/ca.crt"
- name: ES_URL - name: ES_URL
value: "http://elasticsearch-master:9200" value: "http://elasticsearch-master:9200"
- name: TEMPLATE_PATH_1 - name: TEMPLATE_PATH_1
@ -589,7 +589,7 @@ postStart:
MAX_RETRIES="${MAX_RETRIES:-30}" MAX_RETRIES="${MAX_RETRIES:-30}"
RETRY_INTERVAL="${RETRY_INTERVAL:-5}" RETRY_INTERVAL="${RETRY_INTERVAL:-5}"
# Validate required env vars # 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 for var in "${REQUIRED_VARS[@]}"; do
if [ -z "${!var:-}" ]; then if [ -z "${!var:-}" ]; then
echo "[postStart] ERROR: Required env var '$var' is not set!" >&2 echo "[postStart] ERROR: Required env var '$var' is not set!" >&2
@ -598,7 +598,7 @@ postStart:
done done
echo "[postStart] Waiting for Elasticsearch at $ES_URL to be ready..." >&2 echo "[postStart] Waiting for Elasticsearch at $ES_URL to be ready..." >&2
for ((i=1; i<=MAX_RETRIES; i++)); do 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 echo "[postStart] Elasticsearch is up after $i attempts!" >&2
break break
fi fi
@ -613,7 +613,7 @@ postStart:
for idx in "chat:$TEMPLATE_PATH_1" "message:$TEMPLATE_PATH_2" "user:$TEMPLATE_PATH_3"; do for idx in "chat:$TEMPLATE_PATH_1" "message:$TEMPLATE_PATH_2" "user:$TEMPLATE_PATH_3"; do
name="${idx%%:*}" name="${idx%%:*}"
path="${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" \ -u "$ES_USERNAME:$ELASTIC_PASSWORD" \
-H 'Content-Type: application/json' \ -H 'Content-Type: application/json' \
--data-binary @"$path"; then --data-binary @"$path"; then