common function

Signed-off-by: yangw <[email protected]>

Author: drivebyer

pkg/k8sutils/redis-cluster.go

@@ -8,7 +8,6 @@ import (
 	redisv1beta2 "github.com/OT-CONTAINER-KIT/redis-operator/api/v1beta2"
 	"github.com/OT-CONTAINER-KIT/redis-operator/pkg/util"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/utils/ptr"
@@ -73,17 +72,8 @@ func generateRedisClusterParams(ctx context.Context, cr *redisv1beta2.RedisClust
 		res.ExternalConfig = externalConfig
 	}
 	if value, found := cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulset]; found && value == "true" {
-		var propagation metav1.DeletionPropagation
 		res.RecreateStatefulSet = true
-
-		propagation = metav1.DeletePropagationForeground
-		if cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulsetStrategy] == "orphan" {
-			propagation = metav1.DeletePropagationOrphan
-		} else if cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulsetStrategy] == "background" {
-			propagation = metav1.DeletePropagationBackground
-		}
-
-		res.RecreateStatefulsetStrategy = &propagation
+		res.RecreateStatefulsetStrategy = getDeletionPropagationStrategy(cr.ObjectMeta.GetAnnotations())
 	}
 	return res
 }

pkg/k8sutils/redis-replication.go

@@ -5,7 +5,6 @@ import (
 
 	redisv1beta2 "github.com/OT-CONTAINER-KIT/redis-operator/api/v1beta2"
 	"github.com/OT-CONTAINER-KIT/redis-operator/pkg/util"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/utils/ptr"
@@ -123,17 +122,8 @@ func generateRedisReplicationParams(cr *redisv1beta2.RedisReplication) statefulS
 		res.ServiceAccountName = cr.Spec.ServiceAccountName
 	}
 	if value, found := cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulset]; found && value == "true" {
-		var propagation metav1.DeletionPropagation
 		res.RecreateStatefulSet = true
-
-		propagation = metav1.DeletePropagationForeground
-		if cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulsetStrategy] == "orphan" {
-			propagation = metav1.DeletePropagationOrphan
-		} else if cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulsetStrategy] == "background" {
-			propagation = metav1.DeletePropagationBackground
-		}
-
-		res.RecreateStatefulsetStrategy = &propagation
+		res.RecreateStatefulsetStrategy = getDeletionPropagationStrategy(cr.ObjectMeta.GetAnnotations())
 	}
 	return res
 }

pkg/k8sutils/redis-sentinel.go

@@ -9,7 +9,6 @@ import (
 	redisv1beta2 "github.com/OT-CONTAINER-KIT/redis-operator/api/v1beta2"
 	"github.com/OT-CONTAINER-KIT/redis-operator/pkg/util"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
@@ -119,17 +118,8 @@ func generateRedisSentinelParams(ctx context.Context, cr *redisv1beta2.RedisSent
 		res.EnableMetrics = cr.Spec.RedisExporter.Enabled
 	}
 	if value, found := cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulset]; found && value == "true" {
-		var propagation metav1.DeletionPropagation
 		res.RecreateStatefulSet = true
-
-		propagation = metav1.DeletePropagationForeground
-		if cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulsetStrategy] == "orphan" {
-			propagation = metav1.DeletePropagationOrphan
-		} else if cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulsetStrategy] == "background" {
-			propagation = metav1.DeletePropagationBackground
-		}
-
-		res.RecreateStatefulsetStrategy = &propagation
+		res.RecreateStatefulsetStrategy = getDeletionPropagationStrategy(cr.ObjectMeta.GetAnnotations())
 	}
 	return res
 }

pkg/k8sutils/redis-standalone.go

@@ -5,7 +5,6 @@ import (
 
 	redisv1beta2 "github.com/OT-CONTAINER-KIT/redis-operator/api/v1beta2"
 	"github.com/OT-CONTAINER-KIT/redis-operator/pkg/util"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -131,17 +130,8 @@ func generateRedisStandaloneParams(cr *redisv1beta2.Redis) statefulSetParameters
 		res.ServiceAccountName = cr.Spec.ServiceAccountName
 	}
 	if value, found := cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulset]; found && value == "true" {
-		var propagation metav1.DeletionPropagation
 		res.RecreateStatefulSet = true
-
-		propagation = metav1.DeletePropagationForeground
-		if cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulsetStrategy] == "orphan" {
-			propagation = metav1.DeletePropagationOrphan
-		} else if cr.ObjectMeta.GetAnnotations()[AnnotationKeyRecreateStatefulsetStrategy] == "background" {
-			propagation = metav1.DeletePropagationBackground
-		}
-
-		res.RecreateStatefulsetStrategy = &propagation
+		res.RecreateStatefulsetStrategy = getDeletionPropagationStrategy(cr.ObjectMeta.GetAnnotations())
 	}
 	return res
 }

pkg/k8sutils/statefulset.go

@@ -874,3 +874,27 @@ func getSidecars(sidecars *[]redisv1beta2.Sidecar) []redisv1beta2.Sidecar {
 	}
 	return *sidecars
 }
+
+// getDeletionPropagationStrategy returns the deletion propagation strategy based on the annotation
+func getDeletionPropagationStrategy(annotations map[string]string) *metav1.DeletionPropagation {
+	if annotations == nil {
+		return nil
+	}
+
+	if strategy, exists := annotations[AnnotationKeyRecreateStatefulsetStrategy]; exists {
+		var propagation metav1.DeletionPropagation
+
+		switch strings.ToLower(strategy) {
+		case "orphan":
+			propagation = metav1.DeletePropagationOrphan
+		case "background":
+			propagation = metav1.DeletePropagationBackground
+		default:
+			propagation = metav1.DeletePropagationForeground
+		}
+
+		return &propagation
+	}
+
+	return nil
+}