@@ -63,8 +63,6 @@ func ValidateObject(obj runtime.Object) (errors []error) {

 		errors = imagev.ValidateImageStreamMapping(t)

 	case *deployapi.DeploymentConfig:

 		errors = deployv.ValidateDeploymentConfig(t)

-	case *deployapi.Deployment:

-		errors = deployv.ValidateDeployment(t)

 	case *projectapi.Project:

 		// this is a global resource that should not have a namespace

 		t.Namespace = ""

@@ -78,8 +78,6 @@ func NewHumanReadablePrinter(noHeaders bool) *kctl.HumanReadablePrinter {

 	p.Handler(projectColumns, printProjectList)

 	p.Handler(routeColumns, printRoute)

 	p.Handler(routeColumns, printRouteList)

-	p.Handler(deploymentColumns, printDeployment)

-	p.Handler(deploymentColumns, printDeploymentList)

 	p.Handler(deploymentConfigColumns, printDeploymentConfig)

 	p.Handler(deploymentConfigColumns, printDeploymentConfigList)

 	p.Handler(templateColumns, printTemplate)

@@ -345,28 +343,6 @@ func printRouteList(routeList *routeapi.RouteList, w io.Writer) error {

 	return nil

 }

-func printDeployment(d *deployapi.Deployment, w io.Writer) error {

-	causes := util.StringSet{}

-	if d.Details != nil {

-		for _, cause := range d.Details.Causes {

-			causes.Insert(string(cause.Type))

-		}

-	}

-	cStr := strings.Join(causes.List(), ", ")

-	_, err := fmt.Fprintf(w, "%s\t%s\t%s\n", d.Name, d.Status, cStr)

-	return err

-}

-

-func printDeploymentList(list *deployapi.DeploymentList, w io.Writer) error {

-	for _, d := range list.Items {

-		if err := printDeployment(&d, w); err != nil {

-			return err

-		}

-	}

-

-	return nil

-}

-

 func printDeploymentConfig(dc *deployapi.DeploymentConfig, w io.Writer) error {

 	triggers := util.StringSet{}

 	for _, trigger := range dc.Triggers {

@@ -56,10 +56,8 @@ import (

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

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

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

-	deployregistry "github.com/openshift/origin/pkg/deploy/registry/deploy"

 	deployconfigregistry "github.com/openshift/origin/pkg/deploy/registry/deployconfig"

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

-	deployetcd "github.com/openshift/origin/pkg/deploy/registry/etcd"

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

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

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

@@ -174,7 +172,6 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 	deployConfigStorage := deployconfigetcd.NewStorage(c.EtcdHelper)

 	deployConfigRegistry := deployconfigregistry.NewRegistry(deployConfigStorage)

-	deployEtcd := deployetcd.New(c.EtcdHelper)

 	routeEtcd := routeetcd.New(c.EtcdHelper)

 	hostSubnetStorage := hostsubnetetcd.NewREST(c.EtcdHelper)

 	clusterNetworkStorage := clusternetworketcd.NewREST(c.EtcdHelper)

@@ -289,7 +286,6 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 		"imageRepositoryMappings":  imageRepositoryMappingStorage,

 		"imageRepositoryTags":      imageRepositoryTagStorage,

-		"deployments":               deployregistry.NewREST(deployEtcd),

 		"deploymentConfigs":         deployConfigStorage,

 		"generateDeploymentConfigs": deployconfiggenerator.NewREST(deployConfigGenerator, latest.Codec),

 		"deploymentConfigRollbacks": deployrollback.NewREST(deployRollbackClient, latest.Codec),

@@ -6,16 +6,12 @@ import (

 func init() {

 	api.Scheme.AddKnownTypes("",

-		&Deployment{},

-		&DeploymentList{},

 		&DeploymentConfig{},

 		&DeploymentConfigList{},

 		&DeploymentConfigRollback{},

 	)

 }

-func (*Deployment) IsAnAPIObject()               {}

-func (*DeploymentList) IsAnAPIObject()           {}

 func (*DeploymentConfig) IsAnAPIObject()         {}

 func (*DeploymentConfigList) IsAnAPIObject()     {}

 func (*DeploymentConfigRollback) IsAnAPIObject() {}

@@ -4,30 +4,6 @@ import (

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

 )

-// 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"`

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

-

-	// Strategy describes how a deployment is executed.

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

-	// ControllerTemplate is the desired replication state the deployment works to materialize.

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

-	// Status is the execution status of the deployment.

-	Status DeploymentStatus `json:"status,omitempty"`

-	// Details captures the causes for the creation of this deployment resource.

-	// This could be based on a change made by the user to the deployment config

-	// or caused by an automatic trigger that was specified in the deployment config.

-	// Multiple triggers could have caused this deployment.

-	// If no trigger is specified here, then the deployment was likely created as a result of an

-	// explicit client request to create a new deployment resource.

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

-}

-

 // DeploymentStatus describes the possible states a deployment can be in.

 type DeploymentStatus string

@@ -141,14 +117,6 @@ type RollingDeploymentStrategyParams struct {

 	TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty" description:"the time to wait for updates before giving up"`

 }

-// DeploymentList is a collection of deployments.

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

-type DeploymentList struct {

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

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

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

-}

-

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

 const (

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

@@ -6,16 +6,12 @@ import (

 func init() {

 	api.Scheme.AddKnownTypes("v1beta1",

-		&Deployment{},

-		&DeploymentList{},

 		&DeploymentConfig{},

 		&DeploymentConfigList{},

 		&DeploymentConfigRollback{},

 	)

 }

-func (*Deployment) IsAnAPIObject()               {}

-func (*DeploymentList) IsAnAPIObject()           {}

 func (*DeploymentConfig) IsAnAPIObject()         {}

 func (*DeploymentConfigList) IsAnAPIObject()     {}

 func (*DeploymentConfigRollback) IsAnAPIObject() {}

@@ -5,30 +5,6 @@ import (

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

 )

-// 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"`

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

-

-	// Strategy describes how a deployment is executed.

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

-	// ControllerTemplate is the desired replication state the deployment works to materialize.

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

-	// Status is the execution status of the deployment.

-	Status DeploymentStatus `json:"status,omitempty"`

-	// Details captures the causes for the creation of this deployment resource.

-	// This could be based on a change made by the user to the deployment config

-	// or caused by an automatic trigger that was specified in the deployment config.

-	// Multiple triggers could have caused this deployment.

-	// If no trigger is specified here, then the deployment was likely created as a result of an

-	// explicit client request to create a new deployment resource.

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

-}

-

 // DeploymentStatus describes the possible states a deployment can be in.

 type DeploymentStatus string

@@ -142,14 +118,6 @@ type RollingDeploymentStrategyParams struct {

 	TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty" description:"the time to wait for updates before giving up"`

 }

-// A DeploymentList is a collection of deployments.

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

-type DeploymentList struct {

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

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

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

-}

-

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

 const (

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

@@ -16,23 +16,6 @@ import (

 //       The upstream validation API isn't factored currently to allow this; we'll make a PR to

 //       upstream and fix when it goes in.

-func ValidateDeployment(deployment *deployapi.Deployment) fielderrors.ValidationErrorList {

-	errs := validateDeploymentStrategy(&deployment.Strategy).Prefix("strategy")

-	if len(deployment.Name) == 0 {

-		errs = append(errs, fielderrors.NewFieldRequired("name"))

-	} else if !util.IsDNS1123Subdomain(deployment.Name) {

-		errs = append(errs, fielderrors.NewFieldInvalid("name", deployment.Name, "name must be a valid subdomain"))

-	}

-	if len(deployment.Namespace) == 0 {

-		errs = append(errs, fielderrors.NewFieldRequired("namespace"))

-	} else if !util.IsDNS1123Subdomain(deployment.Namespace) {

-		errs = append(errs, fielderrors.NewFieldInvalid("namespace", deployment.Namespace, "namespace must be a valid subdomain"))

-	}

-	errs = append(errs, validation.ValidateLabels(deployment.Labels, "labels")...)

-	errs = append(errs, validation.ValidateReplicationControllerSpec(&deployment.ControllerTemplate).Prefix("controllerTemplate")...)

-	return errs

-}

-

 func ValidateDeploymentConfig(config *deployapi.DeploymentConfig) fielderrors.ValidationErrorList {

 	errs := fielderrors.ValidationErrorList{}

 	if len(config.Name) == 0 {

@@ -22,50 +22,6 @@ func manualTrigger() []api.DeploymentTriggerPolicy {

 // TODO: test validation errors for ReplicationControllerTemplates

-func TestValidateDeploymentOK(t *testing.T) {

-	errs := ValidateDeployment(&api.Deployment{

-		ObjectMeta:         kapi.ObjectMeta{Name: "foo", Namespace: "bar"},

-		Strategy:           test.OkStrategy(),

-		ControllerTemplate: test.OkControllerTemplate(),

-	})

-	if len(errs) > 0 {

-		t.Errorf("Unxpected non-empty error list: %#v", errs)

-	}

-}

-

-func TestValidateDeploymentMissingFields(t *testing.T) {

-	errorCases := map[string]struct {

-		D api.Deployment

-		T fielderrors.ValidationErrorType

-		F string

-	}{

-		"missing strategy.type": {

-			api.Deployment{

-				ObjectMeta:         kapi.ObjectMeta{Name: "foo", Namespace: "bar"},

-				Strategy:           api.DeploymentStrategy{},

-				ControllerTemplate: test.OkControllerTemplate(),

-			},

-			fielderrors.ValidationErrorTypeRequired,

-			"strategy.type",

-		},

-	}

-

-	for k, v := range errorCases {

-		errs := ValidateDeployment(&v.D)

-		if len(errs) == 0 {

-			t.Errorf("Expected failure for scenario %s", k)

-		}

-		for i := range errs {

-			if errs[i].(*fielderrors.ValidationError).Type != v.T {

-				t.Errorf("%s: expected errors to have type %s: %v", k, v.T, errs[i])

-			}

-			if errs[i].(*fielderrors.ValidationError).Field != v.F {

-				t.Errorf("%s: expected errors to have field %s: %v", k, v.F, errs[i])

-			}

-		}

-	}

-}

-

 func TestValidateDeploymentConfigOK(t *testing.T) {

 	errs := ValidateDeploymentConfig(&api.DeploymentConfig{

 		ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"},

deleted file mode 100644

@@ -1,3 +0,0 @@

-// Package deploy provides Registry interface and its RESTStorage

-// implementation for storing Deployment api objects.

-package deploy

deleted file mode 100644

@@ -1,20 +0,0 @@

-package deploy

-

-import (

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

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"

-

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

-)

-

-// Registry is an interface for things that know how to store Deployments.

-type Registry interface {

-	ListDeployments(ctx kapi.Context, label labels.Selector, field fields.Selector) (*deployapi.DeploymentList, error)

-	GetDeployment(ctx kapi.Context, id string) (*deployapi.Deployment, error)

-	CreateDeployment(ctx kapi.Context, deployment *deployapi.Deployment) error

-	UpdateDeployment(ctx kapi.Context, deployment *deployapi.Deployment) error

-	DeleteDeployment(ctx kapi.Context, id string) error

-	WatchDeployments(ctx kapi.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error)

-}

deleted file mode 100644

@@ -1,116 +0,0 @@

-package deploy

-

-import (

-	"fmt"

-

-	"code.google.com/p/go-uuid/uuid"

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

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

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"

-	"github.com/golang/glog"

-

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

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

-)

-

-// REST is an implementation of RESTStorage for the api server.

-type REST struct {

-	registry Registry

-}

-

-// NewREST creates a new REST backed by the given registry.

-func NewREST(registry Registry) *REST {

-	return &REST{

-		registry: registry,

-	}

-}

-

-// New creates a new Deployment for use with Create and Update.

-func (s *REST) New() runtime.Object {

-	return &deployapi.Deployment{}

-}

-

-func (*REST) NewList() runtime.Object {

-	return &deployapi.Deployment{}

-}

-

-// List obtains a list of Deployments that match selector.

-func (s *REST) List(ctx kapi.Context, label labels.Selector, field fields.Selector) (runtime.Object, error) {

-	deployments, err := s.registry.ListDeployments(ctx, label, field)

-	if err != nil {

-		return nil, err

-	}

-

-	return deployments, nil

-}

-

-// Get obtains the Deployment specified by its id.

-func (s *REST) Get(ctx kapi.Context, id string) (runtime.Object, error) {

-	deployment, err := s.registry.GetDeployment(ctx, id)

-	if err != nil {

-		return nil, err

-	}

-	return deployment, err

-}

-

-// Delete asynchronously deletes the Deployment specified by its id.

-func (s *REST) Delete(ctx kapi.Context, id string) (runtime.Object, error) {

-	return &kapi.Status{Status: kapi.StatusSuccess}, s.registry.DeleteDeployment(ctx, id)

-}

-

-// Create registers a given new Deployment instance to s.registry.

-func (s *REST) Create(ctx kapi.Context, obj runtime.Object) (runtime.Object, error) {

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

-	if !ok {

-		return nil, fmt.Errorf("not a deployment: %#v", obj)

-	}

-	if !kapi.ValidNamespace(ctx, &deployment.ObjectMeta) {

-		return nil, kerrors.NewConflict("deployment", deployment.Namespace, fmt.Errorf("Deployment.Namespace does not match the provided context"))

-	}

-

-	kapi.FillObjectMetaSystemFields(ctx, &deployment.ObjectMeta)

-

-	if len(deployment.Name) == 0 {

-		deployment.Name = uuid.NewUUID().String()

-	}

-	deployment.Status = deployapi.DeploymentStatusNew

-

-	glog.Infof("Creating deployment with namespace::Name: %v::%v", deployment.Namespace, deployment.Name)

-

-	if errs := validation.ValidateDeployment(deployment); len(errs) > 0 {

-		return nil, kerrors.NewInvalid("deployment", deployment.Name, errs)

-	}

-

-	err := s.registry.CreateDeployment(ctx, deployment)

-	if err != nil {

-		return nil, err

-	}

-	return deployment, nil

-}

-

-// Update replaces a given Deployment instance with an existing instance in s.registry.

-func (s *REST) Update(ctx kapi.Context, obj runtime.Object) (runtime.Object, bool, error) {

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

-	if !ok {

-		return nil, false, fmt.Errorf("not a deployment: %#v", obj)

-	}

-	if len(deployment.Name) == 0 {

-		return nil, false, fmt.Errorf("name is unspecified: %#v", deployment)

-	}

-	if !kapi.ValidNamespace(ctx, &deployment.ObjectMeta) {

-		return nil, false, kerrors.NewConflict("deployment", deployment.Namespace, fmt.Errorf("Deployment.Namespace does not match the provided context"))

-	}

-

-	err := s.registry.UpdateDeployment(ctx, deployment)

-	if err != nil {

-		return nil, false, err

-	}

-	return deployment, false, nil

-}

-

-func (s *REST) Watch(ctx kapi.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	return s.registry.WatchDeployments(ctx, label, field, resourceVersion)

-}

deleted file mode 100644

@@ -1,298 +0,0 @@

-package deploy

-

-import (

-	"fmt"

-	"net/http"

-	"strings"

-	"testing"

-

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

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

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

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

-	deploytest "github.com/openshift/origin/pkg/deploy/api/test"

-	"github.com/openshift/origin/pkg/deploy/registry/test"

-)

-

-func TestListDeploymentsError(t *testing.T) {

-	mockRegistry := test.NewDeploymentRegistry()

-	mockRegistry.Err = fmt.Errorf("test error")

-

-	storage := REST{

-		registry: mockRegistry,

-	}

-

-	deployments, err := storage.List(kapi.NewDefaultContext(), nil, nil)

-	if err != mockRegistry.Err {

-		t.Errorf("Expected %#v, Got %#v", mockRegistry.Err, err)

-	}

-

-	if deployments != nil {

-		t.Errorf("Unexpected non-nil deployments list: %#v", deployments)

-	}

-}

-

-func TestListDeploymentsEmptyList(t *testing.T) {

-	mockRegistry := test.NewDeploymentRegistry()

-	mockRegistry.Deployments = &api.DeploymentList{

-		Items: []api.Deployment{},

-	}

-

-	storage := REST{

-		registry: mockRegistry,

-	}

-

-	deployments, err := storage.List(kapi.NewDefaultContext(), labels.Everything(), fields.Everything())

-	if err != nil {

-		t.Errorf("Unexpected non-nil error: %#v", err)

-	}

-

-	if len(deployments.(*api.DeploymentList).Items) != 0 {

-		t.Errorf("Unexpected non-zero deployments list: %#v", deployments)

-	}

-}

-

-func TestListDeploymentsPopulatedList(t *testing.T) {

-	mockRegistry := test.NewDeploymentRegistry()

-	mockRegistry.Deployments = &api.DeploymentList{

-		Items: []api.Deployment{

-			{

-				ObjectMeta: kapi.ObjectMeta{

-					Name: "foo",

-				},

-			},

-			{

-				ObjectMeta: kapi.ObjectMeta{

-					Name: "bar",

-				},

-			},

-		},

-	}

-

-	storage := REST{

-		registry: mockRegistry,

-	}

-

-	list, err := storage.List(kapi.NewDefaultContext(), labels.Everything(), fields.Everything())

-	if err != nil {

-		t.Errorf("Unexpected non-nil error: %#v", err)

-	}

-

-	deployments := list.(*api.DeploymentList)

-

-	if e, a := 2, len(deployments.Items); e != a {

-		t.Errorf("Expected %v, got %v", e, a)

-	}

-}

-

-func TestCreateDeploymentBadObject(t *testing.T) {

-	storage := REST{}

-

-	obj, err := storage.Create(kapi.NewDefaultContext(), &api.DeploymentList{})

-	if obj != nil {

-		t.Errorf("Expected nil, got %v", obj)

-	}

-	if strings.Index(err.Error(), "not a deployment") == -1 {

-		t.Errorf("Expected 'not a deployment' error, got '%v'", err.Error())

-	}

-}

-

-func TestCreateRegistrySaveError(t *testing.T) {

-	mockRegistry := test.NewDeploymentRegistry()

-	mockRegistry.Err = fmt.Errorf("test error")

-	storage := REST{registry: mockRegistry}

-

-	_, err := storage.Create(kapi.NewDefaultContext(), &api.Deployment{

-		ObjectMeta:         kapi.ObjectMeta{Name: "foo"},

-		Strategy:           deploytest.OkStrategy(),

-		ControllerTemplate: deploytest.OkControllerTemplate(),

-	})

-	if err != mockRegistry.Err {

-		t.Errorf("Unexpected non-nil error: %#v", err)

-	}

-}

-

-func TestCreateDeploymentOk(t *testing.T) {

-	mockRegistry := test.NewDeploymentRegistry()

-	storage := REST{registry: mockRegistry}

-

-	obj, err := storage.Create(kapi.NewDefaultContext(), &api.Deployment{

-		ObjectMeta:         kapi.ObjectMeta{Name: "foo"},

-		Strategy:           deploytest.OkStrategy(),

-		ControllerTemplate: deploytest.OkControllerTemplate(),

-	})

-	if obj == nil {

-		t.Errorf("Expected nil obj, got %v", obj)

-	}

-	if err != nil {

-		t.Errorf("Unexpected non-nil error: %#v", err)

-	}

-

-	deployment, ok := obj.(*api.Deployment)

-	if !ok {

-		t.Errorf("Expected deployment type, got: %#v", obj)

-	}

-	if deployment.Name != "foo" {

-		t.Errorf("Unexpected deployment: %#v", deployment)

-	}

-}

-

-func TestGetDeploymentError(t *testing.T) {

-	mockRegistry := test.NewDeploymentRegistry()

-	mockRegistry.Err = fmt.Errorf("bad")

-	storage := REST{registry: mockRegistry}

-

-	deployment, err := storage.Get(kapi.NewDefaultContext(), "foo")

-	if deployment != nil {

-		t.Errorf("Unexpected non-nil deployment: %#v", deployment)

-	}

-	if err != mockRegistry.Err {

-		t.Errorf("Expected %#v, got %#v", mockRegistry.Err, err)

-	}

-}

-

-func TestGetDeploymentOk(t *testing.T) {

-	mockRegistry := test.NewDeploymentRegistry()

-	mockRegistry.Deployment = &api.Deployment{

-		ObjectMeta: kapi.ObjectMeta{Name: "foo"},

-	}

-	storage := REST{registry: mockRegistry}

-

-	deployment, err := storage.Get(kapi.NewDefaultContext(), "foo")

-	if deployment == nil {

-		t.Error("Unexpected nil deployment")

-	}

-	if err != nil {

-		t.Errorf("Unexpected non-nil error: %v", err)

-	}

-	if deployment.(*api.Deployment).Name != "foo" {

-		t.Errorf("Unexpected deployment: %#v", deployment)

-	}

-}

-

-func TestUpdateDeploymentBadObject(t *testing.T) {

-	storage := REST{}

-

-	obj, created, err := storage.Update(kapi.NewDefaultContext(), &api.DeploymentConfig{})

-	if obj != nil || created {

-		t.Errorf("Expected nil, got %v", obj)

-	}

-	if strings.Index(err.Error(), "not a deployment:") == -1 {

-		t.Errorf("Expected 'not a deployment' error, got %v", err)

-	}

-}

-

-func TestUpdateDeploymentMissingID(t *testing.T) {

-	storage := REST{}

-

-	obj, created, err := storage.Update(kapi.NewDefaultContext(), &api.Deployment{})

-	if obj != nil || created {

-		t.Errorf("Expected nil, got %v", obj)

-	}

-	if strings.Index(err.Error(), "name is unspecified:") == -1 {

-		t.Errorf("Expected 'name is unspecified' error, got %v", err)

-	}

-}

-

-func TestUpdateRegistryErrorSaving(t *testing.T) {

-	mockRepositoryRegistry := test.NewDeploymentRegistry()

-	mockRepositoryRegistry.Err = fmt.Errorf("foo")

-	storage := REST{registry: mockRepositoryRegistry}

-

-	_, created, err := storage.Update(kapi.NewDefaultContext(), &api.Deployment{

-		ObjectMeta: kapi.ObjectMeta{Name: "bar"},

-	})

-	if err != mockRepositoryRegistry.Err || created {

-		t.Errorf("Unexpected non-nil error: %#v", err)

-	}

-}

-

-func TestUpdateDeploymentOk(t *testing.T) {

-	mockRepositoryRegistry := test.NewDeploymentRegistry()

-	storage := REST{registry: mockRepositoryRegistry}

-

-	obj, created, err := storage.Update(kapi.NewDefaultContext(), &api.Deployment{

-		ObjectMeta: kapi.ObjectMeta{Name: "bar"},

-	})

-	if err != nil || created {

-		t.Errorf("Unexpected non-nil error: %#v", err)

-	}

-	repo, ok := obj.(*api.Deployment)

-	if !ok {

-		t.Errorf("Expected Deployment, got %#v", obj)

-	}

-	if repo.Name != "bar" {

-		t.Errorf("Unexpected repo returned: %#v", repo)

-	}

-}

-

-func TestDeleteDeployment(t *testing.T) {

-	mockRegistry := test.NewDeploymentRegistry()

-	storage := REST{registry: mockRegistry}

-	obj, err := storage.Delete(kapi.NewDefaultContext(), "foo")

-	if obj == nil {

-		t.Error("Unexpected nil obj")

-	}

-	if err != nil {

-		t.Errorf("Unexpected non-nil error: %#v", err)

-	}

-

-	status, ok := obj.(*kapi.Status)

-	if !ok {

-		t.Errorf("Expected status type, got: %#v", obj)

-	}

-	if status.Status != kapi.StatusSuccess {

-		t.Errorf("Expected status=success, got: %#v", status)

-	}

-}

-

-func TestCreateDeploymentConflictingNamespace(t *testing.T) {

-	storage := REST{}

-

-	obj, err := storage.Create(kapi.WithNamespace(kapi.NewContext(), "legal-name"), &api.Deployment{

-		ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "some-value"},

-		Strategy:   deploytest.OkStrategy(),

-	})

-

-	if obj != nil {

-		t.Error("Expected a nil obj, but we got a value")

-	}

-

-	checkExpectedNamespaceError(t, err)

-}

-

-func TestUpdateDeploymentConflictingNamespace(t *testing.T) {

-	mockRepositoryRegistry := test.NewDeploymentRegistry()

-	storage := REST{registry: mockRepositoryRegistry}

-

-	obj, created, err := storage.Update(kapi.WithNamespace(kapi.NewContext(), "legal-name"), &api.Deployment{

-		ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "some-value"},

-		Strategy:   deploytest.OkStrategy(),

-	})

-

-	if obj != nil || created {

-		t.Error("Expected a nil obj, but we got a value")

-	}

-

-	checkExpectedNamespaceError(t, err)

-}

-

-func checkExpectedNamespaceError(t *testing.T, err error) {

-	expectedError := "Deployment.Namespace does not match the provided context"

-	if err == nil {

-		t.Errorf("Expected '" + expectedError + "', but we didn't get one")

-	} else {

-		e, ok := err.(kclient.APIStatus)

-		if !ok {

-			t.Errorf("error was not a statusError: %v", err)

-		}

-		if e.Status().Code != http.StatusConflict {

-			t.Errorf("Unexpected failure status: %v", e.Status())

-		}

-		if strings.Index(err.Error(), expectedError) == -1 {

-			t.Errorf("Expected '"+expectedError+"' error, got '%v'", err.Error())

-		}

-	}

-

-}

deleted file mode 100644

@@ -1,3 +0,0 @@

-// Package etcd provides etcd backend implementation for storing

-// Deployment and DeploymentConfig objects

-package etcd

deleted file mode 100644

@@ -1,130 +0,0 @@

-package etcd

-

-import (

-	"github.com/golang/glog"

-

-	etcderr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors/etcd"

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

-

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

-	kubeetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/etcd"

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"

-

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

-)

-

-const (

-	// DeploymentPath is the path to deployment resources in etcd

-	DeploymentPath string = "/deployments"

-)

-

-// Etcd implements deployment.Registry and deploymentconfig.Registry interfaces.

-type Etcd struct {

-	tools.EtcdHelper

-}

-

-// New creates an etcd registry.

-func New(helper tools.EtcdHelper) *Etcd {

-	return &Etcd{

-		EtcdHelper: helper,

-	}

-}

-

-// ListDeployments obtains a list of Deployments.

-func (r *Etcd) ListDeployments(ctx kapi.Context, label labels.Selector, field fields.Selector) (*api.DeploymentList, error) {

-	deployments := api.DeploymentList{}

-	err := r.ExtractToList(makeDeploymentListKey(ctx), &deployments)

-	if err != nil {

-		return nil, err

-	}

-

-	filtered := []api.Deployment{}

-	for _, item := range deployments.Items {

-		fields := labels.Set{

-			"name":   item.Name,

-			"status": string(item.Status),

-		}

-		if label.Matches(labels.Set(item.Labels)) && field.Matches(fields) {

-			filtered = append(filtered, item)

-		}

-	}

-

-	deployments.Items = filtered

-	return &deployments, err

-}

-

-func makeDeploymentListKey(ctx kapi.Context) string {

-	return kubeetcd.MakeEtcdListKey(ctx, DeploymentPath)

-}

-

-func makeDeploymentKey(ctx kapi.Context, id string) (string, error) {

-	return kubeetcd.MakeEtcdItemKey(ctx, DeploymentPath, id)

-}

-

-// GetDeployment gets a specific Deployment specified by its ID.

-func (r *Etcd) GetDeployment(ctx kapi.Context, id string) (*api.Deployment, error) {

-	var deployment api.Deployment

-	key, err := makeDeploymentKey(ctx, id)

-	if err != nil {

-		return nil, err

-	}

-	err = r.ExtractObj(key, &deployment, false)

-	if err != nil {

-		return nil, etcderr.InterpretGetError(err, "deployment", id)

-	}

-	return &deployment, nil

-}

-

-// CreateDeployment creates a new Deployment.

-func (r *Etcd) CreateDeployment(ctx kapi.Context, deployment *api.Deployment) error {

-	key, err := makeDeploymentKey(ctx, deployment.Name)

-	if err != nil {

-		return err

-	}

-	err = r.CreateObj(key, deployment, nil, 0)

-	return etcderr.InterpretCreateError(err, "deployment", deployment.Name)

-}

-

-// UpdateDeployment replaces an existing Deployment.

-func (r *Etcd) UpdateDeployment(ctx kapi.Context, deployment *api.Deployment) error {

-	key, err := makeDeploymentKey(ctx, deployment.Name)

-	if err != nil {

-		return err

-	}

-	err = r.SetObj(key, deployment, nil, 0)

-	return etcderr.InterpretUpdateError(err, "deployment", deployment.Name)

-}

-

-// DeleteDeployment deletes a Deployment specified by its ID.

-func (r *Etcd) DeleteDeployment(ctx kapi.Context, id string) error {

-	key, err := makeDeploymentKey(ctx, id)

-	if err != nil {

-		return err

-	}

-	err = r.Delete(key, false)

-	return etcderr.InterpretDeleteError(err, "deployment", id)

-}

-

-// WatchDeployments begins watching for new, changed, or deleted Deployments.

-func (r *Etcd) WatchDeployments(ctx kapi.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	version, err := tools.ParseWatchResourceVersion(resourceVersion, "deployment")

-	if err != nil {

-		return nil, err

-	}

-

-	return r.WatchList(makeDeploymentListKey(ctx), version, func(obj runtime.Object) bool {

-		deployment, ok := obj.(*api.Deployment)

-		if !ok {

-			glog.Errorf("Unexpected object during deployment watch: %#v", obj)

-			return false

-		}

-		fields := labels.Set{

-			"name":   deployment.Name,

-			"status": string(deployment.Status),

-		}

-		return label.Matches(labels.Set(deployment.Labels)) && field.Matches(fields)

-	})

-}

deleted file mode 100644

@@ -1,454 +0,0 @@

-package etcd

-