github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,8 +144,11 @@ 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 {
if apiGroups == nil || len(apiGroups.Groups) == 0 {
return nil, err 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 {
groupResources := &APIGroupResources{ groupResources := &APIGroupResources{
@@ -157,8 +160,10 @@ 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.
if resources == nil || len(resources.APIResources) == 0 {
continue continue
} }
}
groupResources.VersionedResources[version.Version] = resources.APIResources groupResources.VersionedResources[version.Version] = resources.APIResources
} }
result = append(result, groupResources) result = append(result, groupResources)