fix(lint): fix funlen finding

Signed-off-by: Luca Burgazzoli <[email protected]>
lburgazzoli · Sep 25, 2024 · aaf689f · aaf689f
1 parent 3ed62e2
commit aaf689f
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/internal/controller/operator/instance/dapr_instance_controller_reconcile.go b/internal/controller/operator/instance/dapr_instance_controller_reconcile.go
@@ -28,7 +28,6 @@ import (
 
 	"github.com/dapr/kubernetes-operator/pkg/conditions"
 
-	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -122,21 +121,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, res *daprApi.DaprInstance) (
 		return rr.Resource.Status.Conditions[i].Type < rr.Resource.Status.Conditions[j].Type
 	})
 
-	//
-	// Update status
-	//
-
 	err = r.Client().ApplyStatus(
 		ctx,
 		rr.Resource,
 		client.ForceOwnership,
 		client.FieldOwner(controller.FieldManager),
 	)
 
-	if err != nil && k8serrors.IsConflict(err) {
-		l.Info(err.Error())
-		return ctrl.Result{Requeue: true}, nil
-	} else if err != nil {
+	if err != nil {
 		errs = append(errs, err)
 	}