Skip to content
Snippets Groups Projects
Unverified Commit 294da09f authored by Mathieu Cesbron's avatar Mathieu Cesbron Committed by GitHub
Browse files

Add RedisCluster finalizer (#205)

parent 19d7ecf3
No related branches found
No related tags found
No related merge requests found
......@@ -54,6 +54,14 @@ func (r *RedisClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
return ctrl.Result{}, err
}
if err := k8sutils.HandleRedisClusterFinalizer(instance, r.Client); err != nil {
return ctrl.Result{}, err
}
if err := k8sutils.AddRedisClusterFinalizer(instance, r.Client); err != nil {
return ctrl.Result{}, err
}
if err := controllerutil.SetControllerReference(instance, instance, r.Scheme); err != nil {
return ctrl.Result{}, err
}
......
......@@ -3,14 +3,25 @@ package k8sutils
import (
"context"
redisv1beta1 "redis-operator/api/v1beta1"
"strconv"
"github.com/go-logr/logr"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
)
const RedisFinalizer string = "redisFinalizer"
const (
RedisFinalizer string = "redisFinalizer"
RedisClusterFinalizer string = "redisClusterFinalizer"
)
// finalizeLogger will generate logging interface
func finalizerLogger(namespace string, name string) logr.Logger {
reqLogger := log.WithValues("Request.Service.Namespace", namespace, "Request.Finalizer.Name", name)
return reqLogger
}
// HandleRedisFinalizer finalize resource if instance is marked to be deleted
func HandleRedisFinalizer(cr *redisv1beta1.Redis, cl client.Client) error {
......@@ -31,6 +42,27 @@ func HandleRedisFinalizer(cr *redisv1beta1.Redis, cl client.Client) error {
return nil
}
// HandleRedisClusterFinalizer finalize resource if instance is marked to be deleted
func HandleRedisClusterFinalizer(cr *redisv1beta1.RedisCluster, cl client.Client) error {
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
}
controllerutil.RemoveFinalizer(cr, RedisClusterFinalizer)
if err := cl.Update(context.TODO(), cr); err != nil {
logger.Error(err, "Could not remove finalizer "+RedisClusterFinalizer)
return err
}
}
}
return nil
}
// AddRedisFinalizer add finalizer for graceful deletion
func AddRedisFinalizer(cr *redisv1beta1.Redis, cl client.Client) error {
if !controllerutil.ContainsFinalizer(cr, RedisFinalizer) {
......@@ -40,6 +72,15 @@ func AddRedisFinalizer(cr *redisv1beta1.Redis, cl client.Client) error {
return nil
}
// AddRedisClusterFinalizer add finalizer for graceful deletion
func AddRedisClusterFinalizer(cr *redisv1beta1.RedisCluster, cl client.Client) error {
if !controllerutil.ContainsFinalizer(cr, RedisClusterFinalizer) {
controllerutil.AddFinalizer(cr, RedisClusterFinalizer)
return cl.Update(context.TODO(), cr)
}
return nil
}
// finalizeRedisServices delete Services
func finalizeRedisServices(cr *redisv1beta1.Redis) error {
serviceName, headlessServiceName := cr.Name, cr.Name+"-headless"
......@@ -52,8 +93,42 @@ func finalizeRedisServices(cr *redisv1beta1.Redis) error {
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
}
// finalizeRedisPVC delete PVC
func finalizeRedisPVC(cr *redisv1beta1.Redis) error {
PVCName := cr.Name + "-" + cr.Name + "-0"
return generateK8sClient().CoreV1().PersistentVolumeClaims(cr.Namespace).Delete(context.TODO(), PVCName, metav1.DeleteOptions{})
err := generateK8sClient().CoreV1().PersistentVolumeClaims(cr.Namespace).Delete(context.TODO(), PVCName, metav1.DeleteOptions{})
if err != nil && !errors.IsNotFound(err) {
return err
}
return nil
}
// finalizeRedisClusterPVC delete PVCs
func finalizeRedisClusterPVC(cr *redisv1beta1.RedisCluster) error {
logger := finalizerLogger(cr.Namespace, RedisClusterFinalizer)
for _, role := range []string{"leader", "follower"} {
for i := 0; i < int(cr.Spec.GetReplicaCounts(role)); i++ {
PVCName := cr.Name + "-" + role + "-" + cr.Name + "-" + role + "-" + strconv.Itoa(i)
err := generateK8sClient().CoreV1().PersistentVolumeClaims(cr.Namespace).Delete(context.TODO(), PVCName, metav1.DeleteOptions{})
if err != nil && !errors.IsNotFound(err) {
logger.Error(err, "Could not delete Persistent Volume Claim "+PVCName)
return err
}
}
}
return nil
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment