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

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 ```

Merge pull request #63625 from liggitt/discovery-cleanup-2
f637a259 · Kubernetes Submit Queue · GitHub · f485cb79 · af7d3b21 · f637a259
Unverified Commit f637a259 authored Jun 20, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 14 deletions

memcache.go staging/src/k8s.io/client-go/discovery/cached/memcache.go +1 -14

No files found.
--- a/staging/src/k8s.io/client-go/discovery/cached/memcache.go
+++ b/staging/src/k8s.io/client-go/discovery/cached/memcache.go
@@ -67,20 +67,7 @@ func (d *memCacheClient) ServerResourcesForGroupVersion(groupVersion string) (*m

 // ServerResources returns the supported resources for all groups and versions.
 func (d *memCacheClient) ServerResources() ([]*metav1.APIResourceList, error) {
-	apiGroups, err := d.ServerGroups()
-	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
+	return discovery.ServerResources(d)
 }

 func (d *memCacheClient) ServerGroups() (*metav1.APIGroupList, error) {