refactor: reconcile on statefulset update

Signed-off-by: drivebyer <yang.wu@daocloud.io>
OT-CONTAINER-KIT · Jun 14, 2024 · 93d4ea2 · 93d4ea2
1 parent 46ded9f
commit 93d4ea2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/controllers/rediscluster_controller.go b/controllers/rediscluster_controller.go
@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"errors"
 	"strconv"
 	"time"
 
@@ -26,7 +27,7 @@ import (
 	"github.com/OT-CONTAINER-KIT/redis-operator/k8sutils"
 	intctrlutil "github.com/OT-CONTAINER-KIT/redis-operator/pkg/controllerutil"
 	"github.com/go-logr/logr"
-	"k8s.io/apimachinery/pkg/api/errors"
+	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
@@ -123,12 +124,8 @@ func (r *RedisClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return intctrlutil.RequeueWithError(err, reqLogger, "")
 	}
 
-	// todo: remove me after watch statefulset in controller
 	redisLeaderInfo, err := k8sutils.GetStatefulSet(r.K8sClient, r.Log, instance.GetNamespace(), instance.GetName()+"-leader")
 	if err != nil {
-		if errors.IsNotFound(err) {
-			return intctrlutil.RequeueAfter(reqLogger, time.Second*60, "")
-		}
 		return intctrlutil.RequeueWithError(err, reqLogger, "")
 	}
 
@@ -157,12 +154,8 @@ func (r *RedisClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 			return intctrlutil.RequeueWithError(err, reqLogger, "")
 		}
 	}
-	// todo: remove me after watch statefulset in controller
 	redisFollowerInfo, err := k8sutils.GetStatefulSet(r.K8sClient, r.Log, instance.GetNamespace(), instance.GetName()+"-follower")
 	if err != nil {
-		if errors.IsNotFound(err) {
-			return intctrlutil.RequeueAfter(reqLogger, time.Second*60, "")
-		}
 		return intctrlutil.RequeueWithError(err, reqLogger, "")
 	}
 
@@ -171,7 +164,7 @@ func (r *RedisClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 
 	if !(r.IsStatefulSetReady(ctx, instance.Namespace, instance.Name+"-leader") && r.IsStatefulSetReady(ctx, instance.Namespace, instance.Name+"-follower")) {
-		return intctrlutil.RequeueAfter(reqLogger, time.Second*60, "Redis leader and follower nodes are not ready yet")
+		return intctrlutil.RequeueWithError(errors.New("redis leader and follower nodes are not ready yet"), reqLogger, "")
 	}
 
 	// Mark the cluster status as bootstrapping if all the leader and follower nodes are ready
@@ -239,5 +232,6 @@ func (r *RedisClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 func (r *RedisClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&redisv1beta2.RedisCluster{}).
+		Owns(&appsv1.StatefulSet{}).
 		Complete(r)
 }
diff --git a/controllers/redisreplication_controller.go b/controllers/redisreplication_controller.go
@@ -9,6 +9,7 @@ import (
 	"github.com/OT-CONTAINER-KIT/redis-operator/k8sutils"
 	intctrlutil "github.com/OT-CONTAINER-KIT/redis-operator/pkg/controllerutil"
 	"github.com/go-logr/logr"
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
@@ -67,12 +68,12 @@ func (r *RedisReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 	redisReplicationInfo, err := k8sutils.GetStatefulSet(r.K8sClient, r.Log, instance.GetNamespace(), instance.GetName())
 	if err != nil {
-		return intctrlutil.RequeueAfter(reqLogger, time.Second*60, "")
+		return intctrlutil.RequeueWithError(err, reqLogger, "")
 	}
 
 	// Check that the Leader and Follower are ready in redis replication
 	if redisReplicationInfo.Status.ReadyReplicas != totalReplicas {
-		return intctrlutil.RequeueAfter(reqLogger, time.Second*60, "Redis replication nodes are not ready yet", "Ready.Replicas", redisReplicationInfo.Status.ReadyReplicas, "Expected.Replicas", totalReplicas)
+		return intctrlutil.RequeueWithError(err, reqLogger, "Redis replication nodes are not ready yet", "Ready.Replicas", redisReplicationInfo.Status.ReadyReplicas, "Expected.Replicas", totalReplicas)
 	}
 
 	var realMaster string
@@ -138,5 +139,6 @@ func (r *RedisReplicationReconciler) UpdateRedisPodRoleLabel(ctx context.Context
 func (r *RedisReplicationReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&redisv1beta2.RedisReplication{}).
+		Owns(&appsv1.StatefulSet{}).
 		Complete(r)
 }