Merge pull request kubernetes#4419 from smarterclayton/expand_generic…

…_resources

Expand the generic registry

pkg/api/rest/create.go

@@ -87,12 +87,12 @@ func CheckGeneratedNameError(strategy RESTCreateStrategy, err error, obj runtime
 }
 
 // objectMetaAndKind retrieves kind and ObjectMeta from a runtime object, or returns an error.
-func objectMetaAndKind(strategy RESTCreateStrategy, obj runtime.Object) (*api.ObjectMeta, string, error) {
+func objectMetaAndKind(typer runtime.ObjectTyper, obj runtime.Object) (*api.ObjectMeta, string, error) {
 	objectMeta, err := api.ObjectMetaFor(obj)
 	if err != nil {
 		return nil, "", errors.NewInternalError(err)
 	}
-	_, kind, err := strategy.ObjectVersionAndKind(obj)
+	_, kind, err := typer.ObjectVersionAndKind(obj)
 	if err != nil {
 		return nil, "", errors.NewInternalError(err)
 	}

pkg/api/rest/types.go

@@ -23,6 +23,27 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 )
 
+// ObjectFunc is a function to act on a given object. An error may be returned
+// if the hook cannot be completed. An ObjectFunc may transform the provided
+// object.
+type ObjectFunc func(obj runtime.Object) error
+
+// AllFuncs returns an ObjectFunc that attempts to run all of the provided functions
+// in order, returning early if there are any errors.
+func AllFuncs(fns ...ObjectFunc) ObjectFunc {
+	return func(obj runtime.Object) error {
+		for _, fn := range fns {
+			if fn == nil {
+				continue
+			}
+			if err := fn(obj); err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+}
+
 // rcStrategy implements behavior for Replication Controllers.
 // TODO: move to a replicationcontroller specific package.
 type rcStrategy struct {
@@ -60,7 +81,7 @@ type podStrategy struct {
 
 // Pods is the default logic that applies when creating and updating Pod
 // objects.
-var Pods RESTCreateStrategy = podStrategy{api.Scheme, api.SimpleNameGenerator}
+var Pods = podStrategy{api.Scheme, api.SimpleNameGenerator}
 
 // NamespaceScoped is true for pods.
 func (podStrategy) NamespaceScoped() bool {
@@ -70,7 +91,9 @@ func (podStrategy) NamespaceScoped() bool {
 // ResetBeforeCreate clears fields that are not allowed to be set by end users on creation.
 func (podStrategy) ResetBeforeCreate(obj runtime.Object) {
 	pod := obj.(*api.Pod)
-	pod.Status = api.PodStatus{}
+	pod.Status = api.PodStatus{
+		Phase: api.PodPending,
+	}
 }
 
 // Validate validates a new pod.
@@ -79,6 +102,16 @@ func (podStrategy) Validate(obj runtime.Object) errors.ValidationErrorList {
 	return validation.ValidatePod(pod)
 }
 
+// AllowCreateOnUpdate is false for pods.
+func (podStrategy) AllowCreateOnUpdate() bool {
+	return false
+}
+
+// ValidateUpdate is the default update validation for an end user.
+func (podStrategy) ValidateUpdate(obj, old runtime.Object) errors.ValidationErrorList {
+	return validation.ValidatePodUpdate(obj.(*api.Pod), old.(*api.Pod))
+}
+
 // svcStrategy implements behavior for Services
 // TODO: move to a service specific package.
 type svcStrategy struct {

pkg/api/rest/update.go

@@ -0,0 +1,59 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package rest
+
+import (
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+)
+
+// RESTUpdateStrategy defines the minimum validation, accepted input, and
+// name generation behavior to update an object that follows Kubernetes
+// API conventions. A resource may have many UpdateStrategies, depending on
+// the call pattern in use.
+type RESTUpdateStrategy interface {
+	runtime.ObjectTyper
+	// NamespaceScoped returns true if the object must be within a namespace.
+	NamespaceScoped() bool
+	// AllowCreateOnUpdate returns true if the object can be created by a PUT.
+	AllowCreateOnUpdate() bool
+	// ValidateUpdate is invoked after default fields in the object have been filled in before
+	// the object is persisted.
+	ValidateUpdate(obj, old runtime.Object) errors.ValidationErrorList
+}
+
+// BeforeUpdate ensures that common operations for all resources are performed on update. It only returns
+// errors that can be converted to api.Status. It will invoke update validation with the provided existing
+// and updated objects.
+func BeforeUpdate(strategy RESTUpdateStrategy, ctx api.Context, obj, old runtime.Object) error {
+	objectMeta, kind, kerr := objectMetaAndKind(strategy, obj)
+	if kerr != nil {
+		return kerr
+	}
+	if strategy.NamespaceScoped() {
+		if !api.ValidNamespace(ctx, objectMeta) {
+			return errors.NewBadRequest("the namespace of the provided object does not match the namespace sent on the request")
+		}
+	} else {
+		objectMeta.Namespace = api.NamespaceNone
+	}
+	if errs := strategy.ValidateUpdate(obj, old); len(errs) > 0 {
+		return errors.NewInvalid(kind, objectMeta.Name, errs)
+	}
+	return nil
+}

pkg/api/validation/validation.go

@@ -561,7 +561,8 @@ func ValidatePodSpec(spec *api.PodSpec) errs.ValidationErrorList {
 	return allErrs
 }
 
-// ValidatePodUpdate tests to see if the update is legal
+// ValidatePodUpdate tests to see if the update is legal for an end user to make. newPod is updated with fields
+// that cannot be changed.
 func ValidatePodUpdate(newPod, oldPod *api.Pod) errs.ValidationErrorList {
 	allErrs := errs.ValidationErrorList{}
 
@@ -584,6 +585,7 @@ func ValidatePodUpdate(newPod, oldPod *api.Pod) errs.ValidationErrorList {
 		allErrs = append(allErrs, errs.NewFieldInvalid("spec.containers", newPod.Spec.Containers, "some fields are immutable"))
 	}
 
+	newPod.Status = oldPod.Status
 	return allErrs
 }
 

pkg/apiserver/resthandler.go

@@ -148,7 +148,11 @@ func CreateResource(r RESTCreater, ctxFn ContextFunc, namespaceFn ResourceNamesp
 		}
 
 		result, err := finishRequest(timeout, func() (runtime.Object, error) {
-			return r.Create(ctx, obj)
+			out, err := r.Create(ctx, obj)
+			if status, ok := out.(*api.Status); ok && err == nil && status.Code == 0 {
+				status.Code = http.StatusCreated
+			}
+			return out, err
 		})
 		if err != nil {
 			errorJSON(err, codec, w)

pkg/registry/event/registry.go

@@ -18,7 +18,6 @@ package event
 
 import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	etcderr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors/etcd"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic"
 	etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
@@ -28,28 +27,6 @@ import (
 // registry implements custom changes to generic.Etcd.
 type registry struct {
 	*etcdgeneric.Etcd
-	ttl uint64
-}
-
-// Create stores the object with a ttl, so that events don't stay in the system forever.
-func (r registry) Create(ctx api.Context, id string, obj runtime.Object) error {
-	key, err := r.Etcd.KeyFunc(ctx, id)
-	if err != nil {
-		return err
-	}
-	err = r.Etcd.Helper.CreateObj(key, obj, r.ttl)
-	return etcderr.InterpretCreateError(err, r.Etcd.EndpointName, id)
-}
-
-// Update replaces an existing instance of the object, and sets a ttl so that the event
-// doesn't stay in the system forever.
-func (r registry) Update(ctx api.Context, id string, obj runtime.Object) error {
-	key, err := r.Etcd.KeyFunc(ctx, id)
-	if err != nil {
-		return err
-	}
-	err = r.Etcd.Helper.SetObj(key, obj, r.ttl)
-	return etcderr.InterpretUpdateError(err, r.Etcd.EndpointName, id)
 }
 
 // NewEtcdRegistry returns a registry which will store Events in the given
@@ -66,8 +43,10 @@ func NewEtcdRegistry(h tools.EtcdHelper, ttl uint64) generic.Registry {
 			KeyFunc: func(ctx api.Context, id string) (string, error) {
 				return etcdgeneric.NamespaceKeyFunc(ctx, "/registry/events", id)
 			},
+			TTLFunc: func(runtime.Object, bool) (uint64, error) {
+				return ttl, nil
+			},
 			Helper: h,
 		},
-		ttl: ttl,
 	}
 }

pkg/registry/event/registry_test.go

@@ -98,7 +98,7 @@ func TestEventCreate(t *testing.T) {
 	for name, item := range table {
 		fakeClient, registry := NewTestEventEtcdRegistry(t)
 		fakeClient.Data[path] = item.existing
-		err := registry.Create(ctx, key, item.toCreate)
+		err := registry.CreateWithName(ctx, key, item.toCreate)
 		if !item.errOK(err) {
 			t.Errorf("%v: unexpected error: %v", name, err)
 		}
@@ -200,7 +200,7 @@ func TestEventUpdate(t *testing.T) {
 	for name, item := range table {
 		fakeClient, registry := NewTestEventEtcdRegistry(t)
 		fakeClient.Data[path] = item.existing
-		err := registry.Update(ctx, key, item.toUpdate)
+		err := registry.UpdateWithName(ctx, key, item.toUpdate)
 		if !item.errOK(err) {
 			t.Errorf("%v: unexpected error: %v", name, err)
 		}

pkg/registry/event/rest.go

@@ -56,7 +56,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (runtime.Object, err
 	}
 	api.FillObjectMetaSystemFields(ctx, &event.ObjectMeta)
 
-	err := rs.registry.Create(ctx, event.Name, event)
+	err := rs.registry.CreateWithName(ctx, event.Name, event)
 	if err != nil {
 		return nil, err
 	}
@@ -79,24 +79,24 @@ func (rs *REST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, boo
 	}
 	api.FillObjectMetaSystemFields(ctx, &event.ObjectMeta)
 
-	err := rs.registry.Update(ctx, event.Name, event)
+	err := rs.registry.UpdateWithName(ctx, event.Name, event)
 	if err != nil {
 		return nil, false, err
 	}
 	out, err := rs.registry.Get(ctx, event.Name)
 	return out, false, err
 }
 
-func (rs *REST) Delete(ctx api.Context, id string) (runtime.Object, error) {
-	obj, err := rs.registry.Get(ctx, id)
+func (rs *REST) Delete(ctx api.Context, name string) (runtime.Object, error) {
+	obj, err := rs.registry.Get(ctx, name)
 	if err != nil {
 		return nil, err
 	}
 	_, ok := obj.(*api.Event)
 	if !ok {
 		return nil, fmt.Errorf("invalid object type")
 	}
-	return &api.Status{Status: api.StatusSuccess}, rs.registry.Delete(ctx, id)
+	return rs.registry.Delete(ctx, name)
 }
 
 func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) {