Client updates

Author: tmshort

Diff for: pkg/lib/controller-runtime/client/fake_ssa.go

@@ -35,8 +35,7 @@ type fakeStatusWriter struct {
 	k8scontrollerclient.StatusWriter
 }
 
-func (c fakeStatusWriter) Patch(ctx context.Context, obj k8scontrollerclient.Object, patch k8scontrollerclient.Patch, opts ...k8scontrollerclient.PatchOption) error {
-	patch, opts = convertApplyToMergePatch(patch, opts...)
+func (c fakeStatusWriter) Patch(ctx context.Context, obj k8scontrollerclient.Object, patch k8scontrollerclient.Patch, opts ...k8scontrollerclient.SubResourcePatchOption) error {
 	return c.StatusWriter.Patch(ctx, obj, patch, opts...)
 }
 

Diff for: pkg/lib/controller-runtime/client/ssa.go

@@ -182,7 +182,7 @@ func (c *ServerSideApplier) Apply(ctx context.Context, obj Object, changeFunc in
 			return err
 		}
 
-		if err := c.client.Status().Patch(ctx, cp, k8scontrollerclient.Apply, k8scontrollerclient.ForceOwnership, c.Owner); err != nil {
+		if err := c.client.Status().Patch(ctx, cp, k8scontrollerclient.Apply, c.Owner); err != nil {
 			fmt.Printf("second patch error: %s\n", err)
 			return err
 		}