github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Handle partial group and resource responses consistently

Browse Source
This commit is contained in:
Jordan Liggitt 2018-04-06 22:42:34 -04:00
parent d371be33f7
commit e203c4e42b
No known key found for this signature in database
GPG Key ID: 39928704103C7229
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/client-go/discovery/restmapper.go
View File

@ -144,7 +144,10 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
func GetAPIGroupResources(cl DiscoveryInterface) ([]*APIGroupResources, error) { func GetAPIGroupResources(cl DiscoveryInterface) ([]*APIGroupResources, error) {
apiGroups, err := cl.ServerGroups() apiGroups, err := cl.ServerGroups()
if err != nil { if err != nil {
return nil, err if apiGroups == nil || len(apiGroups.Groups) == 0 {
return nil, err
}
// TODO track the errors and update callers to handle partial errors.
} }
var result []*APIGroupResources var result []*APIGroupResources
for _, group := range apiGroups.Groups { for _, group := range apiGroups.Groups {
@ -157,7 +160,9 @@ func GetAPIGroupResources(cl DiscoveryInterface) ([]*APIGroupResources, error) {
if err != nil { if err != nil {
// continue as best we can // continue as best we can
// TODO track the errors and update callers to handle partial errors. // TODO track the errors and update callers to handle partial errors.
continue if resources == nil || len(resources.APIResources) == 0 {
continue
}
} }
groupResources.VersionedResources[version.Version] = resources.APIResources groupResources.VersionedResources[version.Version] = resources.APIResources
} }