Skip to content

Commit 8786107

Browse files
committed
fixed redis shoutdown script
1 parent 16174e7 commit 8786107

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pkg/controller/service/generator.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package service
22

33
import (
44
"fmt"
5+
"strings"
56

67
appsv1 "k8s.io/api/apps/v1"
78
corev1 "k8s.io/api/core/v1"
@@ -140,13 +141,15 @@ func generateRedisShutdownConfigMap(rc *redisv1beta1.RedisCluster, labels map[st
140141
namespace := rc.Namespace
141142

142143
labels = util.MergeLabels(labels, generateSelectorLabels(util.RedisRoleName, rc.Name))
143-
shutdownContent := `#!/usr/bin/env sh
144+
envSentinelHost := fmt.Sprintf("REDIS_SENTINEL_%s_SERVICE_HOST", strings.ToUpper(rc.Name))
145+
envSentinelPort := fmt.Sprintf("REDIS_SENTINEL_%s_SERVICE_PORT_SENTINEL", strings.ToUpper(rc.Name))
146+
shutdownContent := fmt.Sprintf(`#!/usr/bin/env sh
144147
set -eou pipefail
145-
master=$(redis-cli -h ${rcS_REDIS_SERVICE_HOST} -p ${rcS_REDIS_SERVICE_PORT_SENTINEL} --csv SENTINEL get-master-addr-by-name mymaster | tr ',' ' ' | tr -d '\"' |cut -d' ' -f1)
148+
master=$(redis-cli -h ${%s} -p ${%s} --csv SENTINEL get-master-addr-by-name mymaster | tr ',' ' ' | tr -d '\"' |cut -d' ' -f1)
146149
redis-cli SAVE
147150
if [[ $master == $(hostname -i) ]]; then
148-
redis-cli -h ${rcS_REDIS_SERVICE_HOST} -p ${rcS_REDIS_SERVICE_PORT_SENTINEL} SENTINEL failover mymaster
149-
fi`
151+
redis-cli -h ${%s} -p ${%s} SENTINEL failover mymaster
152+
fi`, envSentinelHost, envSentinelPort, envSentinelHost, envSentinelPort)
150153

151154
return &corev1.ConfigMap{
152155
ObjectMeta: metav1.ObjectMeta{

0 commit comments

Comments
 (0)