feat: add changes asked in pr

Author: jonathanCaamano

controllers/rabbitmqcluster_controller.go

@@ -201,7 +201,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 				if err := builder.Update(sts); err != nil {
 					return ctrl.Result{}, err
 				}
-				if r.scaleToZero(current, sts) {
+				if ScaleToZero(current, sts) {
 					err := r.saveReplicasBeforeZero(ctx, rabbitmqCluster, current)
 					if err != nil {
 						return ctrl.Result{}, err
@@ -212,7 +212,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 						return ctrl.Result{}, nil
 					}
 				}
-				if r.scaleFromZero(current, sts) {
+				if ScaleFromZero(current, sts) {
 					if r.scaleFromZeroToBeforeReplicasConfigured(ctx, rabbitmqCluster, sts) {
 						// return when cluster scale down from zero detected; unsupported operation
 						return ctrl.Result{}, nil
@@ -226,6 +226,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 				r.setReconcileSuccess(ctx, rabbitmqCluster, corev1.ConditionFalse, "FailedReconcilePVC", err.Error())
 				return ctrl.Result{}, err
 			}
+
 		}
 		var operationResult controllerutil.OperationResult
 		err = clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error {
@@ -262,9 +263,9 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		}
 		return ctrl.Result{RequeueAfter: requeueAfter}, err
 	}
+
 	// Set ReconcileSuccess to true and update observedGeneration after all reconciliation steps have finished with no error
 	rabbitmqCluster.Status.ObservedGeneration = rabbitmqCluster.GetGeneration()
-
 	r.setReconcileSuccess(ctx, rabbitmqCluster, corev1.ConditionTrue, "Success", "Finish reconciling")
 
 	logger.Info("Finished reconciling")

controllers/reconcile_scale_zero.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strconv"
 
@@ -16,22 +15,23 @@ import (
 
 const beforeZeroReplicasConfigured = "rabbitmq.com/before-zero-replicas-configured"
 
-// scaleToZero checks if the desired replicas is zero and the current replicas is not zero.
-func (r *RabbitmqClusterReconciler) scaleToZero(current, sts *appsv1.StatefulSet) bool {
+// ScaleToZero checks if the desired replicas is zero and the current replicas is not zero.
+func ScaleToZero(current, sts *appsv1.StatefulSet) bool {
 	currentReplicas := *current.Spec.Replicas
 	desiredReplicas := *sts.Spec.Replicas
 	return desiredReplicas == 0 && currentReplicas > 0
 }
 
-// scaleFromZero checks if the current replicas is zero and the desired replicas is greater than zero.
-func (r *RabbitmqClusterReconciler) scaleFromZero(current, sts *appsv1.StatefulSet) bool {
+// ScaleFromZero checks if the current replicas is zero and the desired replicas is greater than zero.
+func ScaleFromZero(current, sts *appsv1.StatefulSet) bool {
 	currentReplicas := *current.Spec.Replicas
 	desiredReplicas := *sts.Spec.Replicas
 	return currentReplicas == 0 && desiredReplicas > 0
 }
 
 // scaleDownFromZero checks if the current replicas is desired replicas would be greatter than replicas configured before zero state.
 func (r *RabbitmqClusterReconciler) scaleFromZeroToBeforeReplicasConfigured(ctx context.Context, cluster *v1beta1.RabbitmqCluster, sts *appsv1.StatefulSet) bool {
+	logger := ctrl.LoggerFrom(ctx)
 	var err error
 	var beforeZeroReplicas int64
 	desiredReplicas := *sts.Spec.Replicas
@@ -46,7 +46,7 @@ func (r *RabbitmqClusterReconciler) scaleFromZeroToBeforeReplicasConfigured(ctx
 		reason := "TransformErrorOperation"
 		err = r.recordEventsAndSetCondition(ctx, cluster, status.ReconcileSuccess, corev1.ConditionFalse, corev1.EventTypeWarning, reason, msg)
 		if err != nil {
-			return true
+			logger.V(1).Info(err.Error())
 		}
 		return true
 	}
@@ -55,7 +55,7 @@ func (r *RabbitmqClusterReconciler) scaleFromZeroToBeforeReplicasConfigured(ctx
 		reason := "UnsupportedOperation"
 		err = r.recordEventsAndSetCondition(ctx, cluster, status.ReconcileSuccess, corev1.ConditionFalse, corev1.EventTypeWarning, reason, msg)
 		if err != nil {
-			return true
+			logger.V(1).Info(err.Error())
 		}
 		return true
 	}
@@ -66,15 +66,13 @@ func (r *RabbitmqClusterReconciler) scaleFromZeroToBeforeReplicasConfigured(ctx
 // saveReplicasBeforeZero saves the current replicas count in an annotation before scaling down to zero.
 // This is used to prevent scaling down when the cluster change from zero replicas to a number less than the saved replicas count.
 func (r *RabbitmqClusterReconciler) saveReplicasBeforeZero(ctx context.Context, cluster *v1beta1.RabbitmqCluster, current *appsv1.StatefulSet) error {
-	var err error
 	currentReplicas := *current.Spec.Replicas
 	logger := ctrl.LoggerFrom(ctx)
-	msg := "Cluster Scale down to 0 replicas."
+	msg := "Cluster Scale down to 0 replicas"
 	reason := "ScaleDownToZero"
 	logger.Info(msg)
-	err = r.updateAnnotation(ctx, cluster, cluster.Namespace, cluster.Name, beforeZeroReplicasConfigured, fmt.Sprint(currentReplicas))
 	r.Recorder.Event(cluster, corev1.EventTypeNormal, reason, msg)
-	return err
+	return r.updateAnnotation(ctx, cluster, cluster.Namespace, cluster.Name, beforeZeroReplicasConfigured, fmt.Sprint(currentReplicas))
 }
 
 // If the annotation rabbitmq.com/before-zero-replicas-configured exists it will be deleted.
@@ -85,11 +83,7 @@ func (r *RabbitmqClusterReconciler) removeReplicasBeforeZeroAnnotationIfExists(c
 }
 
 func (r *RabbitmqClusterReconciler) recordEventsAndSetCondition(ctx context.Context, cluster *v1beta1.RabbitmqCluster, condType status.RabbitmqClusterConditionType, condStatus corev1.ConditionStatus, eventType, reason, msg string) error {
-	logger := ctrl.LoggerFrom(ctx)
-	var statusErr error
-	logger.Error(errors.New(reason), msg)
 	r.Recorder.Event(cluster, eventType, reason, msg)
 	cluster.Status.SetCondition(condType, condStatus, reason, msg)
-	statusErr = r.Status().Update(ctx, cluster)
-	return statusErr
+	return r.Status().Update(ctx, cluster)
 }