diff --git a/controllers/rabbitmqcluster_controller.go b/controllers/rabbitmqcluster_controller.go index fc8d26a0f..07fb006c3 100644 --- a/controllers/rabbitmqcluster_controller.go +++ b/controllers/rabbitmqcluster_controller.go @@ -382,8 +382,6 @@ func (r *RabbitmqClusterReconciler) markForQueueRebalance(ctx context.Context, r } rmq.ObjectMeta.Annotations[queueRebalanceAnnotation] = time.Now().Format(time.RFC3339) - if err := r.Update(ctx, rmq); err != nil { - return err - } - return nil + + return r.Update(ctx, rmq) } diff --git a/controllers/reconcile_finalizer.go b/controllers/reconcile_finalizer.go index 566976225..6841247cd 100644 --- a/controllers/reconcile_finalizer.go +++ b/controllers/reconcile_finalizer.go @@ -31,11 +31,7 @@ func (r *RabbitmqClusterReconciler) addFinalizerIfNeeded(ctx context.Context, ra func (r *RabbitmqClusterReconciler) removeFinalizer(ctx context.Context, rabbitmqCluster *rabbitmqv1beta1.RabbitmqCluster) error { controllerutil.RemoveFinalizer(rabbitmqCluster, deletionFinalizer) - if err := r.Client.Update(ctx, rabbitmqCluster); err != nil { - return err - } - - return nil + return r.Client.Update(ctx, rabbitmqCluster) } func (r *RabbitmqClusterReconciler) prepareForDeletion(ctx context.Context, rabbitmqCluster *rabbitmqv1beta1.RabbitmqCluster) error {