rebase 1.9.0 beta.1

pkg/apps/registry/instantiate/rest.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/golang/glog"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -51,7 +50,7 @@ func (s *REST) New() runtime.Object {
 }
 
 // Create instantiates a deployment config
-func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
+func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
 	req, ok := obj.(*deployapi.DeploymentRequest)
 	if !ok {
 		return nil, errors.NewInternalError(fmt.Errorf("wrong object passed for requesting a new rollout: %#v", obj))
@@ -105,11 +104,19 @@ func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runti
 
 		userInfo, _ := apirequest.UserFrom(ctx)
 		attrs := admission.NewAttributesRecord(config, old, deployapi.Kind("DeploymentConfig").WithVersion(""), config.Namespace, config.Name, deployapi.Resource("DeploymentConfig").WithVersion(""), "", admission.Update, userInfo)
-		if err := r.admit.Admit(attrs); err != nil {
+		if err := r.admit.(admission.MutationInterface).Admit(attrs); err != nil {
+			return err
+		}
+		if err := r.admit.(admission.ValidationInterface).Validate(attrs); err != nil {
 			return err
 		}
 
-		ret, _, err = r.store.Update(ctx, config.Name, rest.DefaultUpdatedObjectInfo(config, legacyscheme.Scheme))
+		ret, _, err = r.store.Update(
+			ctx,
+			config.Name,
+			rest.DefaultUpdatedObjectInfo(config),
+			rest.AdmissionToValidateObjectFunc(r.admit, attrs),
+			rest.AdmissionToValidateObjectUpdateFunc(r.admit, attrs))
 		return err
 	})
 

pkg/apps/registry/rollback/rest.go

@@ -45,7 +45,7 @@ func (r *REST) New() runtime.Object {
 }
 
 // Create generates a new DeploymentConfig representing a rollback.
-func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
+func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
 	namespace, ok := apirequest.NamespaceFrom(ctx)
 	if !ok {
 		return nil, kerrors.NewBadRequest("namespace parameter required.")
@@ -58,6 +58,9 @@ func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runti
 	if errs := validation.ValidateDeploymentConfigRollback(rollback); len(errs) > 0 {
 		return nil, kerrors.NewInvalid(deployapi.Kind("DeploymentConfigRollback"), rollback.Name, errs)
 	}
+	if err := createValidation(obj); err != nil {
+		return nil, err
+	}
 
 	from, err := r.dn.DeploymentConfigs(namespace).Get(rollback.Name, metav1.GetOptions{})
 	if err != nil {

pkg/build/registry/buildclone/rest.go

@@ -28,10 +28,13 @@ func (s *CloneREST) New() runtime.Object {
 }
 
 // Create instantiates a new build from an existing build
-func (s *CloneREST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
+func (s *CloneREST) Create(ctx apirequest.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
 	if err := rest.BeforeCreate(Strategy, ctx, obj); err != nil {
 		return nil, err
 	}
+	if err := createValidation(obj); err != nil {
+		return nil, err
+	}
 
 	return s.generator.Clone(ctx, obj.(*buildapi.BuildRequest))
 }

pkg/build/registry/buildconfiginstantiate/rest.go

@@ -56,10 +56,13 @@ func (s *InstantiateREST) New() runtime.Object {
 }
 
 // Create instantiates a new build from a build configuration
-func (s *InstantiateREST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
+func (s *InstantiateREST) Create(ctx apirequest.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
 	if err := rest.BeforeCreate(Strategy, ctx, obj); err != nil {
 		return nil, err
 	}
+	if err := createValidation(obj); err != nil {
+		return nil, err
+	}
 
 	request := obj.(*buildapi.BuildRequest)
 	if request.TriggeredBy == nil {

pkg/image/registry/imagesignature/rest.go

@@ -31,12 +31,19 @@ func (r *REST) New() runtime.Object {
 	return &imageapi.ImageSignature{}
 }
 
-func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
+func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
 	signature := obj.(*imageapi.ImageSignature)
 
 	if err := rest.BeforeCreate(Strategy, ctx, obj); err != nil {
 		return nil, err
 	}
+	// at this point we have a fully formed object.  It is time to call the validators that the apiserver
+	// handling chain wants to enforce.
+	if createValidation != nil {
+		if err := createValidation(obj.DeepCopyObject()); err != nil {
+			return nil, err
+		}
+	}
 
 	imageName, _, err := imageapi.SplitImageSignatureName(signature.Name)
 	if err != nil {

pkg/image/registry/imagestreamimport/rest.go

@@ -88,7 +88,7 @@ func (r *REST) New() runtime.Object {
 	return &imageapi.ImageStreamImport{}
 }
 
-func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
+func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
 	isi, ok := obj.(*imageapi.ImageStreamImport)
 	if !ok {
 		return nil, kapierrors.NewBadRequest(fmt.Sprintf("obj is not an ImageStreamImport: %#v", obj))
@@ -99,6 +99,9 @@ func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runti
 	if err := rest.BeforeCreate(r.strategy, ctx, obj); err != nil {
 		return nil, err
 	}
+	if err := createValidation(obj.DeepCopyObject()); err != nil {
+		return nil, err
+	}
 
 	// Check if the user is allowed to create Images or ImageStreamMappings.
 	// In case the user is allowed to create them, do not validate the ImageStreamImport

pkg/image/registry/imagestreammapping/rest.go

@@ -52,10 +52,13 @@ func (r *REST) New() runtime.Object {
 // with a resource conflict, the update will be retried if the newer
 // ImageStream has no tag diffs from the previous state. If tag diffs are
 // detected, the conflict error is returned.
-func (s *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
+func (s *REST) Create(ctx apirequest.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
 	if err := rest.BeforeCreate(s.strategy, ctx, obj); err != nil {
 		return nil, err
 	}
+	if err := createValidation(obj.DeepCopyObject()); err != nil {
+		return nil, err
+	}
 
 	mapping := obj.(*imageapi.ImageStreamMapping)
 

pkg/image/registry/imagestreamtag/rest.go

@@ -112,14 +112,17 @@ func (r *REST) Get(ctx apirequest.Context, id string, options *metav1.GetOptions
 	return newISTag(tag, imageStream, image, false)
 }
 
-func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
+func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
 	istag, ok := obj.(*imageapi.ImageStreamTag)
 	if !ok {
 		return nil, kapierrors.NewBadRequest(fmt.Sprintf("obj is not an ImageStreamTag: %#v", obj))
 	}
 	if err := rest.BeforeCreate(Strategy, ctx, obj); err != nil {
 		return nil, err
 	}
+	if err := createValidation(obj.DeepCopyObject()); err != nil {
+		return nil, err
+	}
 	namespace, ok := apirequest.NamespaceFrom(ctx)
 	if !ok {
 		return nil, kapierrors.NewBadRequest("a namespace must be specified to import images")
@@ -172,7 +175,7 @@ func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runti
 	return istag, nil
 }
 
-func (r *REST) Update(ctx apirequest.Context, tagName string, objInfo rest.UpdatedObjectInfo) (runtime.Object, bool, error) {
+func (r *REST) Update(ctx apirequest.Context, tagName string, objInfo rest.UpdatedObjectInfo, createValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc) (runtime.Object, bool, error) {
 	name, tag, err := nameAndTag(tagName)
 	if err != nil {
 		return nil, false, err
@@ -237,10 +240,16 @@ func (r *REST) Update(ctx apirequest.Context, tagName string, objInfo rest.Updat
 		if err := rest.BeforeCreate(Strategy, ctx, obj); err != nil {
 			return nil, false, err
 		}
+		if err := createValidation(obj.DeepCopyObject()); err != nil {
+			return nil, false, err
+		}
 	} else {
 		if err := rest.BeforeUpdate(Strategy, ctx, obj, old); err != nil {
 			return nil, false, err
 		}
+		if err := updateValidation(obj.DeepCopyObject(), old.DeepCopyObject()); err != nil {
+			return nil, false, err
+		}
 	}
 
 	// update the spec tag

pkg/project/registry/project/proxy/proxy.go

@@ -128,7 +128,7 @@ func (s *REST) Get(ctx apirequest.Context, name string, options *metav1.GetOptio
 var _ = rest.Creater(&REST{})
 
 // Create registers the given Project.
-func (s *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
+func (s *REST) Create(ctx apirequest.Context, obj runtime.Object, creationValidation rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
 	project, ok := obj.(*projectapi.Project)
 	if !ok {
 		return nil, fmt.Errorf("not a project: %#v", obj)
@@ -138,6 +138,10 @@ func (s *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runti
 	if errs := s.createStrategy.Validate(ctx, obj); len(errs) > 0 {
 		return nil, kerrors.NewInvalid(projectapi.Kind("Project"), project.Name, errs)
 	}
+	if err := creationValidation(project.DeepCopyObject()); err != nil {
+		return nil, err
+	}
+
 	namespace, err := s.client.Create(projectutil.ConvertProject(project))
 	if err != nil {
 		return nil, err
@@ -147,7 +151,7 @@ func (s *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runti
 
 var _ = rest.Updater(&REST{})
 
-func (s *REST) Update(ctx apirequest.Context, name string, objInfo rest.UpdatedObjectInfo) (runtime.Object, bool, error) {
+func (s *REST) Update(ctx apirequest.Context, name string, objInfo rest.UpdatedObjectInfo, creationValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc) (runtime.Object, bool, error) {
 	oldObj, err := s.Get(ctx, name, &metav1.GetOptions{})
 	if err != nil {
 		return nil, false, err
@@ -167,6 +171,9 @@ func (s *REST) Update(ctx apirequest.Context, name string, objInfo rest.UpdatedO
 	if errs := s.updateStrategy.ValidateUpdate(ctx, obj, oldObj); len(errs) > 0 {
 		return nil, false, kerrors.NewInvalid(projectapi.Kind("Project"), project.Name, errs)
 	}
+	if err := updateValidation(obj.DeepCopyObject(), oldObj.DeepCopyObject()); err != nil {
+		return nil, false, err
+	}
 
 	namespace, err := s.client.Update(projectutil.ConvertProject(project))
 	if err != nil {

pkg/project/registry/projectrequest/delegated/delegated.go

@@ -84,11 +84,13 @@ var (
 	ForbiddenPrefixes = []string{"openshift-", "kubernetes-", "kube-"}
 )
 
-func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, includeUninitialized bool) (runtime.Object, error) {
-
+func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, includeUninitialized bool) (runtime.Object, error) {
 	if err := rest.BeforeCreate(projectrequestregistry.Strategy, ctx, obj); err != nil {
 		return nil, err
 	}
+	if err := createValidation(obj); err != nil {
+		return nil, err
+	}
 
 	projectRequest := obj.(*projectapi.ProjectRequest)
 	for _, s := range ForbiddenNames {