Merge pull request #53525 from sttts/sttts-scheme-copier-romoval

Automatic merge from submit-queue (batch tested with PRs 53525, 53652). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

apimachinery: remove ObjectCopier interface(s)

The big commit is a mechanical, transitive removal of the copier interfaces in all structs and function calls.

Kubernetes-commit: aaf14d4619ddae90ec753959053a74967832058c
This commit is contained in:
Kubernetes Publisher 2017-10-10 08:31:41 -07:00
commit 41b0611ef6
2 changed files with 49 additions and 50 deletions

98
Godeps/Godeps.json generated
View File

@ -480,199 +480,199 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "a1ea9bc10d36daefc404197d438e033927802735" "Rev": "8d40e6005e31a17866bebd03144e825f9e61bd52"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",

View File

@ -59,7 +59,6 @@ type ObjectTracker interface {
// ObjectScheme abstracts the implementation of common operations on objects. // ObjectScheme abstracts the implementation of common operations on objects.
type ObjectScheme interface { type ObjectScheme interface {
runtime.ObjectCreater runtime.ObjectCreater
runtime.ObjectCopier
runtime.ObjectTyper runtime.ObjectTyper
} }