Merge pull request #42277 from liggitt/group-resource-error

Automatic merge from submit-queue Only set a groupresource on errors if a resource was specified @deads2k this gets rid of the weird .meta.k8s.io error on unauthorized errors

Merge pull request #42277 from liggitt/group-resource-error
c6206c19 · Kubernetes Submit Queue · GitHub · f12db38d · 69510237 · c6206c19
Commit c6206c19 authored Mar 02, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

request.go staging/src/k8s.io/client-go/rest/request.go +6 -4

No files found.
--- a/staging/src/k8s.io/client-go/rest/request.go
+++ b/staging/src/k8s.io/client-go/rest/request.go
@@ -1035,13 +1035,15 @@ func (r *Request) newUnstructuredResponseError(body []byte, isTextResponse bool,
 	if isTextResponse {
 		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(
 		statusCode,
 		method,
-		schema.GroupResource{
-			Group:    r.content.GroupVersion.Group,
-			Resource: r.resource,
-		},
+		groupResource,
 		r.resourceName,
 		message,
 		retryAfter,