CadolesKube/valkey-kustom
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(node): use headless service in all the scripts
Some checks failed
Build and Push Image / Build and push image (push) Failing after 13s
Details

Browse Source
This commit is contained in:
Philippe Caseiro 2025-05-28 11:11:12 +02:00
parent 3c550b3015
commit 09c6791509
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/node/files/conf/replication.conf.tpl
View File

@ -1,5 +1,5 @@
{{- $hostname := env "HOSTNAME" }} {{- $hostname := env "HOSTNAME" }}
{{- $service := env "VALKEY_SERVICE" }} {{- $service := env "VALKEY_HEADLESS_SERVICE" }}
{{- $namespace := env "NAMESPACE" }} {{- $namespace := env "NAMESPACE" }}
{{- $port := env "VALKEY_PORT" }} {{- $port := env "VALKEY_PORT" }}
{{- $sentinel_port := env "VALKEY_SENTINEL_PORT" }} {{- $sentinel_port := env "VALKEY_SENTINEL_PORT" }}

2
resources/node/files/conf/replication.conf.tpl.full
View File

@ -1,5 +1,5 @@
{{- $hostname := env "HOSTNAME" }} {{- $hostname := env "HOSTNAME" }}
{{- $service := env "VALKEY_SERVICE" }} {{- $service := env "VALKEY_HEADLESS_SERVICE" }}
{{- $namespace := env "NAMESPACE" }} {{- $namespace := env "NAMESPACE" }}
{{- $port := env "VALKEY_PORT" }} {{- $port := env "VALKEY_PORT" }}
{{- $sentinel_port := env "VALKEY_SENTINEL_PORT" }} {{- $sentinel_port := env "VALKEY_SENTINEL_PORT" }}

2
resources/node/files/conf/sentinel.conf.tpl
View File

@ -1,5 +1,5 @@
{{- $hostname := env "HOSTNAME" }} {{- $hostname := env "HOSTNAME" }}
{{- $service := env "VALKEY_SERVICE" }} {{- $service := env "VALKEY_HEADLESS_SERVICE" }}
{{- $namespace := env "NAMESPACE" }} {{- $namespace := env "NAMESPACE" }}
{{- $port := env "VALKEY_PORT" }} {{- $port := env "VALKEY_PORT" }}
{{- $name := env "VALKEY_NAME" }} {{- $name := env "VALKEY_NAME" }}

6
resources/node/files/scripts/common.sh
View File

@ -2,7 +2,7 @@
pingSentinel() { pingSentinel() {
svc=${VALKEY_SERVICE:-"localhost"} svc=${VALKEY_HEADLESS_SERVICE:-"localhost"}
resp=$(timeout -s 15 $1 \ resp=$(timeout -s 15 $1 \
valkey-cli \ valkey-cli \
@ -15,7 +15,7 @@ pingSentinel() {
} }
getPrimaryInfo() { getPrimaryInfo() {
valkey-cli --csv -h ${VALKEY_SERVICE} -p ${VALKEY_SENTINEL_PORT} sentinel get-primary-addr-by-name "mymaster"| \ valkey-cli --csv -h ${VALKEY_HEADLESS_SERVICE} -p ${VALKEY_SENTINEL_PORT} sentinel get-primary-addr-by-name "mymaster"| \
awk -F ',' '{ gsub(/"/,"",$0); print $1 " " $2 }' awk -F ',' '{ gsub(/"/,"",$0); print $1 " " $2 }'
return ${?} return ${?}
} }
@ -76,6 +76,6 @@ sentinelIsMaster() {
sentinelReset() { sentinelReset() {
# Reset the sentinel # Reset the sentinel
valkey-cli -h ${VALKEY_SERVICE} -p ${VALKEY_SENTINEL_PORT} sentinel reset "${1}" valkey-cli -h ${VALKEY_HEADLESS_SERVICE} -p ${VALKEY_SENTINEL_PORT} sentinel reset "${1}"
return $? return $?
} }

2
resources/node/files/scripts/pre-stop.sh
View File

@ -8,7 +8,7 @@ vcli() {
# Run Sentinel command # Run Sentinel command
vcli-sentinel() { vcli-sentinel() {
valkey-cli -h "$VALKEY_SERVICE" -p "$VALKEY_SENTINEL_PORT" sentinel "$@" valkey-cli -h "${VALKEY_HEADLESS_SERVICE}" -p "${VALKEY_SENTINEL_PORT}" sentinel "$@"
return $? return $?
} }

4
resources/node/files/scripts/start-node.sh
View File

@ -3,7 +3,7 @@
pingSentinel() { pingSentinel() {
resp=$(timeout -s 15 $1 \ resp=$(timeout -s 15 $1 \
valkey-cli \ valkey-cli \
-h ${VALKEY_SERVICE} \ -h ${VALKEY_HEADLESS_SERVICE} \
-p ${VALKEY_SENTINEL_PORT} \ -p ${VALKEY_SENTINEL_PORT} \
ping) ping)
ret=${?} ret=${?}
@ -12,7 +12,7 @@ pingSentinel() {
} }
getPrimaryInfo() { getPrimaryInfo() {
valkey-cli -t 15 --csv -h ${VALKEY_SERVICE} -p ${VALKEY_SENTINEL_PORT} sentinel get-primary-addr-by-name "mymaster"| \ valkey-cli -t 15 --csv -h ${VALKEY_HEADLESS_SERVICE} -p ${VALKEY_SENTINEL_PORT} sentinel get-primary-addr-by-name "mymaster"| \
awk -F ',' '{ gsub(/"/,"",$0); print $1 " " $2 }' awk -F ',' '{ gsub(/"/,"",$0); print $1 " " $2 }'
return ${?} return ${?}
} }