fixup! Add server-side apply patch support

Author: DirectXMan12

pkg/client/client.go

@@ -178,3 +178,11 @@ func (sw *statusWriter) Update(ctx context.Context, obj runtime.Object) error {
 	}
 	return sw.client.typedClient.UpdateStatus(ctx, obj)
 }
+
+func (sw *statusWriter) Patch(ctx context.Context, obj runtime.Object, patch Patch, opts ...PatchOptionFunc) error {
+	_, ok := obj.(*unstructured.Unstructured)
+	if ok {
+		return sw.client.unstructuredClient.PatchStatus(ctx, obj, patch, opts...)
+	}
+	return sw.client.typedClient.PatchStatus(ctx, obj, patch, opts...)
+}

pkg/client/interfaces.go

@@ -86,10 +86,17 @@ type StatusClient interface {
 
 // StatusWriter knows how to update status subresource of a Kubernetes object.
 type StatusWriter interface {
+	// TODO(directxman12): add update options to this
+
 	// Update updates the fields corresponding to the status subresource for the
 	// given obj. obj must be a struct pointer so that obj can be updated
 	// with the content returned by the Server.
 	Update(ctx context.Context, obj runtime.Object) error
+
+	// Patch patches the given object's subresource. obj must be a struct
+	// pointer so that obj can be updated with the content returned by the
+	// Server.
+	Patch(ctx context.Context, obj runtime.Object, patch Patch, opts ...PatchOptionFunc) error
 }
 
 // Client knows how to perform CRUD operations on Kubernetes objects.

pkg/client/options.go

@@ -355,6 +355,10 @@ type PatchOptions struct {
 	// It's probably what controllers want to do.
 	Force *bool
 
+	// FieldManager is the name of the user or component submitting
+	// this request.  It must be set with server-side apply.
+	FieldManager string
+
 	// Raw represets raw patch options, passed directly to the server.
 	Raw *metav1.PatchOptions
 }
@@ -378,6 +382,7 @@ func (o *PatchOptions) AsPatchOptions() *metav1.PatchOptions {
 
 	o.Raw.DryRun = o.DryRun
 	o.Raw.Force = o.Force
+	o.Raw.FieldManager = o.FieldManager
 	return o.Raw
 }
 
@@ -400,3 +405,10 @@ var ForceOwnership PatchOptionFunc = func(opts *PatchOptions) {
 var PatchDryRunAll PatchOptionFunc = func(opts *PatchOptions) {
 	opts.DryRun = []string{metav1.DryRunAll}
 }
+
+// FieldManager set the field manager name for the given server-side apply patch.
+func FieldManager(name string) PatchOptionFunc {
+	return func(opts *PatchOptions) {
+		opts.FieldManager = name
+	}
+}

pkg/client/typed_client.go

@@ -161,3 +161,28 @@ func (c *typedClient) UpdateStatus(ctx context.Context, obj runtime.Object) erro
 		Do().
 		Into(obj)
 }
+
+// PatchStatus used by StatusWriter to write status.
+func (c *typedClient) PatchStatus(ctx context.Context, obj runtime.Object, patch Patch, opts ...PatchOptionFunc) error {
+	o, err := c.cache.getObjMeta(obj)
+	if err != nil {
+		return err
+	}
+
+	data, err := patch.Data(obj)
+	if err != nil {
+		return err
+	}
+
+	patchOpts := &PatchOptions{}
+	return o.Patch(patch.Type()).
+		NamespaceIfScoped(o.GetNamespace(), o.isNamespaced()).
+		Resource(o.resource()).
+		Name(o.GetName()).
+		SubResource("status").
+		VersionedParams(patchOpts.ApplyOptions(opts).AsPatchOptions(), c.paramCodec).
+		Body(data).
+		Context(ctx).
+		Do().
+		Into(obj)
+}

pkg/client/unstructured_client.go

@@ -29,6 +29,8 @@ import (
 	"k8s.io/client-go/dynamic"
 )
 
+// TODO(directxman12): respect context in unstructured
+
 // client is a client.Client that reads and writes directly from/to an API server.  It lazily initializes
 // new clients at the time they are used, and caches the client.
 type unstructuredClient struct {
@@ -177,6 +179,30 @@ func (uc *unstructuredClient) UpdateStatus(_ context.Context, obj runtime.Object
 	return nil
 }
 
+func (uc *unstructuredClient) PatchStatus(_ context.Context, obj runtime.Object, patch Patch, opts ...PatchOptionFunc) error {
+	u, ok := obj.(*unstructured.Unstructured)
+	if !ok {
+		return fmt.Errorf("unstructured client did not understand object: %T", obj)
+	}
+	r, err := uc.getResourceInterface(u.GroupVersionKind(), u.GetNamespace())
+	if err != nil {
+		return err
+	}
+
+	data, err := patch.Data(obj)
+	if err != nil {
+		return err
+	}
+
+	patchOpts := &PatchOptions{}
+	i, err := r.Patch(u.GetName(), patch.Type(), data, *patchOpts.ApplyOptions(opts).AsPatchOptions(), "status")
+	if err != nil {
+		return err
+	}
+	u.Object = i.Object
+	return nil
+}
+
 func (uc *unstructuredClient) getResourceInterface(gvk schema.GroupVersionKind, ns string) (dynamic.ResourceInterface, error) {
 	mapping, err := uc.restMapper.RESTMapping(gvk.GroupKind(), gvk.Version)
 	if err != nil {