deploy: use patch for pausing and resuming deployment config

Author: mfojtik

pkg/client/deploymentconfigs.go

@@ -22,6 +22,7 @@ type DeploymentConfigInterface interface {
 	Get(name string) (*deployapi.DeploymentConfig, error)
 	Create(config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error)
 	Update(config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error)
+	Patch(name string, pt kapi.PatchType, data []byte, subresources ...string) (result *deployapi.DeploymentConfig, err error)
 	Delete(name string) error
 	Watch(opts kapi.ListOptions) (watch.Interface, error)
 	Generate(name string) (*deployapi.DeploymentConfig, error)
@@ -80,6 +81,14 @@ func (c *deploymentConfigs) Update(deploymentConfig *deployapi.DeploymentConfig)
 	return
 }
 
+// Patch takes the partial representation of a deployment config and updates it.
+// Returns the server's representation of the deployment config, and an error, if there is any.
+func (c *deploymentConfigs) Patch(name string, pt kapi.PatchType, data []byte, subresources ...string) (result *deployapi.DeploymentConfig, err error) {
+	result = &deployapi.DeploymentConfig{}
+	err = c.r.Patch(kapi.StrategicMergePatchType).Namespace(c.ns).Resource("deploymentConfigs").SubResource(subresources...).Name(name).Body(data).Do().Into(result)
+	return
+}
+
 // Delete deletes an existing deploymentConfig.
 func (c *deploymentConfigs) Delete(name string) error {
 	return c.r.Delete().Namespace(c.ns).Resource("deploymentConfigs").Name(name).Do().Error()

pkg/client/testclient/fake_deploymentconfigs.go

@@ -54,6 +54,14 @@ func (c *FakeDeploymentConfigs) Update(inObj *deployapi.DeploymentConfig) (*depl
 
 	return obj.(*deployapi.DeploymentConfig), err
 }
+func (c *FakeDeploymentConfigs) Patch(name string, pt kapi.PatchType, data []byte, subresources ...string) (*deployapi.DeploymentConfig, error) {
+	obj, err := c.Fake.Invokes(ktestclient.NewPatchAction("deploymentconfigs", c.Namespace, &deployapi.DeploymentConfig{}), &deployapi.DeploymentConfig{})
+	if obj == nil {
+		return nil, err
+	}
+
+	return obj.(*deployapi.DeploymentConfig), err
+}
 
 func (c *FakeDeploymentConfigs) Delete(name string) error {
 	_, err := c.Fake.Invokes(core.NewDeleteAction(deploymentConfigsResource, c.Namespace, name), &deployapi.DeploymentConfig{})

pkg/cmd/util/clientcmd/factory_client_access.go

@@ -25,6 +25,7 @@ import (
 	kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	kclientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	"k8s.io/kubernetes/pkg/kubectl"
+	"k8s.io/kubernetes/pkg/kubectl/cmd/set"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
 	"k8s.io/kubernetes/pkg/runtime"
@@ -269,15 +270,17 @@ func (f *ring0Factory) Printer(mapping *meta.RESTMapping, options kubectl.PrintO
 func (f *ring0Factory) Pauser(info *resource.Info) (bool, error) {
 	switch t := info.Object.(type) {
 	case *deployapi.DeploymentConfig:
-		if t.Spec.Paused {
+		patches := set.CalculatePatches([]*resource.Info{info}, f.JSONEncoder(), func(*resource.Info) (bool, error) {
+			if t.Spec.Paused {
+				return false, nil
+			}
+			t.Spec.Paused = true
+			return true, nil
+		})
+		if len(patches) == 0 {
 			return true, nil
 		}
-		t.Spec.Paused = true
-		oc, _, err := f.Clients()
-		if err != nil {
-			return false, err
-		}
-		_, err = oc.DeploymentConfigs(t.Namespace).Update(t)
+		_, err := resource.NewHelper(info.Client, info.Mapping).Patch(info.Namespace, info.Name, kapi.StrategicMergePatchType, patches[0].Patch)
 		// TODO: Pause the deployer containers.
 		return false, err
 	default:
@@ -328,15 +331,17 @@ func (f *ring0Factory) ResolveImage(image string) (string, error) {
 func (f *ring0Factory) Resumer(info *resource.Info) (bool, error) {
 	switch t := info.Object.(type) {
 	case *deployapi.DeploymentConfig:
-		if !t.Spec.Paused {
+		patches := set.CalculatePatches([]*resource.Info{info}, f.JSONEncoder(), func(*resource.Info) (bool, error) {
+			if !t.Spec.Paused {
+				return false, nil
+			}
+			t.Spec.Paused = false
+			return true, nil
+		})
+		if len(patches) == 0 {
 			return true, nil
 		}
-		t.Spec.Paused = false
-		oc, _, err := f.Clients()
-		if err != nil {
-			return false, err
-		}
-		_, err = oc.DeploymentConfigs(t.Namespace).Update(t)
+		_, err := resource.NewHelper(info.Client, info.Mapping).Patch(info.Namespace, info.Name, kapi.StrategicMergePatchType, patches[0].Patch)
 		// TODO: Resume the deployer containers.
 		return false, err
 	default: