From fb608070408f4d38c0239c9d4bbe2585c7852060 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Tue, 24 Jan 2017 15:28:05 +0100
Subject: [PATCH] genericapiserver: cut off pkg/api from responsewriters

---
 pkg/genericapiserver/endpoints/handlers/proxy.go             | 5 ++---
 .../endpoints/handlers/responsewriters/status_test.go        | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkg/genericapiserver/endpoints/handlers/proxy.go b/pkg/genericapiserver/endpoints/handlers/proxy.go
index 50a6a249696..b2eb1609c97 100644
--- a/pkg/genericapiserver/endpoints/handlers/proxy.go
+++ b/pkg/genericapiserver/endpoints/handlers/proxy.go
@@ -34,11 +34,10 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/metrics"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/server/httplog"
-	"k8s.io/kubernetes/pkg/api"
+	proxyutil "k8s.io/apiserver/pkg/util/proxy"
 	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
 	"k8s.io/kubernetes/pkg/util/httpstream"
-	proxyutil "k8s.io/kubernetes/pkg/util/proxy"
 
 	"github.com/golang/glog"
 )
@@ -119,7 +118,7 @@ func (r *ProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	redirector, ok := storage.(rest.Redirector)
 	if !ok {
 		httplog.LogOf(req, w).Addf("'%v' is not a redirector", resource)
-		httpCode = responsewriters.ErrorNegotiated(apierrors.NewMethodNotSupported(api.Resource(resource), "proxy"), r.Serializer, gv, w, req)
+		httpCode = responsewriters.ErrorNegotiated(apierrors.NewMethodNotSupported(schema.GroupResource{Resource: resource}, "proxy"), r.Serializer, gv, w, req)
 		return
 	}
 
diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/status_test.go b/pkg/genericapiserver/endpoints/handlers/responsewriters/status_test.go
index cc16dcb3054..2422e76c143 100644
--- a/pkg/genericapiserver/endpoints/handlers/responsewriters/status_test.go
+++ b/pkg/genericapiserver/endpoints/handlers/responsewriters/status_test.go
@@ -25,7 +25,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/api"
 )
 
 func TestAPIStatus(t *testing.T) {
@@ -41,7 +40,7 @@ func TestAPIStatus(t *testing.T) {
 				Name:  "bar",
 			},
 		},
-		errors.NewAlreadyExists(api.Resource("foos"), "bar"): {
+		errors.NewAlreadyExists(schema.GroupResource{Resource: "foos"}, "bar"): {
 			Status:  metav1.StatusFailure,
 			Code:    http.StatusConflict,
 			Reason:  "AlreadyExists",
@@ -52,7 +51,7 @@ func TestAPIStatus(t *testing.T) {
 				Name:  "bar",
 			},
 		},
-		errors.NewConflict(api.Resource("foos"), "bar", stderrs.New("failure")): {
+		errors.NewConflict(schema.GroupResource{Resource: "foos"}, "bar", stderrs.New("failure")): {
 			Status:  metav1.StatusFailure,
 			Code:    http.StatusConflict,
 			Reason:  "Conflict",