Remove redundant finalizers

Signed-off-by: muicoder <[email protected]> because of CRs ownerReferences have already been associated
OT-CONTAINER-KIT · Jul 4, 2023 · 000f51f · 000f51f
1 parent 0d17bf9
commit 000f51f
Showing 1 changed file with 0 additions and 24 deletions.
diff --git a/k8sutils/finalizer.go b/k8sutils/finalizer.go
@@ -31,15 +31,9 @@ func HandleRedisFinalizer(cr *redisv1beta1.Redis, cl client.Client) error {
 	logger := finalizerLogger(cr.Namespace, RedisFinalizer)
 	if cr.GetDeletionTimestamp() != nil {
 		if controllerutil.ContainsFinalizer(cr, RedisFinalizer) {
-			if err := finalizeRedisServices(cr); err != nil {
-				return err
-			}
 			if err := finalizeRedisPVC(cr); err != nil {
 				return err
 			}
-			if err := finalizeRedisStatefulSet(cr); err != nil {
-				return err
-			}
 			controllerutil.RemoveFinalizer(cr, RedisFinalizer)
 			if err := cl.Update(context.TODO(), cr); err != nil {
 				logger.Error(err, "Could not remove finalizer "+RedisFinalizer)
@@ -55,15 +49,9 @@ func HandleRedisClusterFinalizer(cr *redisv1beta1.RedisCluster, cl client.Client
 	logger := finalizerLogger(cr.Namespace, RedisClusterFinalizer)
 	if cr.GetDeletionTimestamp() != nil {
 		if controllerutil.ContainsFinalizer(cr, RedisClusterFinalizer) {
-			if err := finalizeRedisClusterServices(cr); err != nil {
-				return err
-			}
 			if err := finalizeRedisClusterPVC(cr); err != nil {
 				return err
 			}
-			if err := finalizeRedisClusterStatefulSets(cr); err != nil {
-				return err
-			}
 			controllerutil.RemoveFinalizer(cr, RedisClusterFinalizer)
 			if err := cl.Update(context.TODO(), cr); err != nil {
 				logger.Error(err, "Could not remove finalizer "+RedisClusterFinalizer)
@@ -79,15 +67,9 @@ func HandleRedisReplicationFinalizer(cr *redisv1beta1.RedisReplication, cl clien
 	logger := finalizerLogger(cr.Namespace, RedisReplicationFinalizer)
 	if cr.GetDeletionTimestamp() != nil {
 		if controllerutil.ContainsFinalizer(cr, RedisReplicationFinalizer) {
-			if err := finalizeRedisReplicationServices(cr); err != nil {
-				return err
-			}
 			if err := finalizeRedisReplicationPVC(cr); err != nil {
 				return err
 			}
-			if err := finalizeRedisReplicationStatefulSets(cr); err != nil {
-				return err
-			}
 			controllerutil.RemoveFinalizer(cr, RedisReplicationFinalizer)
 			if err := cl.Update(context.TODO(), cr); err != nil {
 				logger.Error(err, "Could not remove finalizer "+RedisReplicationFinalizer)
@@ -103,15 +85,9 @@ func HandleRedisSentinelFinalizer(cr *redisv1beta1.RedisSentinel, cl client.Clie
 	logger := finalizerLogger(cr.Namespace, RedisSentinelFinalizer)
 	if cr.GetDeletionTimestamp() != nil {
 		if controllerutil.ContainsFinalizer(cr, RedisSentinelFinalizer) {
-			if err := finalizeRedisSentinelServices(cr); err != nil {
-				return err
-			}
 			if err := finalizeRedisSentinelPVC(cr); err != nil {
 				return err
 			}
-			if err := finalizeRedisSentinelStatefulSets(cr); err != nil {
-				return err
-			}
 			controllerutil.RemoveFinalizer(cr, RedisSentinelFinalizer)
 			if err := cl.Update(context.TODO(), cr); err != nil {
 				logger.Error(err, "Could not remove finalizer "+RedisSentinelFinalizer)