@@ -183,6 +183,12 @@ const (

 	// new deployment.

 	// TODO: This should be made public upstream.

 	DesiredReplicasAnnotation = "kubectl.kubernetes.io/desired-replicas"

+	// DeploymentStatusReasonAnnotation represents the reason for deployment being in a given state

+	// Used for specifying the reason for cancellation or failure of a deployment

+	DeploymentStatusReasonAnnotation = "openshift.io/deployment.status-reason"

+	// DeploymentCancelledAnnotation indicates that the deployment has been cancelled

+	// The annotation value does not matter and its mere presence indicates cancellation

+	DeploymentCancelledAnnotation = "openshift.io/deployment.cancelled"

 )

 // DeploymentConfig represents a configuration for a single deployment (represented as a

@@ -180,6 +180,12 @@ const (

 	// DeploymentConfigLabel is the name of a label used to correlate a deployment with the

 	// DeploymentConfigs on which the deployment is based.

 	DeploymentConfigLabel = "deploymentconfig"

+	// DeploymentStatusReasonAnnotation represents the reason for deployment being in a given state

+	// Used for specifying the reason for cancellation or failure of a deployment

+	DeploymentStatusReasonAnnotation = "openshift.io/deployment.status-reason"

+	// DeploymentCancelledAnnotation indicates that the deployment has been cancelled

+	// The annotation value does not matter and its mere presence indicates cancellation

+	DeploymentCancelledAnnotation = "openshift.io/deployment.cancelled"

 )

 // DeploymentConfig represents a configuration for a single deployment (represented as a

@@ -147,6 +147,12 @@ const (

 	// DeploymentConfigLabel is the name of a label used to correlate a deployment with the

 	// DeploymentConfigs on which the deployment is based.

 	DeploymentConfigLabel = "deploymentconfig"

+	// DeploymentStatusReasonAnnotation represents the reason for deployment being in a given state

+	// Used for specifying the reason for cancellation or failure of a deployment

+	DeploymentStatusReasonAnnotation = "openshift.io/deployment.status-reason"

+	// DeploymentCancelledAnnotation indicates that the deployment has been cancelled

+	// The annotation value does not matter and its mere presence indicates cancellation

+	DeploymentCancelledAnnotation = "openshift.io/deployment.cancelled"

 )

 // DeploymentConfig represents a configuration for a single deployment (represented as a

@@ -1,11 +1,13 @@

 package deployerpod

 import (

+	"fmt"

 	"time"

 	"github.com/golang/glog"

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

+	kerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

 	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"

@@ -37,9 +39,6 @@ func (factory *DeployerPodControllerFactory) Create() controller.RunnableControl

 			return factory.KubeClient.ReplicationControllers(kapi.NamespaceAll).Watch(labels.Everything(), fields.Everything(), resourceVersion)

 		},

 	}

-	deploymentQueue := cache.NewFIFO(cache.MetaNamespaceKeyFunc)

-	cache.NewReflector(deploymentLW, &kapi.ReplicationController{}, deploymentQueue, 2*time.Minute).Run()

-

 	deploymentStore := cache.NewStore(cache.MetaNamespaceKeyFunc)

 	cache.NewReflector(deploymentLW, &kapi.ReplicationController{}, deploymentStore, 2*time.Minute).Run()

@@ -85,13 +84,14 @@ func (factory *DeployerPodControllerFactory) Create() controller.RunnableControl

 // pollPods lists all pods associated with pending or running deployments and returns

 // a cache.Enumerator suitable for use with a cache.Poller.

-func pollPods(deploymentStore cache.Store, kClient kclient.PodsNamespacer) (cache.Enumerator, error) {

+func pollPods(deploymentStore cache.Store, kClient kclient.Interface) (cache.Enumerator, error) {

 	list := &kapi.PodList{}

 	for _, obj := range deploymentStore.List() {

 		deployment := obj.(*kapi.ReplicationController)

+		currentStatus := deployutil.DeploymentStatusFor(deployment)

-		switch deployutil.DeploymentStatusFor(deployment) {

+		switch currentStatus {

 		case deployapi.DeploymentStatusPending, deployapi.DeploymentStatusRunning:

 			// Validate the correlating pod annotation

 			podID := deployutil.DeployerPodNameFor(deployment)

@@ -103,6 +103,20 @@ func pollPods(deploymentStore cache.Store, kClient kclient.PodsNamespacer) (cach

 			pod, err := kClient.Pods(deployment.Namespace).Get(podID)

 			if err != nil {

 				glog.V(2).Infof("Couldn't find pod %s for deployment %s: %#v", podID, deployment.Name, err)

+

+				// if the deployer pod doesn't exist, update the deployment status to failed

+				// TODO: This update should be moved the controller

+				// once this poll is changed in favor of pod status updates.

+				if kerrors.IsNotFound(err) {

+					nextStatus := deployapi.DeploymentStatusFailed

+					deployment.Annotations[deployapi.DeploymentStatusAnnotation] = string(nextStatus)

+					deployment.Annotations[deployapi.DeploymentStatusReasonAnnotation] = fmt.Sprintf("Couldn't find pod %s for deployment %s", podID, deployment.Name)

+

+					if _, err := kClient.ReplicationControllers(deployment.Namespace).Update(deployment); err != nil {

+						glog.Errorf("couldn't update deployment %s to status %s: %v", deployutil.LabelForDeployment(deployment), nextStatus, err)

+					}

+					glog.V(2).Infof("Updated deployment %s status from %s to %s", deployutil.LabelForDeployment(deployment), currentStatus, nextStatus)

+				}

 				continue

 			}

@@ -53,35 +53,50 @@ func (c *DeploymentConfigController) Handle(config *deployapi.DeploymentConfig)

 		return nil

 	}

-	// Check if the latest deployment already exists

-	if deployment, err := c.deploymentClient.getDeployment(config.Namespace, deployutil.LatestDeploymentNameForConfig(config)); err != nil {

-		if !errors.IsNotFound(err) {

-			return fmt.Errorf("couldn't get deployment for config %s: %v", deployutil.LabelForDeploymentConfig(config), err)

-		}

-	} else {

-		// If there's an existing deployment, nothing needs to be done.

-		if deployment != nil {

-			return nil

-		}

-	}

-

-	// Check if any previous deployment is still running (any non-terminal state).

+	// Check if any existing inflight deployments (any non-terminal state).

 	existingDeployments, err := c.deploymentClient.listDeploymentsForConfig(config.Namespace, config.Name)

 	if err != nil {

 		return fmt.Errorf("couldn't list deployments for config %s: %v", deployutil.LabelForDeploymentConfig(config), err)

 	}

+	var inflightDeployment *kapi.ReplicationController

 	for _, deployment := range existingDeployments.Items {

 		deploymentStatus := deployutil.DeploymentStatusFor(&deployment)

 		switch deploymentStatus {

 		case deployapi.DeploymentStatusFailed,

 			deployapi.DeploymentStatusComplete:

 			// Previous deployment in terminal state - can ignore

-			// Ignoring specific deployment states so that any new

+			// Ignoring specific deployment states so that any newly introduced

 			// deployment state will not be ignored

 		default:

-			glog.V(4).Infof("Found previous deployment %s (status %s) - will requeue", deployutil.LabelForDeployment(&deployment), deploymentStatus)

-			return transientError(fmt.Sprintf("found previous deployment (state: %s) for %s - requeuing", deploymentStatus, deployutil.LabelForDeploymentConfig(config)))

+			if inflightDeployment == nil {

+				inflightDeployment = &deployment

+				continue

+			}

+			var deploymentForCancellation *kapi.ReplicationController

+			if deployutil.DeploymentVersionFor(inflightDeployment) < deployutil.DeploymentVersionFor(&deployment) {

+				deploymentForCancellation, inflightDeployment = inflightDeployment, &deployment

+			} else {

+				deploymentForCancellation = &deployment

+			}

+

+			deploymentForCancellation.Annotations[deployapi.DeploymentCancelledAnnotation] = "true"

+			if _, err := c.deploymentClient.updateDeployment(deploymentForCancellation.Namespace, deploymentForCancellation); err != nil {

+				glog.Errorf("couldn't cancel deployment %s: %v", deployutil.LabelForDeployment(deploymentForCancellation), err)

+			}

+			glog.V(2).Infof("Cancelled deployment %s for config %s", deployutil.LabelForDeployment(deploymentForCancellation), deployutil.LabelForDeploymentConfig(config))

+		}

+	}

+

+	// check to see if there are inflight deployments

+	if inflightDeployment != nil {

+		// check if this is the latest and only deployment

+		// if so, nothing needs to be done

+		if deployutil.DeploymentVersionFor(inflightDeployment) == config.LatestVersion {

+			return nil

 		}

+		// if this is an earlier deployment, raise a transientError so that the deployment config can be re-queued

+		glog.V(4).Infof("Found previous inflight deployment for %s - will requeue", deployutil.LabelForDeploymentConfig(config))

+		return transientError(fmt.Sprintf("found previous inflight deployment for %s - requeuing", deployutil.LabelForDeploymentConfig(config)))

 	}

 	// Try and build a deployment for the config.

@@ -128,22 +143,18 @@ func (c *DeploymentConfigController) Handle(config *deployapi.DeploymentConfig)

 // deploymentClient abstracts access to deployments.

 type deploymentClient interface {

-	getDeployment(namespace, name string) (*kapi.ReplicationController, error)

 	createDeployment(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error)

 	// listDeploymentsForConfig should return deployments associated with the

 	// provided config.

 	listDeploymentsForConfig(namespace, configName string) (*kapi.ReplicationControllerList, error)

+	updateDeployment(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error)

 }

 // deploymentClientImpl is a pluggable deploymentClient.

 type deploymentClientImpl struct {

-	getDeploymentFunc            func(namespace, name string) (*kapi.ReplicationController, error)

 	createDeploymentFunc         func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error)

 	listDeploymentsForConfigFunc func(namespace, configName string) (*kapi.ReplicationControllerList, error)

-}

-

-func (i *deploymentClientImpl) getDeployment(namespace, name string) (*kapi.ReplicationController, error) {

-	return i.getDeploymentFunc(namespace, name)

+	updateDeploymentFunc         func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error)

 }

 func (i *deploymentClientImpl) createDeployment(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

@@ -153,3 +164,7 @@ func (i *deploymentClientImpl) createDeployment(namespace string, deployment *ka

 func (i *deploymentClientImpl) listDeploymentsForConfig(namespace, configName string) (*kapi.ReplicationControllerList, error) {

 	return i.listDeploymentsForConfigFunc(namespace, configName)

 }

+

+func (i *deploymentClientImpl) updateDeployment(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+	return i.updateDeploymentFunc(namespace, deployment)

+}

@@ -3,6 +3,7 @@ package deploymentconfig

 import (

 	"fmt"

 	"reflect"

+	"sort"

 	"strconv"

 	"testing"

@@ -24,10 +25,6 @@ func TestHandle_initialOk(t *testing.T) {

 			return deployutil.MakeDeployment(config, api.Codec)

 		},

 		deploymentClient: &deploymentClientImpl{

-			getDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

-				t.Fatalf("unexpected call with name %s", name)

-				return nil, nil

-			},

 			createDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 				t.Fatalf("unexpected call with deployment %v", deployment)

 				return nil, nil

@@ -36,6 +33,10 @@ func TestHandle_initialOk(t *testing.T) {

 				t.Fatalf("unexpected call to list deployments")

 				return nil, nil

 			},

+			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+				t.Fatalf("unexpected update call with deployment %v", deployment)

+				return nil, nil

+			},

 		},

 		recorder: &record.FakeRecorder{},

 	}

@@ -62,9 +63,6 @@ func TestHandle_updateOk(t *testing.T) {

 			return deployutil.MakeDeployment(config, api.Codec)

 		},

 		deploymentClient: &deploymentClientImpl{

-			getDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

-				return nil, kerrors.NewNotFound("ReplicationController", name)

-			},

 			createDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 				deployed = deployment

 				return deployment, nil

@@ -72,6 +70,10 @@ func TestHandle_updateOk(t *testing.T) {

 			listDeploymentsForConfigFunc: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

 				return existingDeployments, nil

 			},

+			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+				t.Fatalf("unexpected update call with deployment %v", deployment)

+				return nil, nil

+			},

 		},

 		recorder: &record.FakeRecorder{},

 	}

@@ -132,15 +134,15 @@ func TestHandle_nonfatalLookupError(t *testing.T) {

 			return deployutil.MakeDeployment(config, api.Codec)

 		},

 		deploymentClient: &deploymentClientImpl{

-			getDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

-				return nil, kerrors.NewInternalError(fmt.Errorf("fatal test error"))

-			},

 			createDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 				t.Fatalf("unexpected call with deployment %v", deployment)

 				return nil, nil

 			},

 			listDeploymentsForConfigFunc: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

-				t.Fatalf("unexpected call to list deployments")

+				return nil, kerrors.NewInternalError(fmt.Errorf("fatal test error"))

+			},

+			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+				t.Fatalf("unexpected update call with deployment %v", deployment)

 				return nil, nil

 			},

 		},

@@ -166,16 +168,18 @@ func TestHandle_configAlreadyDeployed(t *testing.T) {

 			return deployutil.MakeDeployment(config, api.Codec)

 		},

 		deploymentClient: &deploymentClientImpl{

-			getDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

-				deployment, _ := deployutil.MakeDeployment(deploymentConfig, kapi.Codec)

-				return deployment, nil

-			},

 			createDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 				t.Fatalf("unexpected call to to create deployment: %v", deployment)

 				return nil, nil

 			},

 			listDeploymentsForConfigFunc: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

-				t.Fatalf("unexpected call to list deployments")

+				existingDeployments := []kapi.ReplicationController{}

+				deployment, _ := deployutil.MakeDeployment(deploymentConfig, kapi.Codec)

+				existingDeployments = append(existingDeployments, *deployment)

+				return &kapi.ReplicationControllerList{Items: existingDeployments}, nil

+			},

+			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+				t.Fatalf("unexpected update call with deployment %v", deployment)

 				return nil, nil

 			},

 		},

@@ -196,15 +200,16 @@ func TestHandle_nonfatalCreateError(t *testing.T) {

 			return deployutil.MakeDeployment(config, api.Codec)

 		},

 		deploymentClient: &deploymentClientImpl{

-			getDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

-				return nil, kerrors.NewNotFound("ReplicationController", name)

-			},

 			createDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 				return nil, kerrors.NewInternalError(fmt.Errorf("test error"))

 			},

 			listDeploymentsForConfigFunc: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

 				return &kapi.ReplicationControllerList{}, nil

 			},

+			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+				t.Fatalf("unexpected update call with deployment %v", deployment)

+				return nil, nil

+			},

 		},

 		recorder: &record.FakeRecorder{},

 	}

@@ -226,9 +231,6 @@ func TestHandle_fatalError(t *testing.T) {

 			return nil, fmt.Errorf("couldn't make deployment")

 		},

 		deploymentClient: &deploymentClientImpl{

-			getDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

-				return nil, kerrors.NewNotFound("ReplicationController", name)

-			},

 			createDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 				t.Fatalf("unexpected call to create")

 				return nil, kerrors.NewInternalError(fmt.Errorf("test error"))

@@ -236,6 +238,10 @@ func TestHandle_fatalError(t *testing.T) {

 			listDeploymentsForConfigFunc: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

 				return &kapi.ReplicationControllerList{}, nil

 			},

+			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+				t.Fatalf("unexpected update call with deployment %v", deployment)

+				return nil, nil

+			},

 		},

 	}

@@ -252,6 +258,7 @@ func TestHandle_fatalError(t *testing.T) {

 // new deployment for a config that has existing deployments succeeds of fails

 // depending upon the state of the existing deployments

 func TestHandle_existingDeployments(t *testing.T) {

+	var updatedDeployments []kapi.ReplicationController

 	var (

 		config              *deployapi.DeploymentConfig

 		deployed            *kapi.ReplicationController

@@ -263,9 +270,6 @@ func TestHandle_existingDeployments(t *testing.T) {

 			return deployutil.MakeDeployment(config, api.Codec)

 		},

 		deploymentClient: &deploymentClientImpl{

-			getDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

-				return nil, kerrors.NewNotFound("ReplicationController", name)

-			},

 			createDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 				deployed = deployment

 				return deployment, nil

@@ -273,13 +277,19 @@ func TestHandle_existingDeployments(t *testing.T) {

 			listDeploymentsForConfigFunc: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

 				return existingDeployments, nil

 			},

+			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+				updatedDeployments = append(updatedDeployments, *deployment)

+				//t.Fatalf("unexpected update call with deployment %v", deployment)

+				return deployment, nil

+			},

 		},

 		recorder: &record.FakeRecorder{},

 	}

 	type existing struct {

-		version int

-		status  deployapi.DeploymentStatus

+		version      int

+		status       deployapi.DeploymentStatus

+		shouldCancel bool

 	}

 	type scenario struct {

@@ -293,25 +303,32 @@ func TestHandle_existingDeployments(t *testing.T) {

 		// No existing deployments

 		{1, []existing{}, nil},

 		// A single existing completed deployment

-		{2, []existing{{1, deployapi.DeploymentStatusComplete}}, nil},

+		{2, []existing{{1, deployapi.DeploymentStatusComplete, false}}, nil},

 		// A single existing failed deployment

-		{2, []existing{{1, deployapi.DeploymentStatusFailed}}, nil},

+		{2, []existing{{1, deployapi.DeploymentStatusFailed, false}}, nil},

 		// Multiple existing completed/failed deployments

-		{3, []existing{{2, deployapi.DeploymentStatusFailed}, {1, deployapi.DeploymentStatusComplete}}, nil},

+		{3, []existing{{2, deployapi.DeploymentStatusFailed, false}, {1, deployapi.DeploymentStatusComplete, false}}, nil},

 		// A single existing deployment in the default state

-		{2, []existing{{1, ""}}, transientErrorType},

+		{2, []existing{{1, "", false}}, transientErrorType},

 		// A single existing new deployment

-		{2, []existing{{1, deployapi.DeploymentStatusNew}}, transientErrorType},

+		{2, []existing{{1, deployapi.DeploymentStatusNew, false}}, transientErrorType},

 		// A single existing pending deployment

-		{2, []existing{{1, deployapi.DeploymentStatusPending}}, transientErrorType},

+		{2, []existing{{1, deployapi.DeploymentStatusPending, false}}, transientErrorType},

 		// A single existing running deployment

-		{2, []existing{{1, deployapi.DeploymentStatusRunning}}, transientErrorType},

+		{2, []existing{{1, deployapi.DeploymentStatusRunning, false}}, transientErrorType},

 		// Multiple existing deployments with one in new/pending/running

-		{4, []existing{{3, deployapi.DeploymentStatusRunning}, {2, deployapi.DeploymentStatusComplete}, {1, deployapi.DeploymentStatusFailed}}, transientErrorType},

+		{4, []existing{{3, deployapi.DeploymentStatusRunning, false}, {2, deployapi.DeploymentStatusComplete, false}, {1, deployapi.DeploymentStatusFailed, false}}, transientErrorType},

+

+		// Multiple existing deployments with more than one in new/pending/running

+		{4, []existing{{3, deployapi.DeploymentStatusNew, false}, {2, deployapi.DeploymentStatusRunning, true}, {1, deployapi.DeploymentStatusFailed, false}}, transientErrorType},

+		// Multiple existing deployments with more than one in new/pending/running

+		// Latest deployment has already failed

+		{6, []existing{{5, deployapi.DeploymentStatusFailed, false}, {4, deployapi.DeploymentStatusRunning, false}, {3, deployapi.DeploymentStatusNew, true}, {2, deployapi.DeploymentStatusComplete, false}, {1, deployapi.DeploymentStatusNew, true}}, transientErrorType},

 	}

 	for _, scenario := range scenarios {

+		updatedDeployments = []kapi.ReplicationController{}

 		deployed = nil

 		config = deploytest.OkDeploymentConfig(scenario.version)

 		existingDeployments = &kapi.ReplicationControllerList{}

@@ -339,5 +356,22 @@ func TestHandle_existingDeployments(t *testing.T) {

 				t.Fatalf("error expected: %s, got: %s", scenario.errorType, reflect.TypeOf(err))

 			}

 		}

+

+		expectedCancellations := []int{}

+		actualCancellations := []int{}

+		for _, e := range scenario.existing {

+			if e.shouldCancel {

+				expectedCancellations = append(expectedCancellations, e.version)

+			}

+		}

+		for _, d := range updatedDeployments {

+			actualCancellations = append(actualCancellations, deployutil.DeploymentVersionFor(&d))

+		}

+

+		sort.Ints(actualCancellations)

+		sort.Ints(expectedCancellations)

+		if !reflect.DeepEqual(actualCancellations, expectedCancellations) {

+			t.Fatalf("expected cancellations: %v, actual: %v", expectedCancellations, actualCancellations)

+		}

 	}

 }

@@ -49,9 +49,6 @@ func (factory *DeploymentConfigControllerFactory) Create() controller.RunnableCo

 	configController := &DeploymentConfigController{

 		deploymentClient: &deploymentClientImpl{

-			getDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

-				return factory.KubeClient.ReplicationControllers(namespace).Get(name)

-			},

 			createDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 				return factory.KubeClient.ReplicationControllers(namespace).Create(deployment)

 			},

@@ -62,6 +59,9 @@ func (factory *DeploymentConfigControllerFactory) Create() controller.RunnableCo

 				}

 				return factory.KubeClient.ReplicationControllers(namespace).List(selector)

 			},

+			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+				return factory.KubeClient.ReplicationControllers(namespace).Update(deployment)

+			},

 		},

 		makeDeployment: func(config *deployapi.DeploymentConfig) (*kapi.ReplicationController, error) {

 			return deployutil.MakeDeployment(config, factory.Codec)