Rename updateStatus() to updateStatusConditions()

ChunyiLyu · ChunyiLyu · commit 8fe0de8cc825 · 2022-05-11T12:32:28.000+01:00
- the function updates statusConditions instead
of the entire object status
diff --git a/controllers/rabbitmqcluster_controller.go b/controllers/rabbitmqcluster_controller.go
@@ -167,7 +167,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		return ctrl.Result{}, err
 	}
 
-	if requeueAfter, err := r.updateStatus(ctx, rabbitmqCluster); err != nil || requeueAfter > 0 {
+	if requeueAfter, err := r.updateStatusConditions(ctx, rabbitmqCluster); err != nil || requeueAfter > 0 {
 		return ctrl.Result{RequeueAfter: requeueAfter}, err
 	}
 
@@ -322,7 +322,7 @@ func (r *RabbitmqClusterReconciler) logAndRecordOperationResult(logger logr.Logg
 	}
 }
 
-func (r *RabbitmqClusterReconciler) updateStatus(ctx context.Context, rmq *rabbitmqv1beta1.RabbitmqCluster) (time.Duration, error) {
+func (r *RabbitmqClusterReconciler) updateStatusConditions(ctx context.Context, rmq *rabbitmqv1beta1.RabbitmqCluster) (time.Duration, error) {
 	logger := ctrl.LoggerFrom(ctx)
 	childResources, err := r.getChildResources(ctx, rmq)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ`
`167`	`167`	`return ctrl.Result{}, err`
`168`	`168`	`}`
`169`	`169`
`170`		`- if requeueAfter, err := r.updateStatus(ctx, rabbitmqCluster); err != nil \|\| requeueAfter > 0 {`
	`170`	`+ if requeueAfter, err := r.updateStatusConditions(ctx, rabbitmqCluster); err != nil \|\| requeueAfter > 0 {`
`171`	`171`	`return ctrl.Result{RequeueAfter: requeueAfter}, err`
`172`	`172`	`}`
`173`	`173`
`@@ -322,7 +322,7 @@ func (r *RabbitmqClusterReconciler) logAndRecordOperationResult(logger logr.Logg`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`
`325`		`-func (r RabbitmqClusterReconciler) updateStatus(ctx context.Context, rmq rabbitmqv1beta1.RabbitmqCluster) (time.Duration, error) {`
	`325`	`+func (r RabbitmqClusterReconciler) updateStatusConditions(ctx context.Context, rmq rabbitmqv1beta1.RabbitmqCluster) (time.Duration, error) {`
`326`	`326`	`logger := ctrl.LoggerFrom(ctx)`
`327`	`327`	`childResources, err := r.getChildResources(ctx, rmq)`
`328`	`328`	`if err != nil {`