fix: add default port to enable SENTINEL_PORT environment (OT-CONTA…

…INER-KIT#999) * fix: add default port to enable `SENTINEL_PORT` environment Signed-off-by: drivebyer <[email protected]> * fix test Signed-off-by: drivebyer <[email protected]> --------- Signed-off-by: drivebyer <[email protected]> Signed-off-by: Matt Robinson <[email protected]>
mattrobinsonsre · Jul 11, 2024 · 8354fed · 8354fed
1 parent 0d5f74c
commit 8354fed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/k8sutils/redis-replication.go b/k8sutils/redis-replication.go
@@ -125,7 +125,7 @@ func generateRedisReplicationContainerParams(cr *redisv1beta2.RedisReplication)
 		ImagePullPolicy: cr.Spec.KubernetesConfig.ImagePullPolicy,
 		Resources:       cr.Spec.KubernetesConfig.Resources,
 		SecurityContext: cr.Spec.SecurityContext,
-		Port:            ptr.To(6379),
+		Port:            ptr.To(redisPort),
 	}
 	if cr.Spec.EnvVars != nil {
 		containerProp.EnvVars = cr.Spec.EnvVars

diff --git a/k8sutils/redis-sentinel.go b/k8sutils/redis-sentinel.go
@@ -152,6 +152,7 @@ func generateRedisSentinelContainerParams(ctx context.Context, client kubernetes
 		ImagePullPolicy:       cr.Spec.KubernetesConfig.ImagePullPolicy,
 		Resources:             cr.Spec.KubernetesConfig.Resources,
 		SecurityContext:       cr.Spec.SecurityContext,
+		Port:                  ptr.To(sentinelPort),
 		AdditionalEnvVariable: getSentinelEnvVariable(ctx, client, logger, cr, dcl),
 	}
 	if cr.Spec.EnvVars != nil {

diff --git a/k8sutils/redis-sentinel_test.go b/k8sutils/redis-sentinel_test.go
@@ -176,6 +176,7 @@ func Test_generateRedisSentinelContainerParams(t *testing.T) {
 				Value: "custom_value_2",
 			},
 		},
+		Port: ptr.To(26379),
 		AdditionalVolume: []v1.Volume{
 			{
 				Name: "redis-config",

diff --git a/k8sutils/redis-standalone.go b/k8sutils/redis-standalone.go
@@ -121,7 +121,7 @@ func generateRedisStandaloneContainerParams(cr *redisv1beta2.Redis) containerPar
 		ImagePullPolicy: cr.Spec.KubernetesConfig.ImagePullPolicy,
 		Resources:       cr.Spec.KubernetesConfig.Resources,
 		SecurityContext: cr.Spec.SecurityContext,
-		Port:            ptr.To(6379),
+		Port:            ptr.To(redisPort),
 	}
 
 	if cr.Spec.EnvVars != nil {