Merge pull request #4 from angel9484/feature/make_configurable_port_and_gossip_in_redis

Feature/make configurable port and gossip in redis

Author: angel9484

pkg/controller/distributedrediscluster/sync_handler.go

@@ -2,7 +2,6 @@ package distributedrediscluster
 
 import (
 	"fmt"
-	"strconv"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -356,7 +355,7 @@ func (r *ReconcileDistributedRedisCluster) resetClusterPassword(ctx *syncContext
 		// Update the password recorded in the file /data/redis_password, redis pod preStop hook
 		// need /data/redis_password do CLUSTER FAILOVER
 		cmd := fmt.Sprintf("echo %s > /data/redis_password", newPassword)
-		if err := r.execer.ExecCommandInPodSet(podSet, "/bin/sh", "-c", "-p", strconv.Itoa(ctx.cluster.Spec.ClientPort), cmd); err != nil {
+		if err := r.execer.ExecCommandInPodSet(podSet, "/bin/sh", "-c", cmd); err != nil {
 			return err
 		}
 

pkg/resources/statefulsets/statefulset.go

@@ -297,7 +297,7 @@ func redisServerContainer(cluster *redisv1alpha1.DistributedRedisCluster, passwo
 		Lifecycle: &corev1.Lifecycle{
 			PostStart: &corev1.Handler{
 				Exec: &corev1.ExecAction{
-					Command: []string{"/bin/sh", "-p", strconv.Itoa(cluster.Spec.ClientPort), "-c", "echo ${REDIS_PASSWORD} > /data/redis_password"},
+					Command: []string{"/bin/sh", "-c", "echo ${REDIS_PASSWORD} > /data/redis_password"},
 				},
 			},
 			PreStop: &corev1.Handler{