@@ -117,14 +117,18 @@ angular.module('openshiftConsole')

     // Sets up subscription for deployments and deploymentsByConfig

     var deploymentsCallback = function(action, deployment) {

       $scope.$apply(function() {

-        DataService.objectByAttribute(deployment, "metadata.name", $scope.deployments, action);

-        DataService.objectByAttribute(deployment, "metadata.annotations.deploymentConfig", $scope.deploymentsByConfig, action, "id");

+        if (deployment.annotations && deployment.annotations.encodedDeploymentConfig) {

+          var depConfig = $.parseJSON(deployment.annotations.encodedDeploymentConfig);

+          deployment.details = depConfig.details;

+        }

+        DataService.objectByAttribute(deployment, "id", $scope.deployments, action);

+        DataService.objectByAttribute(deployment, "annotations.deploymentConfig", $scope.deploymentsByConfig, action, "id");

       });

       console.log("deployments (subscribe)", $scope.deployments);

       console.log("deploymentsByConfig (subscribe)", $scope.deploymentsByConfig);

     };

-    DataService.subscribe("deployments", deploymentsCallback, $scope);

+    DataService.subscribe("replicationControllers", deploymentsCallback, $scope);

     // Sets up subscription for images and imagesByDockerReference

     var imagesCallback = function(action, image) {

@@ -12,7 +12,8 @@ angular.module('openshiftConsole')

     images : "osapi",

     projects : "osapi",

     pods : "api",

-    services : "api"

+    services : "api",

+    replicationControllers: "api"

   };

   function DataService() {

@@ -32,9 +32,9 @@

               </div>

             </div>

             <div ng-repeat="deployment in deploymentsByConfig[deploymentConfigId]" style="margin-top: 10px; text-align: center;">

-              <div ng-if="servicePodsByLabel.deployment[deployment.metadata.name]">

+              <div ng-if="servicePodsByLabel.deployment[deployment.id]">

                 <div class="small muted" ng-if="deployment" style="margin-bottom: 10px;">

-                  <relative-timestamp timestamp="deployment.metadata.creationTimestamp"></relative-timestamp>

+                  <relative-timestamp timestamp="deployment.creationTimestamp"></relative-timestamp>

                   <span ng-if="deployment.details && deployment.details.causes && deployment.details.causes.length > 0">

                     <span>, triggered by 

                       <span ng-repeat="cause in deployment.details.causes">

@@ -48,8 +48,8 @@

                 </div>

                 <div style="display: inline-block;">

                   <!-- TODO figure out why podTemplate can't be done the same way as pods -->

-                  <pod-template ng-init="podTemplate = deployment.controllerTemplate.podTemplate"></pod-template>

-                  <pods pods="servicePodsByLabel.deployment[deployment.metadata.name]"></pods>

+                  <pod-template ng-init="podTemplate = deployment.desiredState.podTemplate"></pod-template>

+                  <pods pods="servicePodsByLabel.deployment[deployment.id]"></pods>

                 </div>

               </div>

             </div>

@@ -1084,7 +1084,8 @@ deploymentConfigs:"osapi",

 images:"osapi",

 projects:"osapi",

 pods:"api",

-services:"api"

+services:"api",

+replicationControllers:"api"

 };

 a.prototype.getList = function(a, b, c) {

 if (b.fire) {

@@ -1247,10 +1248,14 @@ f(d), e(b), c.subscribe("services", g, a), c.subscribePolling("pods", e, a);

 }, this));

 var i = function(b, d) {

 a.$apply(function() {

-c.objectByAttribute(d, "metadata.name", a.deployments, b), c.objectByAttribute(d, "metadata.annotations.deploymentConfig", a.deploymentsByConfig, b, "id");

+if (d.annotations && d.annotations.encodedDeploymentConfig) {

+var e = $.parseJSON(d.annotations.encodedDeploymentConfig);

+d.details = e.details;

+}

+c.objectByAttribute(d, "id", a.deployments, b), c.objectByAttribute(d, "annotations.deploymentConfig", a.deploymentsByConfig, b, "id");

 }), console.log("deployments (subscribe)", a.deployments), console.log("deploymentsByConfig (subscribe)", a.deploymentsByConfig);

 };

-c.subscribe("deployments", i, a);

+c.subscribe("replicationControllers", i, a);

 var j = function(b, d) {

 a.$apply(function() {

 c.objectByAttribute(d, "metadata.name", a.images, b), c.objectByAttribute(d, "dockerImageReference", a.imagesByDockerReference, b);

@@ -45546,7 +45551,7 @@ func views_pods_html2() ([]byte, error) {

 	return _views_pods_html2, nil

 }

-var _views_project_html = []byte(`<div> <h1 style="margin-top: 10px">Project {{project.displayName || project.metadata.name}}</h1> <div class="small muted" style="margin-top: -15px; margin-bottom: 20px" ng-if="project | annotation : 'description'">{{project | annotation : 'description'}}</div> <!-- TODO handle things that don't live under services --> <!-- TODO handle multiple services mapping to the same deploymentConfig/deployment/pod --> <section ng-repeat="(serviceId, servicePodsByLabel) in podsByServiceByLabel"> <div class="row"> <div class="col-md-12"> <div class="tile"> <h2 class="service">{{serviceId}} <span class="small"> - routing {{services[serviceId].protocol}} traffic on {{services[serviceId].portalIP}}:{{services[serviceId].port}} to port {{services[serviceId].containerPort}}</span> <span class="connector connector-vertical" style="left: 50%; top: 35px; height: 21px"> <span class="connector-endpoint connector-endpoint-top"></span> <span class="connector-line" style="height: 21px"></span> <span class="connector-endpoint" style="top: 18px"></span> </span> </h2> <div class="separator"></div> <div ng-repeat="(deploymentConfigId, deploymentConfig) in deploymentConfigs" ng-if="!deploymentConfig || services[serviceId].selector.name == deploymentConfig.template.controllerTemplate.replicaSelector.name"> <!-- deploymentConfig could be null when we have any deployments that were not generated from a deploymentConfig --> <div ng-if="deploymentConfig"> <div ng-repeat="trigger in deploymentConfig.triggers"> <div ng-repeat="build in trigger.builds" style="border-bottom: 1px solid #ddd; padding-bottom: 10px; margin-top: 10px" ng-if="(build.status != 'Complete' && build.status != 'Failed') || (build.metadata.creationTimestamp | ageLessThan : 5 : 'minutes')" class="animate-repeat"> <span ng-switch="build.status" class="hide-ng-leave"> <span ng-switch-when="Complete" class="font-icon icon-ok font-icon-green" aria-hidden="true" style="margin-right: 5px"></span> <span ng-switch-when="Failed" class="font-icon icon-remove font-icon-red" aria-hidden="true" style="margin-right: 5px"></span> <span ng-switch-default class="font-icon icon-ci-arrows clockwise" aria-hidden="true" style="margin-right: 5px"></span> </span> <span>A build of {{build.metadata.labels.buildconfig}} is {{build.status | lowercase}}.</span> <span ng-if="build.status != 'Complete' && build.status != 'Failed' && trigger.imageChangeParams.automatic"> A new deployment will be created automatically once the build completes.</span> </div> </div> </div> <div ng-repeat="deployment in deploymentsByConfig[deploymentConfigId]" style="margin-top: 10px; text-align: center"> <div ng-if="servicePodsByLabel.deployment[deployment.metadata.name]"> <div class="small muted" ng-if="deployment" style="margin-bottom: 10px"> <relative-timestamp timestamp="deployment.metadata.creationTimestamp"></relative-timestamp> <span ng-if="deployment.details && deployment.details.causes && deployment.details.causes.length > 0"> <span>, triggered by <span ng-repeat="cause in deployment.details.causes"> <span ng-switch="cause.type"> <span ng-switch-when="ImageChange">new image for {{cause.imageTrigger.repositoryName | imageName}}:{{cause.imageTrigger.tag}}</span> <span ng-switch-when="ConfigChange">deployment configuration change</span> </span> </span> </span> </span> </div> <div style="display: inline-block"> <!-- TODO figure out why podTemplate can't be done the same way as pods --> <pod-template ng-init="podTemplate = deployment.controllerTemplate.podTemplate"></pod-template> <pods pods="servicePodsByLabel.deployment[deployment.metadata.name]"></pods> </div> </div> </div> </div> <!-- TODO implement filters for empty and present to return booleans for cases like this --> <div ng-if="(servicePodsByLabel | hashSize) == 0" style="margin-top: 10px"> <span style="margin-left: 20px">There are currently no pods for this service.</span> </div> </div> </div> </div> </section> </div>`)

+var _views_project_html = []byte(`<div> <h1 style="margin-top: 10px">Project {{project.displayName || project.metadata.name}}</h1> <div class="small muted" style="margin-top: -15px; margin-bottom: 20px" ng-if="project | annotation : 'description'">{{project | annotation : 'description'}}</div> <!-- TODO handle things that don't live under services --> <!-- TODO handle multiple services mapping to the same deploymentConfig/deployment/pod --> <section ng-repeat="(serviceId, servicePodsByLabel) in podsByServiceByLabel"> <div class="row"> <div class="col-md-12"> <div class="tile"> <h2 class="service">{{serviceId}} <span class="small"> - routing {{services[serviceId].protocol}} traffic on {{services[serviceId].portalIP}}:{{services[serviceId].port}} to port {{services[serviceId].containerPort}}</span> <span class="connector connector-vertical" style="left: 50%; top: 35px; height: 21px"> <span class="connector-endpoint connector-endpoint-top"></span> <span class="connector-line" style="height: 21px"></span> <span class="connector-endpoint" style="top: 18px"></span> </span> </h2> <div class="separator"></div> <div ng-repeat="(deploymentConfigId, deploymentConfig) in deploymentConfigs" ng-if="!deploymentConfig || services[serviceId].selector.name == deploymentConfig.template.controllerTemplate.replicaSelector.name"> <!-- deploymentConfig could be null when we have any deployments that were not generated from a deploymentConfig --> <div ng-if="deploymentConfig"> <div ng-repeat="trigger in deploymentConfig.triggers"> <div ng-repeat="build in trigger.builds" style="border-bottom: 1px solid #ddd; padding-bottom: 10px; margin-top: 10px" ng-if="(build.status != 'Complete' && build.status != 'Failed') || (build.metadata.creationTimestamp | ageLessThan : 5 : 'minutes')" class="animate-repeat"> <span ng-switch="build.status" class="hide-ng-leave"> <span ng-switch-when="Complete" class="font-icon icon-ok font-icon-green" aria-hidden="true" style="margin-right: 5px"></span> <span ng-switch-when="Failed" class="font-icon icon-remove font-icon-red" aria-hidden="true" style="margin-right: 5px"></span> <span ng-switch-default class="font-icon icon-ci-arrows clockwise" aria-hidden="true" style="margin-right: 5px"></span> </span> <span>A build of {{build.metadata.labels.buildconfig}} is {{build.status | lowercase}}.</span> <span ng-if="build.status != 'Complete' && build.status != 'Failed' && trigger.imageChangeParams.automatic"> A new deployment will be created automatically once the build completes.</span> </div> </div> </div> <div ng-repeat="deployment in deploymentsByConfig[deploymentConfigId]" style="margin-top: 10px; text-align: center"> <div ng-if="servicePodsByLabel.deployment[deployment.id]"> <div class="small muted" ng-if="deployment" style="margin-bottom: 10px"> <relative-timestamp timestamp="deployment.creationTimestamp"></relative-timestamp> <span ng-if="deployment.details && deployment.details.causes && deployment.details.causes.length > 0"> <span>, triggered by <span ng-repeat="cause in deployment.details.causes"> <span ng-switch="cause.type"> <span ng-switch-when="ImageChange">new image for {{cause.imageTrigger.repositoryName | imageName}}:{{cause.imageTrigger.tag}}</span> <span ng-switch-when="ConfigChange">deployment configuration change</span> </span> </span> </span> </span> </div> <div style="display: inline-block"> <!-- TODO figure out why podTemplate can't be done the same way as pods --> <pod-template ng-init="podTemplate = deployment.desiredState.podTemplate"></pod-template> <pods pods="servicePodsByLabel.deployment[deployment.id]"></pods> </div> </div> </div> </div> <!-- TODO implement filters for empty and present to return booleans for cases like this --> <div ng-if="(servicePodsByLabel | hashSize) == 0" style="margin-top: 10px"> <span style="margin-left: 20px">There are currently no pods for this service.</span> </div> </div> </div> </div> </section> </div>`)

 func views_project_html() ([]byte, error) {

 	return _views_project_html, nil

@@ -7,9 +7,11 @@ import (

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

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

+

+	"github.com/openshift/origin/pkg/api/latest"

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

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

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

 	strategy "github.com/openshift/origin/pkg/deploy/strategy/recreate"

 )

@@ -52,7 +54,7 @@ func NewCommandDeployer(name string) *cobra.Command {

 // deploy starts the deployer

 func deploy(cfg *config) error {

-	kClient, osClient, err := cfg.Config.Clients()

+	kClient, _, err := cfg.Config.Clients()

 	if err != nil {

 		return err

 	}

@@ -60,12 +62,15 @@ func deploy(cfg *config) error {

 		return errors.New("No deployment name was specified.")

 	}

-	var deployment *deployapi.Deployment

-	if deployment, err = osClient.Deployments(cfg.Namespace).Get(cfg.DeploymentName); err != nil {

+	var deployment *kapi.ReplicationController

+	if deployment, err = kClient.ReplicationControllers(cfg.Namespace).Get(cfg.DeploymentName); err != nil {

 		return err

 	}

 	// TODO: Choose a strategy based on some input

-	strategy := &strategy.DeploymentStrategy{strategy.RealReplicationController{KubeClient: kClient}}

+	strategy := &strategy.DeploymentStrategy{

+		ReplicationController: strategy.RealReplicationController{KubeClient: kClient},

+		Codec: latest.Codec,

+	}

 	return strategy.Deploy(deployment)

 }

@@ -130,9 +130,10 @@ func (c *MasterConfig) InstallAPI(container *restful.Container) []string {

 	oauthEtcd := oauthetcd.New(c.EtcdHelper)

 	deployConfigGenerator := &deployconfiggenerator.DeploymentConfigGenerator{

-		DeploymentInterface:       deployEtcd,

+		DeploymentInterface:       &clientDeploymentInterface{c.KubeClient},

 		DeploymentConfigInterface: deployEtcd,

 		ImageRepositoryInterface:  imageEtcd,

+		Codec: latest.Codec,

 	}

 	defaultRegistry := env("OPENSHIFT_DEFAULT_REGISTRY", "")

@@ -354,6 +355,7 @@ func (c *MasterConfig) RunDeploymentController() {

 	factory := deploycontrollerfactory.DeploymentControllerFactory{

 		Client:     c.OSClient,

 		KubeClient: c.KubeClient,

+		Codec:      latest.Codec,

 		Environment: []api.EnvVar{

 			{Name: "KUBERNETES_MASTER", Value: c.MasterAddr},

 			{Name: "OPENSHIFT_MASTER", Value: c.MasterAddr},

@@ -367,13 +369,21 @@ func (c *MasterConfig) RunDeploymentController() {

 }

 func (c *MasterConfig) RunDeploymentConfigController() {

-	factory := deploycontrollerfactory.DeploymentConfigControllerFactory{Client: c.OSClient}

+	factory := deploycontrollerfactory.DeploymentConfigControllerFactory{

+		Client:     c.OSClient,

+		KubeClient: c.KubeClient,

+		Codec:      latest.Codec,

+	}

 	controller := factory.Create()

 	controller.Run()

 }

 func (c *MasterConfig) RunDeploymentConfigChangeController() {

-	factory := deploycontrollerfactory.DeploymentConfigChangeControllerFactory{Client: c.OSClient}

+	factory := deploycontrollerfactory.DeploymentConfigChangeControllerFactory{

+		Client:     c.OSClient,

+		KubeClient: c.KubeClient,

+		Codec:      latest.Codec,

+	}

 	controller := factory.Create()

 	controller.Run()

 }

@@ -420,3 +430,11 @@ func (c ClientWebhookInterface) CreateBuild(namespace string, build *buildapi.Bu

 func (c ClientWebhookInterface) GetBuildConfig(namespace, name string) (*buildapi.BuildConfig, error) {

 	return c.Client.BuildConfigs(namespace).Get(name)

 }

+

+type clientDeploymentInterface struct {

+	KubeClient kclient.Interface

+}

+

+func (c *clientDeploymentInterface) GetDeployment(ctx api.Context, id string) (*api.ReplicationController, error) {

+	return c.KubeClient.ReplicationControllers(api.Namespace(ctx)).Get(id)

+}

@@ -6,6 +6,9 @@ import (

 // A deployment represents a single configuration of a pod deployed into the cluster, and may

 // represent both a current deployment or a historical deployment.

+//

+// DEPRECATED: This type longer drives any system behavior. Deployments are now represented directly

+// by ReplicationControllers. Use DeploymentConfig to drive deployments.

 type Deployment struct {

 	kapi.TypeMeta   `json:",inline" yaml:",inline"`

 	kapi.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`

@@ -25,7 +28,7 @@ type Deployment struct {

 	Details *DeploymentDetails `json:"details,omitempty" yaml:"details,omitempty"`

 }

-// DeploymentStatus decribes the possible states a Deployment can be in.

+// DeploymentStatus decribes the possible states a deployment can be in.

 type DeploymentStatus string

 const (

@@ -72,30 +75,49 @@ type CustomDeploymentStrategyParams struct {

 }

 // A DeploymentList is a collection of deployments.

+// DEPRECATED: Like Deployment, this is no longer used.

 type DeploymentList struct {

 	kapi.TypeMeta `json:",inline" yaml:",inline"`

 	kapi.ListMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`

 	Items         []Deployment `json:"items" yaml:"items"`

 }

-// These constants represent annotation keys used for correlating objects related to deployments.

+// These constants represent keys used for correlating objects related to deployments.

 const (

+	// DeploymentConfigAnnotation is an annotation name used to correlate a deployment with the

+	// DeploymentConfig on which the deployment is based.

 	DeploymentConfigAnnotation = "deploymentConfig"

-	DeploymentAnnotation       = "deployment"

-	DeploymentPodAnnotation    = "pod"

+	// DeploymentAnnotation is an annotation on a deployer Pod. The annotation value is the name

+	// of the deployment (a ReplicationController) on which the deployer Pod acts.

+	DeploymentAnnotation = "deployment"

+	// DeploymentPodAnnotation is an annotation on a deployment (a ReplicationController). The

+	// annotation value is the name of the deployer Pod which will act upon the ReplicationController

+	// to implement the deployment behavior.

+	DeploymentPodAnnotation = "pod"

+	// DeploymentStatusAnnotation is an annotation name used to retrieve the DeploymentStatus of

+	// a deployment.

+	DeploymentStatusAnnotation = "deploymentStatus"

+	// DeploymentEncodedConfigAnnotation is an annotation name used to retrieve specific encoded

+	// DeploymentConfig on which a given deployment is based.

+	DeploymentEncodedConfigAnnotation = "encodedDeploymentConfig"

+	// DeploymentVersionAnnotation is an annotation on a deployment (a ReplicationController). The

+	// annotation value is the LatestVersion value of the DeploymentConfig which was the basis for

+	// the deployment.

+	DeploymentVersionAnnotation = "deploymentVersion"

+	// DeploymentLabel is the name of a label used to correlate a deployment with the Pod created

+	// to execute the deployment logic.

 	// TODO: This is a workaround for upstream's lack of annotation support on PodTemplate. Once

 	// annotations are available on PodTemplate, audit this constant with the goal of removing it.

 	DeploymentLabel = "deployment"

-)

-

-// These constants represent label keys used for correlating objects related to deployment.

-const (

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

+	// DeploymentConfigs on which the deployment is based.

 	DeploymentConfigLabel = "deploymentconfig"

 )

-// DeploymentConfig represents a configuration for a single deployment of a replication controller:

-// what the template is for the deployment, how new deployments are triggered, what the desired

-// deployment state is.

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

+// ReplicationController). It also contains details about changes which resulted in the current

+// state of the DeploymentConfig. Each change to the DeploymentConfig which should result in

+// a new deployment results in an increment of LatestVersion.

 type DeploymentConfig struct {

 	kapi.TypeMeta   `json:",inline" yaml:",inline"`

 	kapi.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`

@@ -113,7 +135,7 @@ type DeploymentConfig struct {

 	Details *DeploymentDetails `json:"details,omitempty" yaml:"details,omitempty"`

 }

-// DeploymentTemplate contains all the necessary information to create a Deployment from a

+// DeploymentTemplate contains all the necessary information to create a deployment from a

 // DeploymentStrategy.

 type DeploymentTemplate struct {

 	// Strategy describes how a deployment is executed.

@@ -122,7 +144,7 @@ type DeploymentTemplate struct {

 	ControllerTemplate kapi.ReplicationControllerSpec `json:"controllerTemplate,omitempty" yaml:"controllerTemplate,omitempty"`

 }

-// DeploymentTriggerPolicy describes a policy for a single trigger that results in a new Deployment.

+// DeploymentTriggerPolicy describes a policy for a single trigger that results in a new deployment.

 type DeploymentTriggerPolicy struct {

 	Type DeploymentTriggerType `json:"type,omitempty" yaml:"type,omitempty"`

 	// ImageChangeParams represents the parameters for the ImageChange trigger.

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

 // A deployment represents a single configuration of a pod deployed into the cluster, and may

 // represent both a current deployment or a historical deployment.

+//

+// DEPRECATED: This type longer drives any system behavior. Deployments are now represented directly

+// by ReplicationControllers. Use DeploymentConfig to drive deployments.

 type Deployment struct {

 	v1beta3.TypeMeta   `json:",inline" yaml:",inline"`

 	v1beta3.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`

@@ -26,7 +29,7 @@ type Deployment struct {

 	Details *DeploymentDetails `json:"details,omitempty" yaml:"details,omitempty"`

 }

-// DeploymentStatus decribes the possible states a Deployment can be in.

+// DeploymentStatus decribes the possible states a deployment can be in.

 type DeploymentStatus string

 const (

@@ -73,30 +76,49 @@ type CustomDeploymentStrategyParams struct {

 }

 // A DeploymentList is a collection of deployments.

+// DEPRECATED: Like Deployment, this is no longer used.

 type DeploymentList struct {

 	v1beta3.TypeMeta `json:",inline" yaml:",inline"`

 	v1beta3.ListMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`

 	Items            []Deployment `json:"items" yaml:"items"`

 }

-// These constants represent annotation keys used for correlating objects related to deployments.

+// These constants represent keys used for correlating objects related to deployments.

 const (

+	// DeploymentConfigAnnotation is an annotation name used to correlate a deployment with the

+	// DeploymentConfig on which the deployment is based.

 	DeploymentConfigAnnotation = "deploymentConfig"

-	DeploymentAnnotation       = "deployment"

-	DeploymentPodAnnotation    = "pod"

+	// DeploymentAnnotation is an annotation on a deployer Pod. The annotation value is the name

+	// of the deployment (a ReplicationController) on which the deployer Pod acts.

+	DeploymentAnnotation = "deployment"

+	// DeploymentPodAnnotation is an annotation on a deployment (a ReplicationController). The

+	// annotation value is the name of the deployer Pod which will act upon the ReplicationController

+	// to implement the deployment behavior.

+	DeploymentPodAnnotation = "pod"

+	// DeploymentStatusAnnotation is an annotation name used to retrieve the DeploymentStatus of

+	// a deployment.

+	DeploymentStatusAnnotation = "deploymentStatus"

+	// DeploymentEncodedConfigAnnotation is an annotation name used to retrieve specific encoded

+	// DeploymentConfig on which a given deployment is based.

+	DeploymentEncodedConfigAnnotation = "encodedDeploymentConfig"

+	// DeploymentVersionAnnotation is an annotation on a deployment (a ReplicationController). The

+	// annotation value is the LatestVersion value of the DeploymentConfig which was the basis for

+	// the deployment.

+	DeploymentVersionAnnotation = "deploymentVersion"

+	// DeploymentLabel is the name of a label used to correlate a deployment with the Pod created

+	// to execute the deployment logic.

 	// TODO: This is a workaround for upstream's lack of annotation support on PodTemplate. Once

 	// annotations are available on PodTemplate, audit this constant with the goal of removing it.

 	DeploymentLabel = "deployment"

-)

-

-// These constants represent label keys used for correlating objects related to deployment.

-const (

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

+	// DeploymentConfigs on which the deployment is based.

 	DeploymentConfigLabel = "deploymentconfig"

 )

-// DeploymentConfig represents a configuration for a single deployment of a replication controller:

-// what the template is for the deployment, how new deployments are triggered, what the desired

-// deployment state is.

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

+// ReplicationController). It also contains details about changes which resulted in the current

+// state of the DeploymentConfig. Each change to the DeploymentConfig which should result in

+// a new deployment results in an increment of LatestVersion.

 type DeploymentConfig struct {

 	v1beta3.TypeMeta   `json:",inline" yaml:",inline"`

 	v1beta3.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`

@@ -114,7 +136,8 @@ type DeploymentConfig struct {

 	Details *DeploymentDetails `json:"details,omitempty" yaml:"details,omitempty"`

 }

-// DeploymentTemplate templatizes the configurable fields of a Deployment.

+// DeploymentTemplate contains all the necessary information to create a deployment from a

+// DeploymentStrategy.

 type DeploymentTemplate struct {

 	// Strategy describes how a deployment is executed.

 	Strategy DeploymentStrategy `json:"strategy,omitempty" yaml:"strategy,omitempty"`

@@ -122,7 +145,7 @@ type DeploymentTemplate struct {

 	ControllerTemplate v1beta1.ReplicationControllerState `json:"controllerTemplate,omitempty" yaml:"controllerTemplate,omitempty"`

 }

-// DeploymentTriggerPolicy describes a policy for a single trigger that results in a new Deployment.

+// DeploymentTriggerPolicy describes a policy for a single trigger that results in a new deployment.

 type DeploymentTriggerPolicy struct {

 	Type DeploymentTriggerType `json:"type,omitempty" yaml:"type,omitempty"`

 	// ImageChangeParams represents the parameters for the ImageChange trigger.

@@ -1,7 +1,9 @@

 package controller

 import (

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

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

+	runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

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

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

@@ -17,6 +19,7 @@ type DeploymentConfigChangeController struct {

 	ChangeStrategy       changeStrategy

 	NextDeploymentConfig func() *deployapi.DeploymentConfig

 	DeploymentStore      cache.Store

+	Codec                runtime.Codec

 	// Stop is an optional channel that controls when the controller exits

 	Stop <-chan struct{}

 }

@@ -62,17 +65,21 @@ func (dc *DeploymentConfigChangeController) HandleDeploymentConfig() {

 		return

 	}

-	deployment := obj.(*deployapi.Deployment)

+	deployment := obj.(*kapi.ReplicationController)

-	if deployutil.PodSpecsEqual(config.Template.ControllerTemplate.Template.Spec, deployment.ControllerTemplate.Template.Spec) {

-		glog.V(4).Infof("Ignoring updated config %s with LatestVersion=%d because it matches deployment %s", config.Name, config.LatestVersion, deployment.Name)

-		return

+	if deployedConfig, err := deployutil.DecodeDeploymentConfig(deployment, dc.Codec); err == nil {

+		if deployutil.PodSpecsEqual(config.Template.ControllerTemplate.Template.Spec, deployedConfig.Template.ControllerTemplate.Template.Spec) {

+			glog.V(4).Infof("Ignoring updated config %s with LatestVersion=%d because it matches deployed config %s", config.Name, config.LatestVersion, deployment.Name)

+			return

+		}

+	} else {

+		glog.V(0).Infof("Error decoding deploymentConfig from deployment %s: %v", deployment.Name, err)

 	}

 	dc.generateDeployment(config, deployment)

 }

-func (dc *DeploymentConfigChangeController) generateDeployment(config *deployapi.DeploymentConfig, deployment *deployapi.Deployment) {

+func (dc *DeploymentConfigChangeController) generateDeployment(config *deployapi.DeploymentConfig, deployment *kapi.ReplicationController) {

 	newConfig, err := dc.ChangeStrategy.GenerateDeploymentConfig(config.Namespace, config.Name)

 	if err != nil {

 		glog.V(2).Infof("Error generating new version of deploymentConfig %v: %#v", config.Name, err)

@@ -4,8 +4,11 @@ import (

 	"testing"

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

+

+	api "github.com/openshift/origin/pkg/api/latest"

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

 	deploytest "github.com/openshift/origin/pkg/deploy/controller/test"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

 // Test the controller's response to a new DeploymentConfig with a config change trigger.

@@ -14,6 +17,7 @@ func TestNewConfigWithoutTrigger(t *testing.T) {

 	updated := false

 	controller := &DeploymentConfigChangeController{

+		Codec: api.Codec,

 		ChangeStrategy: &testChangeStrategy{

 			GenerateDeploymentConfigFunc: func(namespace, name string) (*deployapi.DeploymentConfig, error) {

 				generated = true

@@ -48,6 +52,7 @@ func TestNewConfigWithTrigger(t *testing.T) {

 	)

 	controller := &DeploymentConfigChangeController{

+		Codec: api.Codec,

 		ChangeStrategy: &testChangeStrategy{

 			GenerateDeploymentConfigFunc: func(namespace, name string) (*deployapi.DeploymentConfig, error) {

 				generatedName = name

@@ -89,6 +94,7 @@ func TestChangeWithTemplateDiff(t *testing.T) {

 	)

 	controller := &DeploymentConfigChangeController{

+		Codec: api.Codec,

 		ChangeStrategy: &testChangeStrategy{

 			GenerateDeploymentConfigFunc: func(namespace, name string) (*deployapi.DeploymentConfig, error) {

 				generatedName = name

@@ -102,7 +108,7 @@ func TestChangeWithTemplateDiff(t *testing.T) {

 		NextDeploymentConfig: func() *deployapi.DeploymentConfig {

 			return diffedConfig()

 		},

-		DeploymentStore: deploytest.NewFakeDeploymentStore(matchingInitialDeployment()),

+		DeploymentStore: deploytest.NewFakeDeploymentStore(matchingInitialDeployment(generatedConfig())),

 	}

 	controller.HandleDeploymentConfig()

@@ -123,14 +129,16 @@ func TestChangeWithTemplateDiff(t *testing.T) {

 }

 func TestChangeWithoutTemplateDiff(t *testing.T) {

+	config := existingConfigWithTrigger()

 	generated := false

 	updated := false

 	controller := &DeploymentConfigChangeController{

+		Codec: api.Codec,

 		ChangeStrategy: &testChangeStrategy{

 			GenerateDeploymentConfigFunc: func(namespace, name string) (*deployapi.DeploymentConfig, error) {

 				generated = true

-				return nil, nil

+				return config, nil

 			},

 			UpdateDeploymentConfigFunc: func(namespace string, config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {

 				updated = true

@@ -138,9 +146,9 @@ func TestChangeWithoutTemplateDiff(t *testing.T) {

 			},

 		},

 		NextDeploymentConfig: func() *deployapi.DeploymentConfig {

-			return existingConfigWithTrigger()

+			return config

 		},

-		DeploymentStore: deploytest.NewFakeDeploymentStore(matchingInitialDeployment()),

+		DeploymentStore: deploytest.NewFakeDeploymentStore(matchingInitialDeployment(config)),

 	}

 	controller.HandleDeploymentConfig()

@@ -291,30 +299,18 @@ func generatedConfig() *deployapi.DeploymentConfig {

 	return config

 }

-func matchingInitialDeployment() *deployapi.Deployment {

-	return &deployapi.Deployment{

-		ObjectMeta: kapi.ObjectMeta{Name: "test-deploy-config-1"},

-		Status:     deployapi.DeploymentStatusNew,

-		ControllerTemplate: kapi.ReplicationControllerSpec{

-			Replicas: 1,

-			Selector: map[string]string{

-				"name": "test-pod",

-			},

-			Template: &kapi.PodTemplateSpec{

-				ObjectMeta: kapi.ObjectMeta{

-					Labels: map[string]string{

-						"name": "test-pod",

-					},

-				},

-				Spec: kapi.PodSpec{

-					Containers: []kapi.Container{

-						{

-							Name:  "container-1",

-							Image: "registry:8080/openshift/test-image:ref-1",

-						},

-					},

-				},

+func matchingInitialDeployment(config *deployapi.DeploymentConfig) *kapi.ReplicationController {

+	encodedConfig, _ := deployutil.EncodeDeploymentConfig(config, api.Codec)

+

+	return &kapi.ReplicationController{

+		ObjectMeta: kapi.ObjectMeta{

+			Name: deployutil.LatestDeploymentIDForConfig(config),

+			Annotations: map[string]string{

+				deployapi.DeploymentConfigAnnotation:        config.Name,

+				deployapi.DeploymentStatusAnnotation:        string(deployapi.DeploymentStatusNew),

+				deployapi.DeploymentEncodedConfigAnnotation: encodedConfig,

 			},

 		},

+		Spec: config.Template.ControllerTemplate,

 	}

 }

@@ -1,30 +1,38 @@

 package controller

 import (

+	"strconv"

+

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

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

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

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

 	"github.com/golang/glog"

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

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

-// DeploymentConfigController is responsible for creating a Deployment when a DeploymentConfig is

+// DeploymentConfigController is responsible for creating a deployment when a DeploymentConfig is

 // updated with a new LatestVersion. Any deployment created is correlated to a DeploymentConfig

 // by setting the DeploymentConfigLabel on the deployment.

+//

+// Deployments are represented by ReplicationControllers. The DeploymentConfig used to create the

+// ReplicationController is encoded and stored in an annotation on the ReplicationController.

 type DeploymentConfigController struct {

 	// DeploymentInterface provides access to Deployments.

 	DeploymentInterface dccDeploymentInterface

 	// NextDeploymentConfig blocks until the next DeploymentConfig is available.

 	NextDeploymentConfig func() *deployapi.DeploymentConfig

-	// Stop is an optional channel that controls when the controller exits

+	// Codec is used to encode DeploymentConfigs which are stored on deployments.

+	Codec runtime.Codec

+	// Stop is an optional channel that controls when the controller exits.

 	Stop <-chan struct{}

 }

 // dccDeploymentInterface is a small private interface for dealing with Deployments.

 type dccDeploymentInterface interface {

-	GetDeployment(namespace, name string) (*deployapi.Deployment, error)

-	CreateDeployment(namespace string, deployment *deployapi.Deployment) (*deployapi.Deployment, error)

+	GetDeployment(namespace, name string) (*kapi.ReplicationController, error)

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

 }

 // Process DeploymentConfig events one at a time.

@@ -80,7 +88,7 @@ func (c *DeploymentConfigController) shouldDeploy(config *deployapi.DeploymentCo

 }

 // TODO: reduce code duplication between trigger and config controllers

-func (c *DeploymentConfigController) latestDeploymentForConfig(config *deployapi.DeploymentConfig) (*deployapi.Deployment, error) {

+func (c *DeploymentConfigController) latestDeploymentForConfig(config *deployapi.DeploymentConfig) (*kapi.ReplicationController, error) {

 	latestDeploymentID := deployutil.LatestDeploymentIDForConfig(config)

 	deployment, err := c.DeploymentInterface.GetDeployment(config.Namespace, latestDeploymentID)

 	if err != nil {

@@ -93,21 +101,33 @@ func (c *DeploymentConfigController) latestDeploymentForConfig(config *deployapi

 // deploy performs the work of actually creating a Deployment from the given DeploymentConfig.

 func (c *DeploymentConfigController) deploy(config *deployapi.DeploymentConfig) error {

-	deployment := &deployapi.Deployment{

+	var err error

+	var encodedConfig string

+

+	if encodedConfig, err = deployutil.EncodeDeploymentConfig(config, c.Codec); err != nil {

+		return err

+	}

+	deployment := &kapi.ReplicationController{

 		ObjectMeta: kapi.ObjectMeta{

 			Name: deployutil.LatestDeploymentIDForConfig(config),

 			Annotations: map[string]string{

-				deployapi.DeploymentConfigAnnotation: config.Name,

+				deployapi.DeploymentConfigAnnotation:        config.Name,

+				deployapi.DeploymentStatusAnnotation:        string(deployapi.DeploymentStatusNew),

+				deployapi.DeploymentEncodedConfigAnnotation: encodedConfig,

+				deployapi.DeploymentVersionAnnotation:       strconv.Itoa(config.LatestVersion),

 			},

 			Labels: config.Labels,

 		},

-		Strategy:           config.Template.Strategy,

-		ControllerTemplate: config.Template.ControllerTemplate,

-		Details:            config.Details,

+		Spec: config.Template.ControllerTemplate,

 	}

+	deployment.Spec.Replicas = 0

+	deployment.Spec.Template.Labels[deployapi.DeploymentConfigLabel] = config.Name

+	// TODO: Switch this to an annotation once upstream supports annotations on a PodTemplate

+	deployment.Spec.Template.Labels[deployapi.DeploymentLabel] = deployment.Name

+

 	glog.V(4).Infof("Creating new deployment from config %s", config.Name)

-	_, err := c.DeploymentInterface.CreateDeployment(config.Namespace, deployment)

+	_, err = c.DeploymentInterface.CreateDeployment(config.Namespace, deployment)

 	return err

 }

@@ -1,21 +1,26 @@

 package controller

 import (

+	"strconv"

 	"testing"

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

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

+

+	api "github.com/openshift/origin/pkg/api/latest"

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

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

 func TestHandleNewDeploymentConfig(t *testing.T) {

 	controller := &DeploymentConfigController{

+		Codec: api.Codec,

 		DeploymentInterface: &testDeploymentInterface{

-			GetDeploymentFunc: func(namespace, name string) (*deployapi.Deployment, error) {

+			GetDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

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

 				return nil, nil

 			},

-			CreateDeploymentFunc: func(namespace string, deployment *deployapi.Deployment) (*deployapi.Deployment, error) {

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

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

 				return nil, nil

 			},

@@ -34,14 +39,15 @@ func TestHandleInitialDeployment(t *testing.T) {

 	deploymentConfig := manualDeploymentConfig()

 	deploymentConfig.LatestVersion = 1

-	var deployed *deployapi.Deployment

+	var deployed *kapi.ReplicationController

 	controller := &DeploymentConfigController{

+		Codec: api.Codec,

 		DeploymentInterface: &testDeploymentInterface{

-			GetDeploymentFunc: func(namespace, name string) (*deployapi.Deployment, error) {

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

+			GetDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

+				return nil, kerrors.NewNotFound("replicationController", name)

 			},

-			CreateDeploymentFunc: func(namespace string, deployment *deployapi.Deployment) (*deployapi.Deployment, error) {

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

 				deployed = deployment

 				return deployment, nil

 			},

@@ -57,25 +63,41 @@ func TestHandleInitialDeployment(t *testing.T) {

 		t.Fatalf("expected a deployment")

 	}

-	if e, a := deploymentConfig.Name, deployed.Annotations[deployapi.DeploymentConfigAnnotation]; e != a {

-		t.Fatalf("expected deployment with deploymentConfig annotation %s, got %s", e, a)

+	expectedAnnotations := map[string]string{

+		deployapi.DeploymentConfigAnnotation:  deploymentConfig.Name,

+		deployapi.DeploymentStatusAnnotation:  string(deployapi.DeploymentStatusNew),

+		deployapi.DeploymentVersionAnnotation: strconv.Itoa(deploymentConfig.LatestVersion),

+	}

+

+	for key, expected := range expectedAnnotations {

+		if actual := deployed.Annotations[key]; actual != expected {

+			t.Fatalf("expected deployment annotation %s=%s, got %s", key, expected, actual)

+		}

+	}

+

+	// TODO: add stronger assertion on the encoded value once the controller methods are free

+	// of side effects on the deploymentConfig

+	if len(deployed.Annotations[deployapi.DeploymentEncodedConfigAnnotation]) == 0 {

+		t.Fatalf("expected deployment with DeploymentEncodedConfigAnnotation annotation")

 	}

 }

 func TestHandleConfigChangeNoPodTemplateDiff(t *testing.T) {

+	deploymentConfig := manualDeploymentConfig()

+	deploymentConfig.LatestVersion = 0

+

 	controller := &DeploymentConfigController{

+		Codec: api.Codec,

 		DeploymentInterface: &testDeploymentInterface{

-			GetDeploymentFunc: func(namespace, name string) (*deployapi.Deployment, error) {

-				return matchingDeployment(), nil

+			GetDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

+				return matchingDeployment(deploymentConfig), nil

 			},

-			CreateDeploymentFunc: func(namespace string, deployment *deployapi.Deployment) (*deployapi.Deployment, error) {

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

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

 				return nil, nil

 			},

 		},

 		NextDeploymentConfig: func() *deployapi.DeploymentConfig {

-			deploymentConfig := manualDeploymentConfig()

-			deploymentConfig.LatestVersion = 0

 			return deploymentConfig

 		},

 	}

@@ -88,14 +110,15 @@ func TestHandleConfigChangeWithPodTemplateDiff(t *testing.T) {

 	deploymentConfig.LatestVersion = 2

 	deploymentConfig.Template.ControllerTemplate.Template.Labels["foo"] = "bar"

-	var deployed *deployapi.Deployment

+	var deployed *kapi.ReplicationController

 	controller := &DeploymentConfigController{

+		Codec: api.Codec,

 		DeploymentInterface: &testDeploymentInterface{

-			GetDeploymentFunc: func(namespace, name string) (*deployapi.Deployment, error) {

+			GetDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

 				return nil, kerrors.NewNotFound("deployment", name)

 			},

-			CreateDeploymentFunc: func(namespace string, deployment *deployapi.Deployment) (*deployapi.Deployment, error) {

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

 				deployed = deployment

 				return deployment, nil

 			},

@@ -117,15 +140,15 @@ func TestHandleConfigChangeWithPodTemplateDiff(t *testing.T) {

 }

 type testDeploymentInterface struct {

-	GetDeploymentFunc    func(namespace, name string) (*deployapi.Deployment, error)

-	CreateDeploymentFunc func(namespace string, deployment *deployapi.Deployment) (*deployapi.Deployment, error)

+	GetDeploymentFunc    func(namespace, name string) (*kapi.ReplicationController, error)

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

 }

-func (i *testDeploymentInterface) GetDeployment(namespace, name string) (*deployapi.Deployment, error) {

+func (i *testDeploymentInterface) GetDeployment(namespace, name string) (*kapi.ReplicationController, error) {

 	return i.GetDeploymentFunc(namespace, name)

 }

-func (i *testDeploymentInterface) CreateDeployment(namespace string, deployment *deployapi.Deployment) (*deployapi.Deployment, error) {

+func (i *testDeploymentInterface) CreateDeployment(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 	return i.CreateDeploymentFunc(namespace, deployment)

 }

@@ -166,14 +189,18 @@ func manualDeploymentConfig() *deployapi.DeploymentConfig {

 	}

 }

-func matchingDeployment() *deployapi.Deployment {

-	return &deployapi.Deployment{

-		ObjectMeta: kapi.ObjectMeta{Name: "manual-deploy-config-1"},

-		Status:     deployapi.DeploymentStatusNew,

-		Strategy: deployapi.DeploymentStrategy{

-			Type: deployapi.DeploymentStrategyTypeRecreate,

+func matchingDeployment(config *deployapi.DeploymentConfig) *kapi.ReplicationController {

+	encodedConfig, _ := deployutil.EncodeDeploymentConfig(config, api.Codec)

+	return &kapi.ReplicationController{

+		ObjectMeta: kapi.ObjectMeta{

+			Name: deployutil.LatestDeploymentIDForConfig(config),

+			Annotations: map[string]string{

+				deployapi.DeploymentConfigAnnotation:        config.Name,

+				deployapi.DeploymentEncodedConfigAnnotation: encodedConfig,

+			},

+			Labels: config.Labels,

 		},

-		ControllerTemplate: kapi.ReplicationControllerSpec{

+		Spec: kapi.ReplicationControllerSpec{

 			Replicas: 1,

 			Selector: map[string]string{

 				"name": "test-pod",

@@ -6,13 +6,17 @@ import (

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

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

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

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

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

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

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

 // DeploymentController performs a deployment by creating a pod which is defined by a strategy.

-// The status of the resulting Deployment will follow the status of the corresponding pod.

+// The status of the resulting deployment will follow the status of the corresponding pod.

+//

+// Deployments are represented by a ReplicationController.

 type DeploymentController struct {

 	// ContainerCreator makes the container for the deployment pod based on the strategy.

 	ContainerCreator DeploymentContainerCreator

@@ -21,7 +25,7 @@ type DeploymentController struct {

 	// PodInterface provides access to pods.

 	PodInterface dcPodInterface

 	// NextDeployment blocks until the next deployment is available.

-	NextDeployment func() *deployapi.Deployment

+	NextDeployment func() *kapi.ReplicationController

 	// NextPod blocks until the next pod is available.

 	NextPod func() *kapi.Pod

 	// DeploymentStore is a cache of deployments.

@@ -31,7 +35,9 @@ type DeploymentController struct {

 	Environment []kapi.EnvVar

 	// UseLocalImages configures the ImagePullPolicy for containers in the deployment pod.

 	UseLocalImages bool

-	// Stop is an optional channel that controls when the controller exits

+	// Codec is used to decode DeploymentConfigs.

+	Codec runtime.Codec

+	// Stop is an optional channel that controls when the controller exits.

 	Stop <-chan struct{}

 }

@@ -42,7 +48,7 @@ type DeploymentContainerCreator interface {

 }

 type dcDeploymentInterface interface {

-	UpdateDeployment(namespace string, deployment *deployapi.Deployment) (*deployapi.Deployment, error)

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

 }

 type dcPodInterface interface {

@@ -56,42 +62,43 @@ func (dc *DeploymentController) Run() {

 	go util.Until(func() { dc.HandlePod() }, 0, dc.Stop)

 }

-// HandleDeployment processes a new Deployment and creates a new Pod which implements the specific

+// HandleDeployment processes a new deployment and creates a new Pod which implements the specific

 // deployment behavior. The deployment and pod are correlated with annotations. If the pod was

 // successfully created, the deployment's status is transitioned to pending; otherwise, the status

 // is transitioned to failed.

 func (dc *DeploymentController) HandleDeployment() {

 	deployment := dc.NextDeployment()

-	if deployment.Status != deployapi.DeploymentStatusNew {

+	if deployment.Annotations[deployapi.DeploymentStatusAnnotation] != string(deployapi.DeploymentStatusNew) {

 		glog.V(4).Infof("Ignoring deployment %s with non-New status", deployment.Name)

 		return

 	}

-	deploymentPod := dc.makeDeploymentPod(deployment)

+	// TODO: transition to a failed state? seems like yes since this is probably not recoverable

+	var deploymentPod *kapi.Pod

+	var deploymentPodError error

+	if deploymentPod, deploymentPodError = dc.makeDeploymentPod(deployment); deploymentPodError != nil {

+		glog.V(0).Infof("Failed to make deployment pod for %s: %v", deployment.Name, deploymentPodError)

+		return

+	}

-	nextStatus := deployment.Status