From 9be38b2aa2afe52812a82da8a800637d41c11ce8 Mon Sep 17 00:00:00 2001
From: deads2k <deads@redhat.com>
Date: Fri, 10 Mar 2017 13:51:02 -0500
Subject: [PATCH] wire in aggregation

Kubernetes-commit: 8e26fa25da6d3b1deb333fe2484f794795d1c6b9
---
 discovery/restmapper.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/discovery/restmapper.go b/discovery/restmapper.go
index 9b0769a18..69f161ac8 100644
--- a/discovery/restmapper.go
+++ b/discovery/restmapper.go
@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"sync"
 
-	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -127,10 +126,9 @@ func GetAPIGroupResources(cl DiscoveryInterface) ([]*APIGroupResources, error) {
 		for _, version := range group.Versions {
 			resources, err := cl.ServerResourcesForGroupVersion(version.GroupVersion)
 			if err != nil {
-				if errors.IsNotFound(err) {
-					continue // ignore as this can race with deletion of 3rd party APIs
-				}
-				return nil, err
+				// continue as best we can
+				// TODO track the errors and update callers to handle partial errors.
+				continue
 			}
 			groupResources.VersionedResources[version.Version] = resources.APIResources
 		}