Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ import (
"fmt"
"sort"

"github.com/dapr/kubernetes-operator/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/client"

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

k8serrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -123,7 +126,12 @@ func (r *Reconciler) Reconcile(ctx context.Context, res *daprApi.DaprInstance) (
// Update status
//

err = r.Client().Status().Update(ctx, rr.Resource)
err = r.Client().ApplyStatus(
ctx,
rr.Resource,
client.ForceOwnership,
client.FieldOwner(controller.FieldManager),
)

if err != nil && k8serrors.IsConflict(err) {
l.Info(err.Error())
Expand Down
23 changes: 23 additions & 0 deletions pkg/controller/client/client.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package client

import (
"context"
"fmt"
"time"

"github.com/dapr/kubernetes-operator/pkg/resources"

"golang.org/x/time/rate"
apiextv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down Expand Up @@ -151,3 +154,23 @@ func (c *Client) Invalidate() {
c.discoveryCache.Invalidate()
}
}

func (c *Client) ApplyStatus(ctx context.Context, obj ctrl.Object, opts ...ctrl.SubResourcePatchOption) error {
u, err := resources.ToUnstructured(c.Scheme(), obj)
if err != nil {
return fmt.Errorf("unable to convert object %s to unstructured: %w", obj, err)
}

// Reset field not meaningful for patch
delete(u.Object, "spec")

u.SetResourceVersion("")
u.SetManagedFields(nil)

err = c.Client.Status().Patch(ctx, u, ctrl.Apply, opts...)
if err != nil {
return fmt.Errorf("unable to pactch object %s: %w", obj, err)
}

return nil
}
13 changes: 0 additions & 13 deletions pkg/resources/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import (

"k8s.io/apimachinery/pkg/runtime"

"k8s.io/apimachinery/pkg/runtime/schema"

"github.com/dapr/kubernetes-operator/pkg/pointer"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -88,17 +86,6 @@ func Ref(obj client.Object) string {
)
}

func UnstructuredFor(group string, version string, kind string) *unstructured.Unstructured {
u := unstructured.Unstructured{}
u.SetGroupVersionKind(schema.GroupVersionKind{
Kind: kind,
Group: group,
Version: version,
})

return &u
}

func ToUnstructured(s *runtime.Scheme, obj runtime.Object) (*unstructured.Unstructured, error) {
switch ot := obj.(type) {
case *unstructured.Unstructured:
Expand Down