github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only set a groupresource on errors if a resource was specified

Browse Source
This commit is contained in:
Jordan Liggitt
2017-02-28 15:46:15 -05:00
parent 81d01a84e0
commit 6951023759
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/client-go/rest/request.go
View File

@@ -1035,13 +1035,15 @@ func (r *Request) newUnstructuredResponseError(body []byte, isTextResponse bool,
if isTextResponse { if isTextResponse {
message = strings.TrimSpace(string(body)) message = strings.TrimSpace(string(body))
} }
var groupResource schema.GroupResource
if len(r.resource) > 0 {
groupResource.Group = r.content.GroupVersion.Group
groupResource.Resource = r.resource
}
return errors.NewGenericServerResponse( return errors.NewGenericServerResponse(
statusCode, statusCode,
method, method,
schema.GroupResource{ groupResource,
Group: r.content.GroupVersion.Group,
Resource: r.resource,
},
r.resourceName, r.resourceName,
message, message,
retryAfter, retryAfter,