diff --git a/k8sutils/finalizer.go b/k8sutils/finalizer.go index cf9046c22ad6eeda57b6522fbc83556608c0a621..4ffd02a6081839a3c9fafaef1b7e0737dde7e8ec 100644 --- 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) @@ -158,63 +134,6 @@ func AddRedisSentinelFinalizer(cr *redisv1beta1.RedisSentinel, cl client.Client) return nil } -// finalizeRedisServices delete Services -func finalizeRedisServices(cr *redisv1beta1.Redis) error { - logger := finalizerLogger(cr.Namespace, RedisFinalizer) - serviceName, headlessServiceName := cr.Name, cr.Name+"-headless" - for _, svc := range []string{serviceName, headlessServiceName} { - err := generateK8sClient().CoreV1().Services(cr.Namespace).Delete(context.TODO(), svc, metav1.DeleteOptions{}) - if err != nil && !errors.IsNotFound(err) { - logger.Error(err, "Could not delete service "+svc) - return err - } - } - return nil -} - -// finalizeRedisClusterServices delete Services -func finalizeRedisClusterServices(cr *redisv1beta1.RedisCluster) error { - logger := finalizerLogger(cr.Namespace, RedisClusterFinalizer) - serviceName, headlessServiceName := cr.Name, cr.Name+"-headless" - for _, svc := range []string{serviceName, headlessServiceName} { - err := generateK8sClient().CoreV1().Services(cr.Namespace).Delete(context.TODO(), svc, metav1.DeleteOptions{}) - if err != nil && !errors.IsNotFound(err) { - logger.Error(err, "Could not delete service "+svc) - return err - } - } - return nil -} - -// finalize RedisReplicationServices delete Services -func finalizeRedisReplicationServices(cr *redisv1beta1.RedisReplication) error { - logger := finalizerLogger(cr.Namespace, RedisReplicationFinalizer) - serviceName, headlessServiceName := cr.Name, cr.Name+"-headless" - for _, svc := range []string{serviceName, headlessServiceName} { - err := generateK8sClient().CoreV1().Services(cr.Namespace).Delete(context.TODO(), svc, metav1.DeleteOptions{}) - if err != nil && !errors.IsNotFound(err) { - logger.Error(err, "Could not delete service "+svc) - return err - } - } - return nil -} - -// finalizeRedisSentinelServices delete Services -func finalizeRedisSentinelServices(cr *redisv1beta1.RedisSentinel) error { - logger := finalizerLogger(cr.Namespace, RedisSentinelFinalizer) - serviceName, headlessServiceName := cr.Name, cr.Name+"-headless" - for _, svc := range []string{serviceName, headlessServiceName} { - err := generateK8sClient().CoreV1().Services(cr.Namespace).Delete(context.TODO(), svc, metav1.DeleteOptions{}) - if err != nil && !errors.IsNotFound(err) { - logger.Error(err, "Could not delete service "+svc) - return err - } - } - return nil - -} - // finalizeRedisPVC delete PVC func finalizeRedisPVC(cr *redisv1beta1.Redis) error { logger := finalizerLogger(cr.Namespace, RedisFinalizer) @@ -270,43 +189,3 @@ func finalizeRedisSentinelPVC(cr *redisv1beta1.RedisSentinel) error { return nil } - -// finalizeRedisStatefulSet delete statefulset for Redis -func finalizeRedisStatefulSet(cr *redisv1beta1.Redis) error { - logger := finalizerLogger(cr.Namespace, RedisFinalizer) - err := generateK8sClient().AppsV1().StatefulSets(cr.Namespace).Delete(context.TODO(), cr.Name, metav1.DeleteOptions{}) - if err != nil && !errors.IsNotFound(err) { - logger.Error(err, "Could not delete StatefulSets "+cr.Name) - return err - } - return nil -} - -// finalizeRedisClusterStatefulSets delete statefulset for Redis Cluster -func finalizeRedisClusterStatefulSets(cr *redisv1beta1.RedisCluster) error { - logger := finalizerLogger(cr.Namespace, RedisClusterFinalizer) - for _, sts := range []string{cr.Name + "-leader", cr.Name + "-follower"} { - err := generateK8sClient().AppsV1().StatefulSets(cr.Namespace).Delete(context.TODO(), sts, metav1.DeleteOptions{}) - if err != nil && !errors.IsNotFound(err) { - logger.Error(err, "Could not delete statefulset "+sts) - return err - } - } - return nil -} - -// finalizeRedisReplicationStatefulSets delete statefulset for Redis Replication -func finalizeRedisReplicationStatefulSets(cr *redisv1beta1.RedisReplication) error { - logger := finalizerLogger(cr.Namespace, RedisReplicationFinalizer) - err := generateK8sClient().AppsV1().StatefulSets(cr.Namespace).Delete(context.TODO(), cr.Name, metav1.DeleteOptions{}) - if err != nil && !errors.IsNotFound(err) { - logger.Error(err, "Could not delete StatefulSets "+cr.Name) - return err - } - return nil -} - -func finalizeRedisSentinelStatefulSets(cr *redisv1beta1.RedisSentinel) error { - - return nil -}