github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-23 02:26:52 +00:00
Code Issues Projects Releases Wiki Activity

genericapiserver: cut off pkg/api from responsewriters

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-01-24 15:28:05 +01:00
parent 8541304582
commit fb60807040
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/genericapiserver/endpoints/handlers/proxy.go
View File

@ -34,11 +34,10 @@ import (
"k8s.io/apiserver/pkg/endpoints/metrics" "k8s.io/apiserver/pkg/endpoints/metrics"
"k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/server/httplog" "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/endpoints/handlers/responsewriters"
"k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
"k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream"
proxyutil "k8s.io/kubernetes/pkg/util/proxy"
"github.com/golang/glog" "github.com/golang/glog"
) )
@ -119,7 +118,7 @@ func (r *ProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
redirector, ok := storage.(rest.Redirector) redirector, ok := storage.(rest.Redirector)
if !ok { if !ok {
httplog.LogOf(req, w).Addf("'%v' is not a redirector", resource) 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 return
} }

5
pkg/genericapiserver/endpoints/handlers/responsewriters/status_test.go
View File

@ -25,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/api"
) )
func TestAPIStatus(t *testing.T) { func TestAPIStatus(t *testing.T) {
@ -41,7 +40,7 @@ func TestAPIStatus(t *testing.T) {
Name: "bar", Name: "bar",
}, },
}, },
errors.NewAlreadyExists(api.Resource("foos"), "bar"): { errors.NewAlreadyExists(schema.GroupResource{Resource: "foos"}, "bar"): {
Status: metav1.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusConflict, Code: http.StatusConflict,
Reason: "AlreadyExists", Reason: "AlreadyExists",
@ -52,7 +51,7 @@ func TestAPIStatus(t *testing.T) {
Name: "bar", Name: "bar",
}, },
}, },
errors.NewConflict(api.Resource("foos"), "bar", stderrs.New("failure")): { errors.NewConflict(schema.GroupResource{Resource: "foos"}, "bar", stderrs.New("failure")): {
Status: metav1.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusConflict, Code: http.StatusConflict,
Reason: "Conflict", Reason: "Conflict",