@@ -230,6 +230,19 @@ message DeploymentLogOptions {

   optional int64 version = 10;

 }

+// DeploymentRequest is a request to a deployment config for a new deployment.

+message DeploymentRequest {

+  // Name of the deployment config for requesting a new deployment.

+  optional string name = 1;

+

+  // Latest will update the deployment config with the latest state from all triggers.

+  optional bool latest = 2;

+

+  // Force will try to force a new deployment to run. If the deployment config is paused,

+  // then setting this to true will return an Invalid error.

+  optional bool force = 3;

+}

+

 // DeploymentStrategy describes how to perform a deployment.

 message DeploymentStrategy {

   // Type is the name of a deployment strategy.

@@ -6258,6 +6258,67 @@

     ]

    },

    {

+    "path": "/oapi/v1/namespaces/{namespace}/deploymentconfigs/{name}/instantiate",

+    "description": "OpenShift REST API, version v1",

+    "operations": [

+     {

+      "type": "v1.DeploymentRequest",

+      "method": "POST",

+      "summary": "create instantiate of a DeploymentRequest",

+      "nickname": "createNamespacedDeploymentRequestInstantiate",

+      "parameters": [

+       {

+        "type": "string",

+        "paramType": "query",

+        "name": "pretty",

+        "description": "If 'true', then the output is pretty printed.",

+        "required": false,

+        "allowMultiple": false

+       },

+       {

+        "type": "v1.DeploymentRequest",

+        "paramType": "body",

+        "name": "body",

+        "description": "",

+        "required": true,

+        "allowMultiple": false

+       },

+       {

+        "type": "string",

+        "paramType": "path",

+        "name": "namespace",

+        "description": "object name and auth scope, such as for teams and projects",

+        "required": true,

+        "allowMultiple": false

+       },

+       {

+        "type": "string",

+        "paramType": "path",

+        "name": "name",

+        "description": "name of the DeploymentRequest",

+        "required": true,

+        "allowMultiple": false

+       }

+      ],

+      "responseMessages": [

+       {

+        "code": 200,

+        "message": "OK",

+        "responseModel": "v1.DeploymentRequest"

+       }

+      ],

+      "produces": [

+       "application/json",

+       "application/yaml",

+       "application/vnd.kubernetes.protobuf"

+      ],

+      "consumes": [

+       "*/*"

+      ]

+     }

+    ]

+   },

+   {

     "path": "/oapi/v1/namespaces/{namespace}/deploymentconfigs/{name}/log",

     "description": "OpenShift REST API, version v1",

     "operations": [

@@ -24620,6 +24681,37 @@

      }

     }

    },

+   "v1.DeploymentRequest": {

+    "id": "v1.DeploymentRequest",

+    "description": "DeploymentRequest is a request to a deployment config for a new deployment.",

+    "required": [

+     "name",

+     "latest",

+     "force"

+    ],

+    "properties": {

+     "kind": {

+      "type": "string",

+      "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#types-kinds"

+     },

+     "apiVersion": {

+      "type": "string",

+      "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#resources"

+     },

+     "name": {

+      "type": "string",

+      "description": "Name of the deployment config for requesting a new deployment."

+     },

+     "latest": {

+      "type": "boolean",

+      "description": "Latest will update the deployment config with the latest state from all triggers."

+     },

+     "force": {

+      "type": "boolean",

+      "description": "Force will try to force a new deployment to run. If the deployment config is paused, then setting this to true will return an Invalid error."

+     }

+    }

+   },

    "v1.DeploymentLog": {

     "id": "v1.DeploymentLog",

     "description": "DeploymentLog represents the logs for a deployment",

@@ -32199,6 +32199,64 @@

      }

     ]

    },

+   "/oapi/v1/namespaces/{namespace}/deploymentconfigs/{name}/instantiate": {

+    "post": {

+     "description": "create instantiate of a DeploymentRequest",

+     "consumes": [

+      "*/*"

+     ],

+     "produces": [

+      "application/json",

+      "application/yaml",

+      "application/vnd.kubernetes.protobuf"

+     ],

+     "schemes": [

+      "https"

+     ],

+     "operationId": "createNamespacedDeploymentRequestInstantiate",

+     "responses": {

+      "200": {

+       "description": "OK",

+       "schema": {

+        "$ref": "#/definitions/v1.DeploymentRequest"

+       }

+      }

+     }

+    },

+    "parameters": [

+     {

+      "name": "body",

+      "in": "body",

+      "required": true,

+      "schema": {

+       "$ref": "#/definitions/v1.DeploymentRequest"

+      }

+     },

+     {

+      "uniqueItems": true,

+      "type": "string",

+      "description": "name of the DeploymentRequest",

+      "name": "name",

+      "in": "path",

+      "required": true

+     },

+     {

+      "uniqueItems": true,

+      "type": "string",

+      "description": "object name and auth scope, such as for teams and projects",

+      "name": "namespace",

+      "in": "path",

+      "required": true

+     },

+     {

+      "uniqueItems": true,

+      "type": "string",

+      "description": "If 'true', then the output is pretty printed.",

+      "name": "pretty",

+      "in": "query"

+     }

+    ]

+   },

    "/oapi/v1/namespaces/{namespace}/deploymentconfigs/{name}/log": {

     "get": {

      "description": "read log of the specified DeploymentLog",

@@ -46200,6 +46258,36 @@

      }

     }

    },

+   "v1.DeploymentRequest": {

+    "description": "DeploymentRequest is a request to a deployment config for a new deployment.",

+    "required": [

+     "name",

+     "latest",

+     "force"

+    ],

+    "properties": {

+     "apiVersion": {

+      "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#resources",

+      "type": "string"

+     },

+     "force": {

+      "description": "Force will try to force a new deployment to run. If the deployment config is paused, then setting this to true will return an Invalid error.",

+      "type": "boolean"

+     },

+     "kind": {

+      "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#types-kinds",

+      "type": "string"

+     },

+     "latest": {

+      "description": "Latest will update the deployment config with the latest state from all triggers.",

+      "type": "boolean"

+     },

+     "name": {

+      "description": "Name of the deployment config for requesting a new deployment.",

+      "type": "string"

+     }

+    }

+   },

    "v1.DeploymentStrategy": {

     "description": "DeploymentStrategy describes how to perform a deployment.",

     "properties": {

@@ -64,6 +64,7 @@ func registerAll() {

 	Validator.MustRegister(&deployapi.DeploymentConfig{}, deployvalidation.ValidateDeploymentConfig, deployvalidation.ValidateDeploymentConfigUpdate)

 	Validator.MustRegister(&deployapi.DeploymentConfigRollback{}, deployvalidation.ValidateDeploymentConfigRollback, nil)

 	Validator.MustRegister(&deployapi.DeploymentLogOptions{}, deployvalidation.ValidateDeploymentLogOptions, nil)

+	Validator.MustRegister(&deployapi.DeploymentRequest{}, deployvalidation.ValidateDeploymentRequest, nil)

 	Validator.MustRegister(&extensions.Scale{}, extvalidation.ValidateScale, nil)

 	Validator.MustRegister(&imageapi.Image{}, imagevalidation.ValidateImage, imagevalidation.ValidateImageUpdate)

@@ -30,6 +30,7 @@ type DeploymentConfigInterface interface {

 	GetScale(name string) (*extensions.Scale, error)

 	UpdateScale(scale *extensions.Scale) (*extensions.Scale, error)

 	UpdateStatus(config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error)

+	Instantiate(request *deployapi.DeploymentRequest) (*deployapi.DeploymentConfig, error)

 }

 // deploymentConfigs implements DeploymentConfigsNamespacer interface

@@ -155,6 +156,13 @@ func (c *deploymentConfigs) UpdateStatus(deploymentConfig *deployapi.DeploymentC

 	return

 }

+// Instantiate instantiates a new build from build config returning new object or an error

+func (c *deploymentConfigs) Instantiate(request *deployapi.DeploymentRequest) (*deployapi.DeploymentConfig, error) {

+	result := &deployapi.DeploymentConfig{}

+	err := c.r.Post().Namespace(c.ns).Resource("deploymentConfigs").Name(request.Name).SubResource("instantiate").Body(request).Do().Into(result)

+	return result, err

+}

+

 type updateConfigFunc func(d *deployapi.DeploymentConfig)

 // UpdateConfigWithRetries will try to update a deployment config and ignore any update conflicts.

@@ -114,3 +114,13 @@ func (c *FakeDeploymentConfigs) UpdateStatus(inObj *deployapi.DeploymentConfig)

 	return obj.(*deployapi.DeploymentConfig), err

 }

+

+func (c *FakeDeploymentConfigs) Instantiate(inObj *deployapi.DeploymentRequest) (*deployapi.DeploymentConfig, error) {

+	deployment := &deployapi.DeploymentConfig{ObjectMeta: kapi.ObjectMeta{Name: inObj.Name}}

+	obj, err := c.Fake.Invokes(ktestclient.NewUpdateAction("deploymentconfigs/instantiate", c.Namespace, deployment), deployment)

+	if obj == nil {

+		return nil, err

+	}

+

+	return obj.(*deployapi.DeploymentConfig), err

+}

@@ -245,8 +245,19 @@ func (o DeployOptions) deploy(config *deployapi.DeploymentConfig) error {

 		return err

 	}

-	config.Status.LatestVersion++

-	dc, err := o.osClient.DeploymentConfigs(config.Namespace).Update(config)

+	request := &deployapi.DeploymentRequest{

+		Name:   config.Name,

+		Latest: false,

+		Force:  true,

+	}

+

+	dc, err := o.osClient.DeploymentConfigs(config.Namespace).Instantiate(request)

+	// Pre 1.4 servers don't support the instantiate endpoint. Fallback to incrementing

+	// latestVersion on them.

+	if kerrors.IsNotFound(err) || kerrors.IsForbidden(err) {

+		config.Status.LatestVersion++

+		dc, err = o.osClient.DeploymentConfigs(config.Namespace).Update(config)

+	}

 	if err != nil {

 		return err

 	}

@@ -40,14 +40,14 @@ func TestCmdDeploy_latestOk(t *testing.T) {

 	}

 	for _, status := range validStatusList {

 		config := deploytest.OkDeploymentConfig(1)

-		var updatedConfig *deployapi.DeploymentConfig

+		updatedConfig := config

 		osClient := &tc.Fake{}

 		osClient.AddReactor("get", "deploymentconfigs", func(action ktc.Action) (handled bool, ret runtime.Object, err error) {

 			return true, config, nil

 		})

-		osClient.AddReactor("update", "deploymentconfigs", func(action ktc.Action) (handled bool, ret runtime.Object, err error) {

-			updatedConfig = action.(ktc.UpdateAction).GetObject().(*deployapi.DeploymentConfig)

+		osClient.AddReactor("update", "deploymentconfigs/instantiate", func(action ktc.Action) (handled bool, ret runtime.Object, err error) {

+			updatedConfig.Status.LatestVersion++

 			return true, updatedConfig, nil

 		})

@@ -62,10 +62,7 @@ func TestCmdDeploy_latestOk(t *testing.T) {

 			t.Fatalf("unexpected error: %v", err)

 		}

-		if updatedConfig == nil {

-			t.Fatalf("expected updated config")

-		}

-		if exp, got := updatedConfig.Status.LatestVersion, int64(2); exp != got {

+		if exp, got := int64(2), updatedConfig.Status.LatestVersion; exp != got {

 			t.Fatalf("expected deployment config version: %d, got: %d", exp, got)

 		}

 	}

@@ -51,6 +51,7 @@ var DescriberCoverageExceptions = []reflect.Type{

 	reflect.TypeOf(&deployapi.DeploymentConfigRollback{}),             // normal users don't ever look at these

 	reflect.TypeOf(&deployapi.DeploymentLog{}),                        // normal users don't ever look at these

 	reflect.TypeOf(&deployapi.DeploymentLogOptions{}),                 // normal users don't ever look at these

+	reflect.TypeOf(&deployapi.DeploymentRequest{}),                    // normal users don't ever look at these

 	reflect.TypeOf(&imageapi.DockerImage{}),                           // not a top level resource

 	reflect.TypeOf(&imageapi.ImageStreamImport{}),                     // normal users don't ever look at these

 	reflect.TypeOf(&oauthapi.OAuthAccessToken{}),                      // normal users don't ever look at these

@@ -30,6 +30,7 @@ var PrinterCoverageExceptions = []reflect.Type{

 	reflect.TypeOf(&imageapi.ImageStreamImport{}),     // normal users don't ever look at these

 	reflect.TypeOf(&buildapi.BuildLog{}),              // just a marker type

 	reflect.TypeOf(&buildapi.BuildLogOptions{}),       // just a marker type

+	reflect.TypeOf(&deployapi.DeploymentRequest{}),    // normal users don't ever look at these

 	reflect.TypeOf(&deployapi.DeploymentLog{}),        // just a marker type

 	reflect.TypeOf(&deployapi.DeploymentLogOptions{}), // just a marker type

@@ -251,7 +251,8 @@ func GetBootstrapClusterRoles() []authorizationapi.ClusterRole {

 				// access to jenkins.  multiple values to ensure that covers relationships

 				authorizationapi.NewRule("admin", "edit", "view").Groups(buildapi.FutureGroupName).Resources("jenkins").RuleOrDie(),

-				authorizationapi.NewRule(readWrite...).Groups(deployGroup).Resources("deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigrollbacks", "deploymentconfigs/rollback", "deploymentconfigs/scale").RuleOrDie(),

+				authorizationapi.NewRule(readWrite...).Groups(deployGroup).Resources("deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigs/scale").RuleOrDie(),

+				authorizationapi.NewRule("create").Groups(deployGroup).Resources("deploymentconfigrollbacks", "deploymentconfigs/rollback", "deploymentconfigs/instantiate").RuleOrDie(),

 				authorizationapi.NewRule(read...).Groups(deployGroup).Resources("deploymentconfigs/log", "deploymentconfigs/status").RuleOrDie(),

 				authorizationapi.NewRule(readWrite...).Groups(imageGroup).Resources("imagestreams", "imagestreammappings", "imagestreamtags", "imagestreamimages", "imagestreams/secrets").RuleOrDie(),

@@ -305,7 +306,8 @@ func GetBootstrapClusterRoles() []authorizationapi.ClusterRole {

 				// access to jenkins.  multiple values to ensure that covers relationships

 				authorizationapi.NewRule("edit", "view").Groups(buildapi.FutureGroupName).Resources("jenkins").RuleOrDie(),

-				authorizationapi.NewRule(readWrite...).Groups(deployGroup).Resources("deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigrollbacks", "deploymentconfigs/rollback", "deploymentconfigs/scale").RuleOrDie(),

+				authorizationapi.NewRule(readWrite...).Groups(deployGroup).Resources("deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigs/scale").RuleOrDie(),

+				authorizationapi.NewRule("create").Groups(deployGroup).Resources("deploymentconfigrollbacks", "deploymentconfigs/rollback", "deploymentconfigs/instantiate").RuleOrDie(),

 				authorizationapi.NewRule(read...).Groups(deployGroup).Resources("deploymentconfigs/log", "deploymentconfigs/status").RuleOrDie(),

 				authorizationapi.NewRule(readWrite...).Groups(imageGroup).Resources("imagestreams", "imagestreammappings", "imagestreamtags", "imagestreamimages", "imagestreams/secrets").RuleOrDie(),

@@ -53,6 +53,7 @@ import (

 	deployconfigetcd "github.com/openshift/origin/pkg/deploy/registry/deployconfig/etcd"

 	deploylogregistry "github.com/openshift/origin/pkg/deploy/registry/deploylog"

 	deployconfiggenerator "github.com/openshift/origin/pkg/deploy/registry/generator"

+	deployconfiginstantiate "github.com/openshift/origin/pkg/deploy/registry/instantiate"

 	deployrollback "github.com/openshift/origin/pkg/deploy/registry/rollback"

 	"github.com/openshift/origin/pkg/dockerregistry"

 	"github.com/openshift/origin/pkg/image/importer"

@@ -498,7 +499,17 @@ func (c *MasterConfig) GetRestStorage() map[string]rest.Storage {

 	checkStorageErr(err)

 	buildConfigRegistry := buildconfigregistry.NewRegistry(buildConfigStorage)

-	deployConfigStorage, deployConfigStatusStorage, deployConfigScaleStorage, err := deployconfigetcd.NewREST(c.RESTOptionsGetter, c.DeploymentConfigScaleClient())

+	deployConfigStorage, deployConfigStatusStorage, deployConfigScaleStorage, err := deployconfigetcd.NewREST(c.RESTOptionsGetter)

+

+	dcInstantiateOriginClient, dcInstantiateKubeClient := c.DeploymentConfigInstantiateClients()

+	dcInstantiateStorage := deployconfiginstantiate.NewREST(

+		*deployConfigStorage.Store,

+		dcInstantiateOriginClient,

+		dcInstantiateKubeClient,

+		c.ExternalVersionCodec,

+		c.AdmissionControl,

+	)

+

 	checkStorageErr(err)

 	deployConfigRegistry := deployconfigregistry.NewRegistry(deployConfigStorage)

@@ -661,11 +672,12 @@ func (c *MasterConfig) GetRestStorage() map[string]rest.Storage {

 		"imageStreamMappings":  imageStreamMappingStorage,

 		"imageStreamTags":      imageStreamTagStorage,

-		"deploymentConfigs":          deployConfigStorage,

-		"deploymentConfigs/scale":    deployConfigScaleStorage,

-		"deploymentConfigs/status":   deployConfigStatusStorage,

-		"deploymentConfigs/rollback": deployConfigRollbackStorage,

-		"deploymentConfigs/log":      deploylogregistry.NewREST(configClient, kclient, c.DeploymentLogClient(), kubeletClient),

+		"deploymentConfigs":             deployConfigStorage,

+		"deploymentConfigs/scale":       deployConfigScaleStorage,

+		"deploymentConfigs/status":      deployConfigStatusStorage,

+		"deploymentConfigs/rollback":    deployConfigRollbackStorage,

+		"deploymentConfigs/log":         deploylogregistry.NewREST(configClient, kclient, c.DeploymentLogClient(), kubeletClient),

+		"deploymentConfigs/instantiate": dcInstantiateStorage,

 		// TODO: Deprecate these

 		"generateDeploymentConfigs": deployconfiggenerator.NewREST(deployConfigGenerator, c.ExternalVersionCodec),

@@ -787,8 +799,7 @@ func initReadinessCheckRoute(root *restful.WebService, path string, readyFunc fu

 		Produces(restful.MIME_JSON))

 }

-// initHealthCheckRoute initializes an HTTP endpoint for health checking.

-// OpenShift is deemed healthy if the API server can respond with an OK messages

+// initMetricsRoute initializes an HTTP endpoint for metrics.

 func initMetricsRoute(root *restful.WebService, path string) {

 	h := prometheus.Handler()

 	root.Route(root.GET(path).To(func(req *restful.Request, resp *restful.Response) {

@@ -898,9 +898,9 @@ func (c *MasterConfig) ImageImportControllerClient() *osclient.Client {

 	return c.PrivilegedLoopbackOpenShiftClient

 }

-// DeploymentConfigScaleClient returns the client used by the Scale subresource registry

-func (c *MasterConfig) DeploymentConfigScaleClient() *kclient.Client {

-	return c.PrivilegedLoopbackKubernetesClient

+// DeploymentConfigInstantiateClients returns the clients used by the instantiate endpoint.

+func (c *MasterConfig) DeploymentConfigInstantiateClients() (*osclient.Client, *kclient.Client) {

+	return c.PrivilegedLoopbackOpenShiftClient, c.PrivilegedLoopbackKubernetesClient

 }

 // DeploymentControllerClients returns the deployment controller client objects

@@ -922,13 +922,8 @@ func (c *MasterConfig) DeploymentConfigControllerClients() (*osclient.Client, *k

 	return c.PrivilegedLoopbackOpenShiftClient, c.PrivilegedLoopbackKubernetesClient

 }

-// DeploymentTriggerControllerClients returns the deploymentConfig trigger controller client objects

-func (c *MasterConfig) DeploymentTriggerControllerClients() (*osclient.Client, *kclient.Client) {

-	return c.PrivilegedLoopbackOpenShiftClient, c.PrivilegedLoopbackKubernetesClient

-}

-

-// DeploymentImageChangeTriggerControllerClient returns the deploymentConfig image change controller client object

-func (c *MasterConfig) DeploymentImageChangeTriggerControllerClient() *osclient.Client {

+// DeploymentTriggerControllerClient returns the deploymentConfig trigger controller client object

+func (c *MasterConfig) DeploymentTriggerControllerClient() *osclient.Client {

 	return c.PrivilegedLoopbackOpenShiftClient

 }

@@ -15,6 +15,7 @@ import (

 	"github.com/openshift/origin/pkg/api/validation"

 	otestclient "github.com/openshift/origin/pkg/client/testclient"

 	"github.com/openshift/origin/pkg/controller/shared"

+	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	quotaapi "github.com/openshift/origin/pkg/quota/api"

 	"github.com/openshift/origin/pkg/quota/controller/clusterquotamapping"

 	"github.com/openshift/origin/pkg/util/restoptions"

@@ -25,6 +26,7 @@ import (

 var KnownUpdateValidationExceptions = []reflect.Type{

 	reflect.TypeOf(&extapi.Scale{}),                         // scale operation uses the ValidateScale() function for both create and update

 	reflect.TypeOf(&quotaapi.AppliedClusterResourceQuota{}), // this only retrieved, never created.  its a virtual projection of ClusterResourceQuota

+	reflect.TypeOf(&deployapi.DeploymentRequest{}),          // request for deployments already use ValidateDeploymentRequest()

 }

 // TestValidationRegistration makes sure that any RESTStorage that allows create or update has the correct validation register.

@@ -43,7 +43,6 @@ import (

 	deploycontroller "github.com/openshift/origin/pkg/deploy/controller/deployment"

 	deployconfigcontroller "github.com/openshift/origin/pkg/deploy/controller/deploymentconfig"

 	triggercontroller "github.com/openshift/origin/pkg/deploy/controller/generictrigger"

-	imagechangecontroller "github.com/openshift/origin/pkg/deploy/controller/imagechange"

 	"github.com/openshift/origin/pkg/dns"

 	imagecontroller "github.com/openshift/origin/pkg/image/controller"

 	projectcontroller "github.com/openshift/origin/pkg/project/controller"

@@ -356,19 +355,9 @@ func (c *MasterConfig) RunDeploymentConfigController() {

 func (c *MasterConfig) RunDeploymentTriggerController() {

 	dcInfomer := c.Informers.DeploymentConfigs().Informer()

 	streamInformer := c.Informers.ImageStreams().Informer()

-	osclient, kclient := c.DeploymentTriggerControllerClients()

+	osclient := c.DeploymentTriggerControllerClient()

-	controller := triggercontroller.NewDeploymentTriggerController(dcInfomer, streamInformer, osclient, kclient, c.ExternalVersionCodec)

-	go controller.Run(5, utilwait.NeverStop)

-}

-

-// RunDeploymentImageChangeTriggerController starts the image change trigger controller process.

-func (c *MasterConfig) RunDeploymentImageChangeTriggerController() {

-	dcInfomer := c.Informers.DeploymentConfigs().Informer()

-	streamInformer := c.Informers.ImageStreams().Informer()

-	osclient, _ := c.DeploymentTriggerControllerClients()

-

-	controller := imagechangecontroller.NewImageChangeController(dcInfomer, streamInformer, osclient)

+	controller := triggercontroller.NewDeploymentTriggerController(dcInfomer, streamInformer, osclient, c.ExternalVersionCodec)

 	go controller.Run(5, utilwait.NeverStop)

 }

@@ -713,7 +713,6 @@ func startControllers(oc *origin.MasterConfig, kc *kubernetes.MasterConfig) erro

 	oc.RunDeploymentController()

 	oc.RunDeploymentConfigController()

 	oc.RunDeploymentTriggerController()

-	oc.RunDeploymentImageChangeTriggerController()

 	oc.RunImageImportController()

 	oc.RunOriginNamespaceController()

 	oc.RunSDNController()

@@ -49,6 +49,13 @@ func ScaleFromConfig(dc *DeploymentConfig) *extensions.Scale {

 	}

 }

+// RequestForConfig builds a new deployment request for a deployment config.

+func RequestForConfig(dc *DeploymentConfig) *DeploymentRequest {

+	return &DeploymentRequest{

+		Name: dc.Name,

+	}

+}

+

 // TemplateImage is a structure for helping a caller iterate over a PodSpec

 type TemplateImage struct {

 	Image string

@@ -32,6 +32,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {

 		&DeploymentConfig{},

 		&DeploymentConfigList{},

 		&DeploymentConfigRollback{},

+		&DeploymentRequest{},

 		&DeploymentLog{},

 		&DeploymentLogOptions{},

 	)

@@ -41,5 +42,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {

 func (obj *DeploymentConfig) GetObjectKind() unversioned.ObjectKind         { return &obj.TypeMeta }

 func (obj *DeploymentConfigList) GetObjectKind() unversioned.ObjectKind     { return &obj.TypeMeta }

 func (obj *DeploymentConfigRollback) GetObjectKind() unversioned.ObjectKind { return &obj.TypeMeta }

+func (obj *DeploymentRequest) GetObjectKind() unversioned.ObjectKind        { return &obj.TypeMeta }

 func (obj *DeploymentLog) GetObjectKind() unversioned.ObjectKind            { return &obj.TypeMeta }

 func (obj *DeploymentLogOptions) GetObjectKind() unversioned.ObjectKind     { return &obj.TypeMeta }

@@ -1,12 +1,15 @@

 package test

 import (

+	"testing"

+

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/resource"

 	"k8s.io/kubernetes/pkg/apis/autoscaling"

 	"k8s.io/kubernetes/pkg/util/sets"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

+	deployv1 "github.com/openshift/origin/pkg/deploy/api/v1"

 	imageapi "github.com/openshift/origin/pkg/image/api"

 )

@@ -238,6 +241,29 @@ func OkHPAForDeploymentConfig(config *deployapi.DeploymentConfig, min, max int)

 	}

 }

+func OkStreamForConfig(config *deployapi.DeploymentConfig) *imageapi.ImageStream {

+	for _, t := range config.Spec.Triggers {

+		if t.Type != deployapi.DeploymentTriggerOnImageChange {

+			continue

+		}

+

+		ref := t.ImageChangeParams.From

+		name, tag, _ := imageapi.SplitImageStreamTag(ref.Name)

+

+		return &imageapi.ImageStream{

+			ObjectMeta: kapi.ObjectMeta{

+				Name:      name,

+				Namespace: ref.Namespace,

+			},

+			Status: imageapi.ImageStreamStatus{

+				Tags: map[string]imageapi.TagEventList{

+					tag: {

+						Items: []imageapi.TagEvent{{DockerImageReference: t.ImageChangeParams.LastTriggeredImage}}}}},

+		}

+	}

+	return nil

+}

+

 func RemoveTriggerTypes(config *deployapi.DeploymentConfig, triggerTypes ...deployapi.DeploymentTriggerType) {

 	types := sets.NewString()

 	for _, triggerType := range triggerTypes {

@@ -254,3 +280,17 @@ func RemoveTriggerTypes(config *deployapi.DeploymentConfig, triggerTypes ...depl

 	config.Spec.Triggers = remaining

 }

+

+func RoundTripConfig(t *testing.T, config *deployapi.DeploymentConfig) *deployapi.DeploymentConfig {

+	versioned, err := kapi.Scheme.ConvertToVersion(config, deployv1.SchemeGroupVersion)

+	if err != nil {

+		t.Errorf("unexpected conversion error: %v", err)

+		return nil

+	}

+	defaulted, err := kapi.Scheme.ConvertToVersion(versioned, deployapi.SchemeGroupVersion)

+	if err != nil {

+		t.Errorf("unexpected conversion error: %v", err)

+		return nil

+	}

+	return defaulted.(*deployapi.DeploymentConfig)

+}

@@ -445,6 +445,18 @@ type DeploymentConfigRollbackSpec struct {

 	IncludeStrategy bool

 }

+// DeploymentRequest is a request to a deployment config for a new deployment.

+type DeploymentRequest struct {

+	unversioned.TypeMeta

+	// Name of the deployment config for requesting a new deployment.

+	Name string

+	// Latest will update the deployment config with the latest state from all triggers.

+	Latest bool

+	// Force will try to force a new deployment to run. If the deployment config is paused,

+	// then setting this to true will return an Invalid error.

+	Force bool

+}

+

 // DeploymentLog represents the logs for a deployment

 type DeploymentLog struct {

 	unversioned.TypeMeta

@@ -21,6 +21,7 @@

 		DeploymentDetails

 		DeploymentLog

 		DeploymentLogOptions

+		DeploymentRequest

 		DeploymentStrategy

 		DeploymentTriggerImageChangeParams

 		DeploymentTriggerPolicies

@@ -113,51 +114,55 @@ func (m *DeploymentLogOptions) Reset()                    { *m = DeploymentLogOp

 func (*DeploymentLogOptions) ProtoMessage()               {}

 func (*DeploymentLogOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{11} }

+func (m *DeploymentRequest) Reset()                    { *m = DeploymentRequest{} }

+func (*DeploymentRequest) ProtoMessage()               {}

+func (*DeploymentRequest) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{12} }

+

 func (m *DeploymentStrategy) Reset()                    { *m = DeploymentStrategy{} }

 func (*DeploymentStrategy) ProtoMessage()               {}

-func (*DeploymentStrategy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{12} }

+func (*DeploymentStrategy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{13} }

 func (m *DeploymentTriggerImageChangeParams) Reset()      { *m = DeploymentTriggerImageChangeParams{} }

 func (*DeploymentTriggerImageChangeParams) ProtoMessage() {}

 func (*DeploymentTriggerImageChangeParams) Descriptor() ([]byte, []int) {

-	return fileDescriptorGenerated, []int{13}

+	return fileDescriptorGenerated, []int{14}

 }

 func (m *DeploymentTriggerPolicies) Reset()      { *m = DeploymentTriggerPolicies{} }

 func (*DeploymentTriggerPolicies) ProtoMessage() {}

 func (*DeploymentTriggerPolicies) Descriptor() ([]byte, []int) {

-	return fileDescriptorGenerated, []int{14}

+	return fileDescriptorGenerated, []int{15}

 }

 func (m *DeploymentTriggerPolicy) Reset()      { *m = DeploymentTriggerPolicy{} }

 func (*DeploymentTriggerPolicy) ProtoMessage() {}

 func (*DeploymentTriggerPolicy) Descriptor() ([]byte, []int) {

-	return fileDescriptorGenerated, []int{15}

+	return fileDescriptorGenerated, []int{16}

 }

 func (m *ExecNewPodHook) Reset()                    { *m = ExecNewPodHook{} }

 func (*ExecNewPodHook) ProtoMessage()               {}

-func (*ExecNewPodHook) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{16} }

+func (*ExecNewPodHook) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{17} }

 func (m *LifecycleHook) Reset()                    { *m = LifecycleHook{} }

 func (*LifecycleHook) ProtoMessage()               {}

-func (*LifecycleHook) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{17} }

+func (*LifecycleHook) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{18} }

 func (m *RecreateDeploymentStrategyParams) Reset()      { *m = RecreateDeploymentStrategyParams{} }

 func (*RecreateDeploymentStrategyParams) ProtoMessage() {}

 func (*RecreateDeploymentStrategyParams) Descriptor() ([]byte, []int) {

-	return fileDescriptorGenerated, []int{18}

+	return fileDescriptorGenerated, []int{19}

 }

 func (m *RollingDeploymentStrategyParams) Reset()      { *m = RollingDeploymentStrategyParams{} }

 func (*RollingDeploymentStrategyParams) ProtoMessage() {}

 func (*RollingDeploymentStrategyParams) Descriptor() ([]byte, []int) {

-	return fileDescriptorGenerated, []int{19}

+	return fileDescriptorGenerated, []int{20}

 }

 func (m *TagImageHook) Reset()                    { *m = TagImageHook{} }

 func (*TagImageHook) ProtoMessage()               {}

-func (*TagImageHook) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{20} }

+func (*TagImageHook) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{21} }

 func init() {

 	proto.RegisterType((*CustomDeploymentStrategyParams)(nil), "github.com.openshift.origin.pkg.deploy.api.v1.CustomDeploymentStrategyParams")

@@ -172,6 +177,7 @@ func init() {

 	proto.RegisterType((*DeploymentDetails)(nil), "github.com.openshift.origin.pkg.deploy.api.v1.DeploymentDetails")

 	proto.RegisterType((*DeploymentLog)(nil), "github.com.openshift.origin.pkg.deploy.api.v1.DeploymentLog")

 	proto.RegisterType((*DeploymentLogOptions)(nil), "github.com.openshift.origin.pkg.deploy.api.v1.DeploymentLogOptions")

+	proto.RegisterType((*DeploymentRequest)(nil), "github.com.openshift.origin.pkg.deploy.api.v1.DeploymentRequest")

 	proto.RegisterType((*DeploymentStrategy)(nil), "github.com.openshift.origin.pkg.deploy.api.v1.DeploymentStrategy")

 	proto.RegisterType((*DeploymentTriggerImageChangeParams)(nil), "github.com.openshift.origin.pkg.deploy.api.v1.DeploymentTriggerImageChangeParams")

 	proto.RegisterType((*DeploymentTriggerPolicies)(nil), "github.com.openshift.origin.pkg.deploy.api.v1.DeploymentTriggerPolicies")

@@ -749,6 +755,44 @@ func (m *DeploymentLogOptions) MarshalTo(data []byte) (int, error) {

 	return i, nil

 }

+func (m *DeploymentRequest) Marshal() (data []byte, err error) {

+	size := m.Size()

+	data = make([]byte, size)

+	n, err := m.MarshalTo(data)

+	if err != nil {

+		return nil, err

+	}

+	return data[:n], nil

+}

+

+func (m *DeploymentRequest) MarshalTo(data []byte) (int, error) {

+	var i int

+	_ = i

+	var l int

+	_ = l

+	data[i] = 0xa

+	i++

+	i = encodeVarintGenerated(data, i, uint64(len(m.Name)))

+	i += copy(data[i:], m.Name)

+	data[i] = 0x10

+	i++

+	if m.Latest {

+		data[i] = 1

+	} else {

+		data[i] = 0

+	}

+	i++

+	data[i] = 0x18

+	i++

+	if m.Force {

+		data[i] = 1

+	} else {

+		data[i] = 0

+	}

+	i++

+	return i, nil

+}

+

 func (m *DeploymentStrategy) Marshal() (data []byte, err error) {

 	size := m.Size()

 	data = make([]byte, size)

@@ -1441,6 +1485,16 @@ func (m *DeploymentLogOptions) Size() (n int) {

 	return n

 }

+func (m *DeploymentRequest) Size() (n int) {

+	var l int

+	_ = l

+	l = len(m.Name)

+	n += 1 + l + sovGenerated(uint64(l))

+	n += 2

+	n += 2

+	return n

+}

+

 func (m *DeploymentStrategy) Size() (n int) {

 	var l int

 	_ = l

@@ -1815,6 +1869,18 @@ func (this *DeploymentLogOptions) String() string {

 	}, "")

 	return s

 }

+func (this *DeploymentRequest) String() string {

+	if this == nil {

+		return "nil"

+	}

+	s := strings.Join([]string{`&DeploymentRequest{`,

+		`Name:` + fmt.Sprintf("%v", this.Name) + `,`,

+		`Latest:` + fmt.Sprintf("%v", this.Latest) + `,`,

+		`Force:` + fmt.Sprintf("%v", this.Force) + `,`,

+		`}`,

+	}, "")

+	return s

+}

 func (this *DeploymentStrategy) String() string {

 	if this == nil {

 		return "nil"

@@ -3913,6 +3979,125 @@ func (m *DeploymentLogOptions) Unmarshal(data []byte) error {

 	}

 	return nil

 }

+func (m *DeploymentRequest) Unmarshal(data []byte) error {

+	l := len(data)

+	iNdEx := 0

+	for iNdEx < l {

+		preIndex := iNdEx

+		var wire uint64

+		for shift := uint(0); ; shift += 7 {

+			if shift >= 64 {

+				return ErrIntOverflowGenerated

+			}

+			if iNdEx >= l {

+				return io.ErrUnexpectedEOF

+			}

+			b := data[iNdEx]

+			iNdEx++

+			wire |= (uint64(b) & 0x7F) << shift

+			if b < 0x80 {

+				break

+			}

+		}

+		fieldNum := int32(wire >> 3)

+		wireType := int(wire & 0x7)

+		if wireType == 4 {

+			return fmt.Errorf("proto: DeploymentRequest: wiretype end group for non-group")

+		}

+		if fieldNum <= 0 {

+			return fmt.Errorf("proto: DeploymentRequest: illegal tag %d (wire type %d)", fieldNum, wire)

+		}

+		switch fieldNum {

+		case 1:

+			if wireType != 2 {

+				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)

+			}

+			var stringLen uint64

+			for shift := uint(0); ; shift += 7 {

+				if shift >= 64 {

+					return ErrIntOverflowGenerated

+				}

+				if iNdEx >= l {

+					return io.ErrUnexpectedEOF

+				}

+				b := data[iNdEx]

+				iNdEx++

+				stringLen |= (uint64(b) & 0x7F) << shift

+				if b < 0x80 {

+					break

+				}

+			}

+			intStringLen := int(stringLen)

+			if intStringLen < 0 {

+				return ErrInvalidLengthGenerated

+			}

+			postIndex := iNdEx + intStringLen

+			if postIndex > l {

+				return io.ErrUnexpectedEOF

+			}

+			m.Name = string(data[iNdEx:postIndex])

+			iNdEx = postIndex

+		case 2:

+			if wireType != 0 {

+				return fmt.Errorf("proto: wrong wireType = %d for field Latest", wireType)

+			}

+			var v int

+			for shift := uint(0); ; shift += 7 {

+				if shift >= 64 {

+					return ErrIntOverflowGenerated

+				}

+				if iNdEx >= l {

+					return io.ErrUnexpectedEOF

+				}

+				b := data[iNdEx]

+				iNdEx++

+				v |= (int(b) & 0x7F) << shift

+				if b < 0x80 {