Merge pull request #71223 from sttts/sttts-openapi-aggreation-without-clone

openapi-aggregation: speed up merging from 1 sec to 50-100 ms

Kubernetes-commit: 6912bbb153ef53a0ece34e7dae74ca79bfc07b82
This commit is contained in:
Kubernetes Publisher 2019-02-11 10:30:56 -08:00
commit e478dd3a68
2 changed files with 52 additions and 54 deletions

104
Godeps/Godeps.json generated
View File

@ -404,207 +404,207 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/naming", "ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "4521e64aecd39e2ab6ae86b59ae7ec273271621a" "Rev": "4b3b852955ebe47857fcf134b531b23dd8f3e793"
}, },
{ {
"ImportPath": "k8s.io/klog", "ImportPath": "k8s.io/klog",
@ -612,7 +612,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "ced9eb3070a5f1c548ef46e8dfe2a97c208d9f03" "Rev": "d7c86cdc46e3a4fcf892b32dd7bc3aa775e0870e"
}, },
{ {
"ImportPath": "k8s.io/utils/buffer", "ImportPath": "k8s.io/utils/buffer",

2
Godeps/OWNERS generated
View File

@ -1,4 +1,2 @@
# See the OWNERS docs at https://go.k8s.io/owners
approvers: approvers:
- dep-approvers - dep-approvers