Skip to content

Commit aaf689f

Browse files
committed
fix(lint): fix funlen finding
Signed-off-by: Luca Burgazzoli <[email protected]>
1 parent 3ed62e2 commit aaf689f

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

internal/controller/operator/instance/dapr_instance_controller_reconcile.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828

2929
"github.com/dapr/kubernetes-operator/pkg/conditions"
3030

31-
k8serrors "k8s.io/apimachinery/pkg/api/errors"
3231
"k8s.io/apimachinery/pkg/api/meta"
3332
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3433
"k8s.io/apimachinery/pkg/types"
@@ -122,21 +121,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, res *daprApi.DaprInstance) (
122121
return rr.Resource.Status.Conditions[i].Type < rr.Resource.Status.Conditions[j].Type
123122
})
124123

125-
//
126-
// Update status
127-
//
128-
129124
err = r.Client().ApplyStatus(
130125
ctx,
131126
rr.Resource,
132127
client.ForceOwnership,
133128
client.FieldOwner(controller.FieldManager),
134129
)
135130

136-
if err != nil && k8serrors.IsConflict(err) {
137-
l.Info(err.Error())
138-
return ctrl.Result{Requeue: true}, nil
139-
} else if err != nil {
131+
if err != nil {
140132
errs = append(errs, err)
141133
}
142134

0 commit comments

Comments
 (0)