dapr
/
kubernetes-operator
mirror of https://github.com/dapr/kubernetes-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(lint): fix funlen finding 

Signed-off-by: Luca Burgazzoli <lburgazzoli@gmail.com>
This commit is contained in:
Luca Burgazzoli 2024-09-25 10:52:05 +02:00 committed by Luca Burgazzoli
parent 3ed62e28f5
commit aaf689fb16
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/controller/operator/instance/dapr_instance_controller_reconcile.go
View File

@ -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,10 +121,6 @@ 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,
@ -133,10 +128,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, res *daprApi.DaprInstance) (
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)
}