Compare commits
4 Commits
v0.0.8-dev
...
develop
Author | SHA1 | Date | |
---|---|---|---|
fef4f1d899 | |||
27ffba8dc1 | |||
5d739cbb0c | |||
09c6791509 |
@ -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" }}
|
||||||
|
@ -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" }}
|
||||||
|
@ -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" }}
|
||||||
|
@ -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 $?
|
||||||
}
|
}
|
@ -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 $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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 ${?}
|
||||||
}
|
}
|
||||||
|
@ -12,8 +12,8 @@ configMapGenerator:
|
|||||||
- NAMESPACE="default"
|
- NAMESPACE="default"
|
||||||
- VALKEY_ENV="base"
|
- VALKEY_ENV="base"
|
||||||
- VALKEY_NAME="valkey-node"
|
- VALKEY_NAME="valkey-node"
|
||||||
- VALKEY_SERVICE="valkey"
|
- VALKEY_SERVICE="valkey-node"
|
||||||
- VALKEY_HEADLESS_SERVICE="valkey-headless"
|
- VALKEY_HEADLESS_SERVICE="valkey-node-headless"
|
||||||
- VALKEY_REPLICAS="4"
|
- VALKEY_REPLICAS="4"
|
||||||
- VALKEY_PORT="6379"
|
- VALKEY_PORT="6379"
|
||||||
- VALKEY_SENTINEL_PORT="26379"
|
- VALKEY_SENTINEL_PORT="26379"
|
||||||
@ -38,6 +38,6 @@ configMapGenerator:
|
|||||||
- files/scripts/liveness-local.sh
|
- files/scripts/liveness-local.sh
|
||||||
- files/scripts/readiness-local.sh
|
- files/scripts/readiness-local.sh
|
||||||
|
|
||||||
replacements:
|
#replacements:
|
||||||
- path: ./replacements/services.yaml
|
#- path: ./replacements/services.yaml
|
||||||
- path: ./replacements/statefulset.yaml
|
#- path: ./replacements/statefulset.yaml
|
||||||
|
@ -18,13 +18,3 @@
|
|||||||
name: valkey-node
|
name: valkey-node
|
||||||
fieldPaths:
|
fieldPaths:
|
||||||
- spec.serviceName
|
- spec.serviceName
|
||||||
- source:
|
|
||||||
kind: ConfigMap
|
|
||||||
name: valkey-env
|
|
||||||
fieldPath: data.VALKEY_NAME
|
|
||||||
targets:
|
|
||||||
- select:
|
|
||||||
kind: StatefulSet
|
|
||||||
name: valkey-node
|
|
||||||
fieldPaths:
|
|
||||||
- metadata.name
|
|
||||||
|
Reference in New Issue
Block a user