fixed update crd status each Reconcile loop

Author: polefishu

pkg/apis/redis/v1alpha1/distributedrediscluster_types.go

@@ -74,7 +74,7 @@ type PrometheusSpec struct {
 	Labels map[string]string `json:"labels,omitempty"`
 
 	// Interval at which metrics should be scraped
-	Interval    string            `json:"interval,omitempty"`
+	Interval string `json:"interval,omitempty"`
 	//Annotations map[string]string `json:"annotations,omitempty"`
 }
 

pkg/controller/distributedrediscluster/distributedrediscluster_controller.go

@@ -61,7 +61,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 
 	pred := predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
-			log.WithValues("namespace", e.MetaNew.GetNamespace(), "name", e.MetaNew.GetName()).Info("Call UpdateFunc")
+			log.WithValues("namespace", e.MetaNew.GetNamespace(), "name", e.MetaNew.GetName()).V(5).Info("Call UpdateFunc")
 			// Ignore updates to CR status in which case metadata.Generation does not change
 			if e.MetaOld.GetGeneration() != e.MetaNew.GetGeneration() {
 				log.WithValues("namespace", e.MetaNew.GetNamespace(), "name", e.MetaNew.GetName()).Info("Generation change return true")
@@ -171,7 +171,7 @@ func (r *ReconcileDistributedRedisCluster) Reconcile(request reconcile.Request)
 		return reconcile.Result{}, err
 	}
 
-	status := buildClusterStatus(clusterInfos, redisClusterPods.Items)
+	status := buildClusterStatus(clusterInfos, redisClusterPods.Items, &instance.Status)
 	reqLogger.V(4).Info("buildClusterStatus", "status", status)
 	r.updateClusterIfNeed(instance, status)
 
@@ -188,35 +188,8 @@ func (r *ReconcileDistributedRedisCluster) Reconcile(request reconcile.Request)
 			return reconcile.Result{}, Redis.Wrap(err, "GetClusterInfos")
 		}
 	}
-	newStatus := buildClusterStatus(newClusterInfos, redisClusterPods.Items)
+	newStatus := buildClusterStatus(newClusterInfos, redisClusterPods.Items, &instance.Status)
 	SetClusterOK(newStatus, "OK")
 	r.updateClusterIfNeed(instance, newStatus)
 	return reconcile.Result{RequeueAfter: requeueEnsure}, nil
-	//// Define a new Pod object
-	//pod := newPodForCR(instance)
-	//
-	//// Set DistributedRedisCluster instance as the owner and controller
-	//if err := controllerutil.SetControllerReference(instance, pod, r.scheme); err != nil {
-	//	return reconcile.Result{}, err
-	//}
-
-	// Check if this Pod already exists
-	//found := &corev1.Pod{}
-	//err = r.client.Get(context.TODO(), types.NamespacedName{Name: pod.Name, Namespace: pod.Namespace}, found)
-	//if err != nil && errors.IsNotFound(err) {
-	//	reqLogger.Info("Creating a new Pod", "Pod.Namespace", pod.Namespace, "Pod.Name", pod.Name)
-	//	err = r.client.Create(context.TODO(), pod)
-	//	if err != nil {
-	//		return reconcile.Result{}, err
-	//	}
-	//
-	//	// Pod created successfully - don't requeue
-	//	return reconcile.Result{}, nil
-	//} else if err != nil {
-	//	return reconcile.Result{}, err
-	//}
-
-	// Pod already exists - don't requeue
-	//reqLogger.Info("Skip reconcile: Pod already exists", "Pod.Namespace", found.Namespace, "Pod.Name", found.Name)
-	//return reconcile.Result{}, nil
 }

pkg/controller/distributedrediscluster/status.go

@@ -30,15 +30,11 @@ func SetClusterScaling(status *redisv1alpha1.DistributedRedisClusterStatus, reas
 	status.Reason = reason
 }
 
-func buildClusterStatus(clusterInfos *redisutil.ClusterInfos, pods []corev1.Pod) *redisv1alpha1.DistributedRedisClusterStatus {
-	status := &redisv1alpha1.DistributedRedisClusterStatus{}
-	//if err == nil {
-	//	status.Status = redisv1alpha1.ClusterStatusOK
-	//	status.Reason = "OK"
-	//} else {
-	//	status.Status = redisv1alpha1.ClusterStatusKO
-	//	status.Reason = err.Error()
-	//}
+func buildClusterStatus(clusterInfos *redisutil.ClusterInfos, pods []corev1.Pod, oldStatus *redisv1alpha1.DistributedRedisClusterStatus) *redisv1alpha1.DistributedRedisClusterStatus {
+	status := &redisv1alpha1.DistributedRedisClusterStatus{
+		Status: oldStatus.Status,
+		Reason: oldStatus.Reason,
+	}
 
 	nbMaster := int32(0)
 	nbSlaveByMaster := map[string]int{}
@@ -98,18 +94,6 @@ func (r *ReconcileDistributedRedisCluster) updateClusterIfNeed(cluster *redisv1a
 }
 
 func compareStatus(old, new *redisv1alpha1.DistributedRedisClusterStatus) bool {
-	if old.Status != new.Status || old.Reason != new.Reason {
-		return true
-	}
-
-	if old.NumberOfMaster != new.NumberOfMaster {
-		return true
-	}
-
-	if len(old.Nodes) != len(new.Nodes) {
-		return true
-	}
-
 	if compareStringValue("ClusterStatus", string(old.Status), string(new.Status)) {
 		return true
 	}