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

Merge pull request #39876 from deads2k/generic-20-deps-03

Browse Source 
Automatic merge from submit-queue

move more things to apiserver

```
pkg/genericapiserver/api/handlers/negotiation/ -> apiserver/pkg/handlers/negotiation
pkg/genericapiserver/api/metrics -> apiserver/pkg/metrics
pkg/genericapiserver/api/request -> apiserver/pkg/request
pkg/util/wsstream -> apiserver/pkg/util/wsstream
plugin/pkg/auth/authenticator/request/headerrequest -> apiserver/pkg/authentication/request/headerrequest
plugin/pkg/webhook -> apiserver/pkg/webhook
```

and mechanicals.

`k8s.io/kubernetes/pkg/genericapiserver/routes/data/swagger` needs to be sorted out.
This commit is contained in:
Kubernetes Submit Queue
2017-01-16 04:14:37 -08:00
committed by GitHub
parent 32e163c928 31b6ba4e94
commit eb9f953496
306 changed files with 472 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/auth/handlers/BUILD
View File

@@ -13,10 +13,10 @@ go_library(
srcs = ["handlers.go"],
tags = ["automanaged"],
deps = [
"//pkg/genericapiserver/api/request:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:github.com/prometheus/client_golang/prometheus",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/request",
],
)
@@ -26,9 +26,9 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/genericapiserver/api/request:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/request",
],
)

2
pkg/auth/handlers/handlers.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
"k8s.io/apiserver/pkg/authentication/authenticator"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
genericapirequest "k8s.io/apiserver/pkg/request"
)
var (

2
pkg/auth/handlers/handlers_test.go
View File

@@ -24,7 +24,7 @@ import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
genericapirequest "k8s.io/apiserver/pkg/request"
)
func TestAuthenticateRequest(t *testing.T) {