feat: update code to align with pr comments

Author: jonathanCaamano

controllers/rabbitmqcluster_controller.go

@@ -213,7 +213,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 					}
 				}
 				if r.scaleFromZero(current, sts) {
-					if r.scaleDownFromZero(ctx, rabbitmqCluster, sts) {
+					if r.scaleFromZeroToBeforeReplicasConfigured(ctx, rabbitmqCluster, sts) {
 						// return when cluster scale down from zero detected; unsupported operation
 						return ctrl.Result{}, nil
 					}
@@ -227,7 +227,6 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 				return ctrl.Result{}, err
 			}
 		}
-
 		var operationResult controllerutil.OperationResult
 		err = clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error {
 			var apiError error
@@ -263,9 +262,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

@@ -31,7 +31,7 @@ func (r *RabbitmqClusterReconciler) scaleFromZero(current, sts *appsv1.StatefulS
 }
 
 // scaleDownFromZero checks if the current replicas is desired replicas would be greatter than replicas configured before zero state.
-func (r *RabbitmqClusterReconciler) scaleDownFromZero(ctx context.Context, cluster *v1beta1.RabbitmqCluster, sts *appsv1.StatefulSet) bool {
+func (r *RabbitmqClusterReconciler) scaleFromZeroToBeforeReplicasConfigured(ctx context.Context, cluster *v1beta1.RabbitmqCluster, sts *appsv1.StatefulSet) bool {
 	var err error
 	var beforeZeroReplicas int64
 	desiredReplicas := *sts.Spec.Replicas
@@ -50,9 +50,8 @@ func (r *RabbitmqClusterReconciler) scaleDownFromZero(ctx context.Context, clust
 		}
 		return true
 	}
-
-	if desiredReplicas < int32(beforeZeroReplicas) {
-		msg := fmt.Sprintf("Cluster Scale down not supported; tried to scale cluster from %d nodes to %d nodes", int32(beforeZeroReplicas), desiredReplicas)
+	if desiredReplicas != int32(beforeZeroReplicas) {
+		msg := fmt.Sprintf("Cluster Scale from zero to other replicas than before configured not supported; tried to scale cluster from %d nodes to %d nodes", int32(beforeZeroReplicas), desiredReplicas)
 		reason := "UnsupportedOperation"
 		err = r.recordEventsAndSetCondition(ctx, cluster, status.ReconcileSuccess, corev1.ConditionFalse, corev1.EventTypeWarning, reason, msg)
 		if err != nil {
@@ -61,6 +60,7 @@ func (r *RabbitmqClusterReconciler) scaleDownFromZero(ctx context.Context, clust
 		return true
 	}
 	return false
+
 }
 
 // saveReplicasBeforeZero saves the current replicas count in an annotation before scaling down to zero.
@@ -90,9 +90,6 @@ func (r *RabbitmqClusterReconciler) recordEventsAndSetCondition(ctx context.Cont
 	logger.Error(errors.New(reason), msg)
 	r.Recorder.Event(cluster, eventType, reason, msg)
 	cluster.Status.SetCondition(condType, condStatus, reason, msg)
-	if statusErr := r.Status().Update(ctx, cluster); statusErr != nil {
-		logger.Error(statusErr, "Failed to update ReconcileSuccess condition state")
-	}
+	statusErr = r.Status().Update(ctx, cluster)
 	return statusErr
-
 }

controllers/reconcile_scale_zero_test.go

@@ -202,7 +202,7 @@ var _ = Describe("Cluster scale from zero to less replicas configured", Ordered,
 
 		By("setting 'Warning' events", func() {
 			Expect(aggregateEventMsgs(ctx, cluster, "UnsupportedOperation")).To(
-				ContainSubstring("Cluster Scale down not supported"))
+				ContainSubstring("Cluster Scale from zero to other replicas than before configured not supported"))
 		})
 
 		By("setting ReconcileSuccess to 'false'", func() {
@@ -225,7 +225,7 @@ var _ = Describe("Cluster scale from zero to less replicas configured", Ordered,
 				return "ReconcileSuccess status: condition not present"
 			}, 0).Should(Equal("ReconcileSuccess status: False, " +
 				"with reason: UnsupportedOperation " +
-				"and message: Cluster Scale down not supported; tried to scale cluster from 2 nodes to 1 nodes"))
+				"and message: Cluster Scale from zero to other replicas than before configured not supported; tried to scale cluster from 2 nodes to 1 nodes"))
 		})
 	})
 })

internal/status/all_replicas_ready.go

@@ -41,6 +41,13 @@ func AllReplicasReadyCondition(resources []runtime.Object,
 			if resource.Spec.Replicas != nil {
 				desiredReplicas = *resource.Spec.Replicas
 			}
+
+			if desiredReplicas == 0 {
+				condition.Status = corev1.ConditionFalse
+				condition.Reason = "ScaledToZero"
+				goto assignLastTransitionTime
+			}
+
 			if desiredReplicas == resource.Status.ReadyReplicas {
 				condition.Status = corev1.ConditionTrue
 				condition.Reason = "AllPodsAreReady"