Fix nil ptr for the redis-sentinel. (#642)

Signed-off-by: Shubham Gupta <iamshubhamgupta2001@gmail.com>
OT-CONTAINER-KIT · Sep 24, 2023 · 26f9c0b · 26f9c0b
1 parent 87fa654
commit 26f9c0b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/api/v1beta1/redissentinel_conversion.go b/api/v1beta1/redissentinel_conversion.go
@@ -5,7 +5,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
-// ConvertTo converts this RedisSentinel to the Hub version (vbeta2).
+// ConvertTo converts this RedisSentinel to the Hub version (v1beta2).
 func (src *RedisSentinel) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*redisv1beta2.RedisSentinel)
 

diff --git a/example/v1beta2/redis-cluster.yaml b/example/v1beta2/redis-cluster.yaml
@@ -20,11 +20,6 @@ spec:
       limits:
         cpu: 101m
         memory: 128Mi
-  env:
-  - name: CUSTOM_ENV_VAR_1
-    value: "custom_value_1"
-  - name: CUSTOM_ENV_VAR_2
-    value: "custom_value_2"      
     # redisSecret:
     #   name: redis-secret
     #   key: password

diff --git a/k8sutils/redis-sentinel.go b/k8sutils/redis-sentinel.go
@@ -41,7 +41,7 @@ func CreateRedisSentinel(cr *redisv1beta2.RedisSentinel) error {
 		TerminationGracePeriodSeconds: cr.Spec.TerminationGracePeriodSeconds,
 	}
 
-	if cr.Spec.RedisSentinelConfig.AdditionalSentinelConfig != nil {
+	if cr.Spec.RedisSentinelConfig != nil && cr.Spec.RedisSentinelConfig.AdditionalSentinelConfig != nil {
 		prop.ExternalConfig = cr.Spec.RedisSentinelConfig.AdditionalSentinelConfig
 	}
 
@@ -242,6 +242,10 @@ func (service RedisSentinelService) CreateRedisSentinelService(cr *redisv1beta2.
 
 func getSentinelEnvVariable(cr *redisv1beta2.RedisSentinel) *[]corev1.EnvVar {
 
+	if cr.Spec.RedisSentinelConfig == nil {
+		return &[]corev1.EnvVar{}
+	}
+
 	envVar := &[]corev1.EnvVar{
 		{
 			Name:  "MASTER_GROUP_NAME",