From 69510237598df78c456ebb36a312f86c8a2d2e37 Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <jliggitt@redhat.com>
Date: Tue, 28 Feb 2017 15:46:15 -0500
Subject: [PATCH] Only set a groupresource on errors if a resource was
 specified

---
 staging/src/k8s.io/client-go/rest/request.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/staging/src/k8s.io/client-go/rest/request.go b/staging/src/k8s.io/client-go/rest/request.go
index 7641af32d9..b87ddaff51 100644
--- 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,