diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 7f5aa64f9..d3cc5cf6c 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -936,223 +936,223 @@ }, { "ImportPath": "k8s.io/apimachinery/pkg/api/equality", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/validation", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/validation/path", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/cache", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/clock", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/rand", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/uuid", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "20c1b324426bcedeeae5cee5b7b1ba8016882227" + "Rev": "6426d21f392c6d0e710af98bdfe6fb7334b3e11a" }, { "ImportPath": "k8s.io/client-go/discovery", diff --git a/pkg/registry/generic/registry/store.go b/pkg/registry/generic/registry/store.go index c95f1ff9f..1e799c6e2 100644 --- a/pkg/registry/generic/registry/store.go +++ b/pkg/registry/generic/registry/store.go @@ -373,7 +373,7 @@ func (e *Store) Create(ctx context.Context, obj runtime.Object, createValidation } } if e.Decorator != nil { - if err := e.Decorator(obj); err != nil { + if err := e.Decorator(out); err != nil { return nil, err } } diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/registry/generic/registry/store_test.go index 76ed138af..328ddca12 100644 --- a/pkg/registry/generic/registry/store_test.go +++ b/pkg/registry/generic/registry/store_test.go @@ -311,6 +311,11 @@ func TestStoreCreate(t *testing.T) { // re-define delete strategy to have graceful delete capability defaultDeleteStrategy := testRESTStrategy{scheme, names.SimpleNameGenerator, true, false, true} registry.DeleteStrategy = testGracefulStrategy{defaultDeleteStrategy} + registry.Decorator = func(obj runtime.Object) error { + pod := obj.(*example.Pod) + pod.Status.Phase = example.PodPhase("Testing") + return nil + } // create the object with denying admission objA, err := registry.Create(testContext, podA, denyCreateValidation, false) @@ -324,6 +329,11 @@ func TestStoreCreate(t *testing.T) { t.Errorf("Unexpected error: %v", err) } + // verify the decorator was called + if objA.(*example.Pod).Status.Phase != example.PodPhase("Testing") { + t.Errorf("Decorator was not called: %#v", objA) + } + // get the object checkobj, err := registry.Get(testContext, podA.Name, &metav1.GetOptions{}) if err != nil {