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

 	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"

@@ -169,6 +170,9 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 	buildConfigStorage := buildconfigetcd.NewStorage(c.EtcdHelper)

 	buildConfigRegistry := buildconfigregistry.NewRegistry(buildConfigStorage)

+	deployConfigStorage := deployconfigetcd.NewStorage(c.EtcdHelper)

+	deployConfigRegistry := deployconfigregistry.NewRegistry(deployConfigStorage)

+

 	deployEtcd := deployetcd.New(c.EtcdHelper)

 	routeEtcd := routeetcd.New(c.EtcdHelper)

 	hostSubnetStorage := hostsubnetetcd.NewREST(c.EtcdHelper)

@@ -231,7 +235,7 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 	// TODO: with sharding, this needs to be changed

 	deployConfigGenerator := &deployconfiggenerator.DeploymentConfigGenerator{

 		Client: deployconfiggenerator.Client{

-			DCFn:   deployEtcd.GetDeploymentConfig,

+			DCFn:   deployConfigRegistry.GetDeploymentConfig,

 			ISFn:   imageStreamRegistry.GetImageStream,

 			LISFn2: imageStreamRegistry.ListImageStreams,

 		},

@@ -239,7 +243,7 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 	_, kclient := c.DeploymentConfigControllerClients()

 	deployRollback := &deployrollback.RollbackGenerator{}

 	deployRollbackClient := deployrollback.Client{

-		DCFn: deployEtcd.GetDeploymentConfig,

+		DCFn: deployConfigRegistry.GetDeploymentConfig,

 		RCFn: clientDeploymentInterface{kclient}.GetDeployment,

 		GRFn: deployRollback.GenerateRollback,

 	}

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

 		"imageRepositoryTags":      imageRepositoryTagStorage,

 		"deployments":               deployregistry.NewREST(deployEtcd),

-		"deploymentConfigs":         deployconfigregistry.NewREST(deployEtcd),

+		"deploymentConfigs":         deployConfigStorage,

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

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

@@ -55,6 +55,13 @@ func ValidateDeploymentConfig(config *deployapi.DeploymentConfig) fielderrors.Va

 	return errs

 }

+func ValidateDeploymentConfigUpdate(newConfig *deployapi.DeploymentConfig, oldConfig *deployapi.DeploymentConfig) fielderrors.ValidationErrorList {

+	allErrs := fielderrors.ValidationErrorList{}

+	allErrs = append(allErrs, validation.ValidateObjectMetaUpdate(&oldConfig.ObjectMeta, &newConfig.ObjectMeta).Prefix("metadata")...)

+	allErrs = append(allErrs, ValidateDeploymentConfig(newConfig)...)

+	return allErrs

+}

+

 func ValidateDeploymentConfigRollback(rollback *deployapi.DeploymentConfigRollback) fielderrors.ValidationErrorList {

 	result := fielderrors.ValidationErrorList{}

new file mode 100644

@@ -0,0 +1,48 @@

+package etcd

+

+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/registry/generic"

+	etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd"

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

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

+

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

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

+)

+

+const DeploymentConfigPath string = "/deploymentconfigs"

+

+type REST struct {

+	*etcdgeneric.Etcd

+}

+

+// NewStorage returns a RESTStorage object that will work against DeploymentConfig objects.

+func NewStorage(h tools.EtcdHelper) *REST {

+	store := &etcdgeneric.Etcd{

+		NewFunc:      func() runtime.Object { return &api.DeploymentConfig{} },

+		NewListFunc:  func() runtime.Object { return &api.DeploymentConfigList{} },

+		EndpointName: "deploymentConfig",

+		KeyRootFunc: func(ctx kapi.Context) string {

+			return etcdgeneric.NamespaceKeyRootFunc(ctx, DeploymentConfigPath)

+		},

+		KeyFunc: func(ctx kapi.Context, id string) (string, error) {

+			return etcdgeneric.NamespaceKeyFunc(ctx, DeploymentConfigPath, id)

+		},

+		ObjectNameFunc: func(obj runtime.Object) (string, error) {

+			return obj.(*api.DeploymentConfig).Name, nil

+		},

+		PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher {

+			return deployconfig.Matcher(label, field)

+		},

+		CreateStrategy:      deployconfig.Strategy,

+		UpdateStrategy:      deployconfig.Strategy,

+		DeleteStrategy:      deployconfig.Strategy,

+		ReturnDeletedObject: false,

+		Helper:              h,

+	}

+

+	return &REST{store}

+}

@@ -2,6 +2,7 @@ package deployconfig

 import (

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

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

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

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

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

@@ -13,8 +14,54 @@ import (

 type Registry interface {

 	ListDeploymentConfigs(ctx kapi.Context, label labels.Selector, field fields.Selector) (*deployapi.DeploymentConfigList, error)

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

-	GetDeploymentConfig(ctx kapi.Context, id string) (*deployapi.DeploymentConfig, error)

+	GetDeploymentConfig(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error)

 	CreateDeploymentConfig(ctx kapi.Context, deploymentConfig *deployapi.DeploymentConfig) error

 	UpdateDeploymentConfig(ctx kapi.Context, deploymentConfig *deployapi.DeploymentConfig) error

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

+	DeleteDeploymentConfig(ctx kapi.Context, name string) error

+}

+

+// storage puts strong typing around storage calls

+type storage struct {

+	rest.StandardStorage

+}

+

+// NewRegistry returns a new Registry interface for the given Storage. Any mismatched

+// types will panic.

+func NewRegistry(s rest.StandardStorage) Registry {

+	return &storage{s}

+}

+

+func (s *storage) ListDeploymentConfigs(ctx kapi.Context, label labels.Selector, field fields.Selector) (*deployapi.DeploymentConfigList, error) {

+	obj, err := s.List(ctx, label, field)

+	if err != nil {

+		return nil, err

+	}

+	return obj.(*deployapi.DeploymentConfigList), nil

+}

+

+func (s *storage) WatchDeploymentConfigs(ctx kapi.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

+	return s.Watch(ctx, label, field, resourceVersion)

+}

+

+func (s *storage) GetDeploymentConfig(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error) {

+	obj, err := s.Get(ctx, name)

+	if err != nil {

+		return nil, err

+	}

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

+}

+

+func (s *storage) CreateDeploymentConfig(ctx kapi.Context, deploymentConfig *deployapi.DeploymentConfig) error {

+	_, err := s.Create(ctx, deploymentConfig)

+	return err

+}

+

+func (s *storage) UpdateDeploymentConfig(ctx kapi.Context, deploymentConfig *deployapi.DeploymentConfig) error {

+	_, _, err := s.Update(ctx, deploymentConfig)

+	return err

+}

+

+func (s *storage) DeleteDeploymentConfig(ctx kapi.Context, name string) error {

+	_, err := s.Delete(ctx, name, nil)

+	return err

 }

deleted file mode 100644

@@ -1,115 +0,0 @@

-package deployconfig

-

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

-

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

-	validation "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 DeploymentConfig for use with Create and Update.

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

-	return &deployapi.DeploymentConfig{}

-}

-

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

-	return &deployapi.DeploymentConfig{}

-}

-

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

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

-	deploymentConfigs, err := s.registry.ListDeploymentConfigs(ctx, label, field)

-	if err != nil {

-		return nil, err

-	}

-

-	return deploymentConfigs, nil

-}

-

-// Watch begins watching for new, changed, or deleted ImageRepositories.

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

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

-}

-

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

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

-	deploymentConfig, err := s.registry.GetDeploymentConfig(ctx, id)

-	if err != nil {

-		return nil, err

-	}

-	return deploymentConfig, err

-}

-

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

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

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

-}

-

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

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

-	deploymentConfig, ok := obj.(*deployapi.DeploymentConfig)

-	if !ok {

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

-	}

-

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

-

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

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

-	}

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

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

-	}

-

-	if errs := validation.ValidateDeploymentConfig(deploymentConfig); len(errs) > 0 {

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

-	}

-

-	err := s.registry.CreateDeploymentConfig(ctx, deploymentConfig)

-	if err != nil {

-		return nil, err

-	}

-	return deploymentConfig, nil

-}

-

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

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

-	deploymentConfig, ok := obj.(*deployapi.DeploymentConfig)

-	if !ok {

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

-	}

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

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

-	}

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

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

-	}

-

-	err := s.registry.UpdateDeploymentConfig(ctx, deploymentConfig)

-	if err != nil {

-		return nil, false, err

-	}

-	out, err := s.Get(ctx, deploymentConfig.Name)

-	return out, false, err

-}

deleted file mode 100644

@@ -1,300 +0,0 @@

-package deployconfig

-

-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 TestListDeploymentConfigsError(t *testing.T) {

-	mockRegistry := test.NewDeploymentConfigRegistry()

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

-

-	storage := REST{

-		registry: mockRegistry,

-	}

-

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

-	if err != mockRegistry.Err {

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

-	}

-

-	if deploymentConfigs != nil {

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

-	}

-}

-

-func TestListDeploymentConfigsEmptyList(t *testing.T) {

-	mockRegistry := test.NewDeploymentConfigRegistry()

-	mockRegistry.DeploymentConfigs = &api.DeploymentConfigList{

-		Items: []api.DeploymentConfig{},

-	}

-

-	storage := REST{

-		registry: mockRegistry,

-	}

-

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

-	if err != nil {

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

-	}

-

-	if len(deploymentConfigs.(*api.DeploymentConfigList).Items) != 0 {

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

-	}

-}

-

-func TestListDeploymentConfigsPopulatedList(t *testing.T) {

-	mockRegistry := test.NewDeploymentConfigRegistry()

-	mockRegistry.DeploymentConfigs = &api.DeploymentConfigList{

-		Items: []api.DeploymentConfig{

-			{

-				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)

-	}

-

-	deploymentConfigs := list.(*api.DeploymentConfigList)

-

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

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

-	}

-}

-

-func TestCreateDeploymentConfigBadObject(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 deploymentConfig") == -1 {

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

-	}

-}

-

-func TestCreateRegistrySaveError(t *testing.T) {

-	mockRegistry := test.NewDeploymentConfigRegistry()

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

-	storage := REST{registry: mockRegistry}

-

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

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

-		Template: api.DeploymentTemplate{

-			Strategy:           deploytest.OkStrategy(),

-			ControllerTemplate: deploytest.OkControllerTemplate(),

-		},

-	})

-	if err != mockRegistry.Err {

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

-	}

-}

-

-func TestCreateDeploymentConfigOK(t *testing.T) {

-	mockRegistry := test.NewDeploymentConfigRegistry()

-	storage := REST{registry: mockRegistry}

-

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

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

-		Template: api.DeploymentTemplate{

-			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)

-	}

-

-	deploymentConfig, ok := obj.(*api.DeploymentConfig)

-	if !ok {

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

-	}

-	if deploymentConfig.Name != "foo" {

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

-	}

-}

-

-func TestGetDeploymentConfigError(t *testing.T) {

-	mockRegistry := test.NewDeploymentConfigRegistry()

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

-	storage := REST{registry: mockRegistry}

-

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

-	if deploymentConfig != nil {

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

-	}

-	if err != mockRegistry.Err {

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

-	}

-}

-

-func TestGetDeploymentConfigOK(t *testing.T) {

-	mockRegistry := test.NewDeploymentConfigRegistry()

-	mockRegistry.DeploymentConfig = &api.DeploymentConfig{

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

-	}

-	storage := REST{registry: mockRegistry}

-

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

-	if deploymentConfig == nil {

-		t.Error("Unexpected nil deploymentConfig")

-	}

-	if err != nil {

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

-	}

-	if deploymentConfig.(*api.DeploymentConfig).Name != "foo" {

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

-	}

-}

-

-func TestUpdateDeploymentConfigBadObject(t *testing.T) {

-	storage := REST{}

-

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

-	if obj != nil || created {

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

-	}

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

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

-	}

-}

-

-func TestUpdateDeploymentConfigMissingID(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(), "id is unspecified:") == -1 {

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

-	}

-}

-

-func TestUpdateRegistryErrorSaving(t *testing.T) {

-	mockRepositoryRegistry := test.NewDeploymentConfigRegistry()

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

-	storage := REST{registry: mockRepositoryRegistry}

-

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

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

-	})

-	if err != mockRepositoryRegistry.Err {

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

-	}

-}

-

-func TestUpdateDeploymentConfigOK(t *testing.T) {

-	mockRepositoryRegistry := test.NewDeploymentConfigRegistry()

-	storage := REST{registry: mockRepositoryRegistry}

-

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

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

-	})

-	if err != nil || created {

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

-	}

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

-	if !ok {

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

-	}

-	if repo.Name != "bar" {

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

-	}

-}

-

-func TestDeleteDeploymentConfig(t *testing.T) {

-	mockRegistry := test.NewDeploymentConfigRegistry()

-	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 TestCreateDeploymentConfigConflictingNamespace(t *testing.T) {

-	storage := REST{}

-

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

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

-	})

-

-	if obj != nil {

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

-	}

-

-	checkExpectedNamespaceError(t, err)

-}

-

-func TestUpdateDeploymentConfigConflictingNamespace(t *testing.T) {

-	mockRepositoryRegistry := test.NewDeploymentConfigRegistry()

-	storage := REST{registry: mockRepositoryRegistry}

-

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

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

-	})

-

-	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 := "DeploymentConfig.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())

-		}

-	}

-

-}

new file mode 100644

@@ -0,0 +1,82 @@

+package deployconfig

+

+import (

+	"fmt"

+

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

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

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

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic"

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

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

+

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

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

+)

+

+// strategy implements behavior for DeploymentConfig objects

+type strategy struct {

+	runtime.ObjectTyper

+	kapi.NameGenerator

+}

+

+// Strategy is the default logic that applies when creating and updating DeploymentConfig objects.

+var Strategy = strategy{kapi.Scheme, kapi.SimpleNameGenerator}

+

+func (strategy) NamespaceScoped() bool {

+	return true

+}

+

+// AllowCreateOnUpdate is false for DeploymentConfig objects.

+func (strategy) AllowCreateOnUpdate() bool {

+	return false

+}

+

+// PrepareForCreate clears fields that are not allowed to be set by end users on creation.

+func (strategy) PrepareForCreate(obj runtime.Object) {

+	_ = obj.(*api.DeploymentConfig)

+	// TODO: need to ensure status.latestVersion is not set out of order

+}

+

+// PrepareForUpdate clears fields that are not allowed to be set by end users on update.

+func (strategy) PrepareForUpdate(obj, old runtime.Object) {

+	_ = obj.(*api.DeploymentConfig)

+	// TODO: need to ensure status.latestVersion is not set out of order

+}

+

+// Validate validates a new policy.

+func (strategy) Validate(ctx kapi.Context, obj runtime.Object) fielderrors.ValidationErrorList {

+	return validation.ValidateDeploymentConfig(obj.(*api.DeploymentConfig))

+}

+

+// ValidateUpdate is the default update validation for an end user.

+func (strategy) ValidateUpdate(ctx kapi.Context, obj, old runtime.Object) fielderrors.ValidationErrorList {

+	return validation.ValidateDeploymentConfigUpdate(obj.(*api.DeploymentConfig), old.(*api.DeploymentConfig))

+}

+

+// CheckGracefulDelete allows a build to be gracefully deleted.

+func (strategy) CheckGracefulDelete(obj runtime.Object, options *kapi.DeleteOptions) bool {

+	return false

+}

+

+// Matcher returns a generic matcher for a given label and field selector.

+func Matcher(label labels.Selector, field fields.Selector) generic.Matcher {

+	return &generic.SelectionPredicate{

+		Label: label,

+		Field: field,

+		GetAttrs: func(obj runtime.Object) (labels.Set, fields.Set, error) {

+			deploymentConfig, ok := obj.(*api.DeploymentConfig)

+			if !ok {

+				return nil, nil, fmt.Errorf("not a deployment config")

+			}

+			return labels.Set(deploymentConfig.ObjectMeta.Labels), SelectableFields(deploymentConfig), nil

+		},

+	}

+}

+

+// SelectableFields returns a label set that represents the object

+func SelectableFields(deploymentConfig *api.DeploymentConfig) fields.Set {

+	return fields.Set{

+		"metadata.name": deploymentConfig.Name,

+	}

+}

new file mode 100644

@@ -0,0 +1,55 @@

+package deployconfig

+

+import (

+	"testing"

+

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

+

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

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

+)

+

+func TestDeploymentConfigStrategy(t *testing.T) {

+	ctx := kapi.NewDefaultContext()

+	if !Strategy.NamespaceScoped() {

+		t.Errorf("DeploymentConfig is namespace scoped")

+	}

+	if Strategy.AllowCreateOnUpdate() {

+		t.Errorf("DeploymentConfig should not allow create on update")

+	}

+	deploymentConfig := &deployapi.DeploymentConfig{

+		ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "default"},

+		Template: deployapi.DeploymentTemplate{

+			Strategy:           deploytest.OkStrategy(),

+			ControllerTemplate: deploytest.OkControllerTemplate(),

+		},

+	}

+	Strategy.PrepareForCreate(deploymentConfig)

+	errs := Strategy.Validate(ctx, deploymentConfig)

+	if len(errs) != 0 {

+		t.Errorf("Unexpected error validating %v", errs)

+	}

+	updatedDeploymentConfig := &deployapi.DeploymentConfig{

+		ObjectMeta: kapi.ObjectMeta{Name: "bar", Namespace: "default"},

+		Template: deployapi.DeploymentTemplate{

+			Strategy:           deploytest.OkStrategy(),

+			ControllerTemplate: deploytest.OkControllerTemplate(),

+		},

+	}

+	errs = Strategy.ValidateUpdate(ctx, updatedDeploymentConfig, deploymentConfig)

+	if len(errs) == 0 {

+		t.Errorf("Expected error validating")

+	}

+	// name must match, and resource version must be provided

+	updatedDeploymentConfig.Name = "foo"

+	updatedDeploymentConfig.ResourceVersion = "1"

+	errs = Strategy.ValidateUpdate(ctx, updatedDeploymentConfig, deploymentConfig)

+	if len(errs) != 0 {

+		t.Errorf("Unexpected error validating %v", errs)

+	}

+	invalidDeploymentConfig := &deployapi.DeploymentConfig{}

+	errs = Strategy.Validate(ctx, invalidDeploymentConfig)

+	if len(errs) == 0 {

+		t.Errorf("Expected error validating")

+	}

+}

@@ -19,8 +19,6 @@ import (

 const (

 	// DeploymentPath is the path to deployment resources in etcd

 	DeploymentPath string = "/deployments"

-	// DeploymentConfigPath is the path to deploymentConfig resources in etcd

-	DeploymentConfigPath string = "/deploymentconfigs"

 )

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

@@ -130,100 +128,3 @@ func (r *Etcd) WatchDeployments(ctx kapi.Context, label labels.Selector, field f

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

 	})

 }

-

-// ListDeploymentConfigs obtains a list of DeploymentConfigs.

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

-	deploymentConfigs := api.DeploymentConfigList{}

-	err := r.ExtractToList(makeDeploymentConfigListKey(ctx), &deploymentConfigs)

-	if err != nil {

-		return nil, err

-	}

-	filtered := []api.DeploymentConfig{}

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

-		fields := labels.Set{

-			"name": item.Name,

-		}

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

-			filtered = append(filtered, item)

-		}

-	}

-

-	deploymentConfigs.Items = filtered

-	return &deploymentConfigs, err

-}

-

-// WatchDeploymentConfigs begins watching for new, changed, or deleted DeploymentConfigs.

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

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

-	if err != nil {

-		return nil, err

-	}

-

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

-		config, ok := obj.(*api.DeploymentConfig)

-		if !ok {

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

-			return false

-		}

-		fields := labels.Set{

-			"name": config.Name,

-		}

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

-	})

-}

-

-func makeDeploymentConfigListKey(ctx kapi.Context) string {

-	return kubeetcd.MakeEtcdListKey(ctx, DeploymentConfigPath)

-}

-

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

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

-}

-

-// GetDeploymentConfig gets a specific DeploymentConfig specified by its ID.

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

-	var deploymentConfig api.DeploymentConfig

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

-	if err != nil {

-		return nil, err

-	}

-

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

-	if err != nil {

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

-	}

-	return &deploymentConfig, nil

-}

-

-// CreateDeploymentConfig creates a new DeploymentConfig.

-func (r *Etcd) CreateDeploymentConfig(ctx kapi.Context, deploymentConfig *api.DeploymentConfig) error {

-	key, err := makeDeploymentConfigKey(ctx, deploymentConfig.Name)

-	if err != nil {

-		return err

-	}

-

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

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

-}

-

-// UpdateDeploymentConfig replaces an existing DeploymentConfig.

-func (r *Etcd) UpdateDeploymentConfig(ctx kapi.Context, deploymentConfig *api.DeploymentConfig) error {

-	key, err := makeDeploymentConfigKey(ctx, deploymentConfig.Name)

-	if err != nil {

-		return err

-	}

-

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

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

-}

-

-// DeleteDeploymentConfig deletes a DeploymentConfig specified by its ID.

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

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

-	if err != nil {

-		return err

-	}

-

-	err = r.Delete(key, false)

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

-}

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

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

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

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

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

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

 )

@@ -39,21 +38,6 @@ func makeTestDefaultDeploymentKey(id string) string {

 func makeTestDefaultDeploymentListKey() string {

 	return makeTestDeploymentListKey(kapi.NamespaceDefault)

 }

-func makeTestDeploymentConfigListKey(namespace string) string {

-	if len(namespace) != 0 {

-		return "/deploymentconfigs/" + namespace

-	}

-	return "/deploymentconfigs"

-}

-func makeTestDeploymentConfigKey(namespace, id string) string {

-	return "/deploymentconfigs/" + namespace + "/" + id

-}

-func makeTestDefaultDeploymentConfigKey(id string) string {

-	return makeTestDeploymentConfigKey(kapi.NamespaceDefault, id)

-}

-func makeTestDefaultDeploymentConfigListKey() string {

-	return makeTestDeploymentConfigListKey(kapi.NamespaceDefault)

-}