github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-23 13:47:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63625 from liggitt/discovery-cleanup-2

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 64416, 63625, 60967, 64767, 64588). 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>.

Collapse memcached discovery client onto parallelized discovery method

```release-note
NONE
```

Kubernetes-commit: f637a259ea2852a15a4321fd059972c55aaefc9b
This commit is contained in:
Kubernetes Publisher 2018-06-20 07:12:18 -07:00
commit 2e8676d253
2 changed files with 52 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Godeps/Godeps.json generated
View File

@ -1,6 +1,6 @@
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"GoVersion": "go1.10", "GoVersion": "go1.9",
"GodepVersion": "v80", "GodepVersion": "v80",
"Packages": [ "Packages": [
"./..." "./..."
@ -388,203 +388,203 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing", "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7" "Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

15
discovery/cached/memcache.go
View File

@ -67,20 +67,7 @@ func (d *memCacheClient) ServerResourcesForGroupVersion(groupVersion string) (*m
// ServerResources returns the supported resources for all groups and versions. // ServerResources returns the supported resources for all groups and versions.
func (d *memCacheClient) ServerResources() ([]*metav1.APIResourceList, error) { func (d *memCacheClient) ServerResources() ([]*metav1.APIResourceList, error) {
apiGroups, err := d.ServerGroups() return discovery.ServerResources(d)
if err != nil {
return nil, err
}
groupVersions := metav1.ExtractGroupVersions(apiGroups)
result := []*metav1.APIResourceList{}
for _, groupVersion := range groupVersions {
resources, err := d.ServerResourcesForGroupVersion(groupVersion)
if err != nil {
return nil, err
}
result = append(result, resources)
}
return result, nil
} }
func (d *memCacheClient) ServerGroups() (*metav1.APIGroupList, error) { func (d *memCacheClient) ServerGroups() (*metav1.APIGroupList, error) {