diff --git a/cmd/cloud-controller-manager/BUILD b/cmd/cloud-controller-manager/BUILD index c5c360ccef..39a1cbef0c 100644 --- a/cmd/cloud-controller-manager/BUILD +++ b/cmd/cloud-controller-manager/BUILD @@ -30,7 +30,7 @@ go_library( "//pkg/version/verflag:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/spf13/pflag", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) diff --git a/cmd/cloud-controller-manager/app/BUILD b/cmd/cloud-controller-manager/app/BUILD index 5f39e010c8..a85501cf25 100644 --- a/cmd/cloud-controller-manager/app/BUILD +++ b/cmd/cloud-controller-manager/app/BUILD @@ -34,7 +34,7 @@ go_library( "//vendor:github.com/spf13/pflag", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index 61f903c0a3..fcde120a22 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/cmd/cloud-controller-manager/controller-manager.go b/cmd/cloud-controller-manager/controller-manager.go index 8840aaaa2a..7cd7a4c74b 100644 --- a/cmd/cloud-controller-manager/controller-manager.go +++ b/cmd/cloud-controller-manager/controller-manager.go @@ -23,7 +23,7 @@ import ( "fmt" "os" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/cmd/cloud-controller-manager/app" "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration diff --git a/cmd/hyperkube/BUILD b/cmd/hyperkube/BUILD index ccafec89d1..abc675b8bc 100644 --- a/cmd/hyperkube/BUILD +++ b/cmd/hyperkube/BUILD @@ -66,7 +66,7 @@ go_library( "//plugin/cmd/kube-scheduler/app:go_default_library", "//plugin/cmd/kube-scheduler/app/options:go_default_library", "//vendor:github.com/spf13/pflag", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go index 1110852c3d..728287031d 100644 --- a/cmd/hyperkube/kube-proxy.go +++ b/cmd/hyperkube/kube-proxy.go @@ -17,7 +17,7 @@ limitations under the License. package main import ( - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/cmd/kube-proxy/app/options" ) diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD index c1489bf8e7..60cf011a64 100644 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -28,7 +28,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -57,13 +57,13 @@ go_library( "//pkg/client/listers/core/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/controller:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/filters:go_default_library", - "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/genericapiserver/filters:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/rest:go_default_library", + "//pkg/genericapiserver/endpoints/filters:go_default_library", + "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", + "//pkg/genericapiserver/server/filters:go_default_library", "//pkg/util/httpstream/spdy:go_default_library", "//pkg/util/workqueue:go_default_library", "//pkg/version:go_default_library", @@ -74,7 +74,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/client-go/transport", ], ) diff --git a/cmd/kube-aggregator/pkg/apiserver/apiserver.go b/cmd/kube-aggregator/pkg/apiserver/apiserver.go index 4138508c99..c779e83bd2 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiserver.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiserver.go @@ -22,15 +22,15 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" kubeinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated" v1listers "k8s.io/kubernetes/pkg/client/listers/core/v1" - "k8s.io/kubernetes/pkg/genericapiserver" - genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - genericfilters "k8s.io/kubernetes/pkg/genericapiserver/filters" - "k8s.io/kubernetes/pkg/registry/generic" + genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" + genericfilters "k8s.io/kubernetes/pkg/genericapiserver/server/filters" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go index 7748df73d6..8671e21c6f 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" v1listers "k8s.io/kubernetes/pkg/client/listers/core/v1" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" apiregistrationv1alpha1api "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go index b9b0001b00..f11a2f63af 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go @@ -22,11 +22,11 @@ import ( "sync" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/client-go/transport" "k8s.io/kubernetes/pkg/client/restclient" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - genericrest "k8s.io/kubernetes/pkg/registry/generic/rest" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" "k8s.io/kubernetes/pkg/util/httpstream/spdy" apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go b/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go index b41f6b93c0..512f4bb372 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/authentication/user" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" ) diff --git a/cmd/kube-aggregator/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD index eab2da5d70..46738be82b 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/BUILD +++ b/cmd/kube-aggregator/pkg/cmd/server/BUILD @@ -18,12 +18,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/restclient:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/filters:go_default_library", - "//pkg/genericapiserver/options:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/server:go_default_library", + "//pkg/genericapiserver/server/filters:go_default_library", + "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/pborman/uuid", "//vendor:github.com/spf13/cobra", diff --git a/cmd/kube-aggregator/pkg/cmd/server/start.go b/cmd/kube-aggregator/pkg/cmd/server/start.go index e8bfe22972..52699dacf2 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/start.go +++ b/cmd/kube-aggregator/pkg/cmd/server/start.go @@ -32,12 +32,12 @@ import ( "k8s.io/kubernetes/pkg/api" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/restclient" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/filters" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" + "k8s.io/kubernetes/pkg/genericapiserver/server/filters" + genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/registry/generic" - "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/storage/storagebackend" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD index 990a9d3394..0299d6b4dc 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD +++ b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD @@ -16,12 +16,12 @@ go_library( "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library", "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD index c6ebc9641a..dc88684280 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD +++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/registry/apiservice:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go index 0002ce3b16..f50a19cd7b 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go +++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go @@ -20,8 +20,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" ) // rest implements a RESTStorage for API services against etcd diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go index 0e9a7317cb..3701ebd018 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go +++ b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" kapi "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index fefe2cf157..272d87b6d9 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -27,8 +27,8 @@ go_library( "//pkg/controller/informers:go_default_library", "//pkg/controller/serviceaccount:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/filters:go_default_library", + "//pkg/genericapiserver/server:go_default_library", + "//pkg/genericapiserver/server/filters:go_default_library", "//pkg/kubeapiserver:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//pkg/kubeapiserver/authenticator:go_default_library", diff --git a/cmd/kube-apiserver/app/options/BUILD b/cmd/kube-apiserver/app/options/BUILD index 8818816eb7..2437577c58 100644 --- a/cmd/kube-apiserver/app/options/BUILD +++ b/cmd/kube-apiserver/app/options/BUILD @@ -18,7 +18,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/options:go_default_library", + "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master/ports:go_default_library", diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index be1c35ad55..50e3420545 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -24,7 +24,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options" + genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/ports" diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 0c04b17712..8ca3623620 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -52,8 +52,8 @@ import ( "k8s.io/kubernetes/pkg/controller/informers" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/filters" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" + "k8s.io/kubernetes/pkg/genericapiserver/server/filters" "k8s.io/kubernetes/pkg/kubeapiserver" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" kubeauthenticator "k8s.io/kubernetes/pkg/kubeapiserver/authenticator" diff --git a/cmd/kube-controller-manager/BUILD b/cmd/kube-controller-manager/BUILD index fa5a3dc03d..5dc7b5e7a9 100644 --- a/cmd/kube-controller-manager/BUILD +++ b/cmd/kube-controller-manager/BUILD @@ -28,7 +28,7 @@ go_library( "//pkg/version/prometheus:go_default_library", "//pkg/version/verflag:go_default_library", "//vendor:github.com/spf13/pflag", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index 54c1597bd4..c1827500f2 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -100,7 +100,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 08e093c400..826a8df435 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/cmd/kube-controller-manager/controller-manager.go b/cmd/kube-controller-manager/controller-manager.go index 3f5c83b4ff..feff1f7094 100644 --- a/cmd/kube-controller-manager/controller-manager.go +++ b/cmd/kube-controller-manager/controller-manager.go @@ -24,7 +24,7 @@ import ( "fmt" "os" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/cmd/kube-controller-manager/app" "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration diff --git a/cmd/kube-proxy/BUILD b/cmd/kube-proxy/BUILD index 6d756659ee..21b74db09a 100644 --- a/cmd/kube-proxy/BUILD +++ b/cmd/kube-proxy/BUILD @@ -27,7 +27,7 @@ go_library( "//pkg/version/prometheus:go_default_library", "//pkg/version/verflag:go_default_library", "//vendor:github.com/spf13/pflag", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index 54732eec49..a4702f1ff3 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/cmd/kube-proxy/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index 38c9650670..c67f9e7c53 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -115,7 +115,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", "//vendor:k8s.io/client-go/kubernetes", "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 843bf2b43c..ec6953a44f 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -36,7 +36,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" clientgoclientset "k8s.io/client-go/kubernetes" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/examples/apiserver/BUILD b/examples/apiserver/BUILD index 2761d97265..38ae7c0e9a 100644 --- a/examples/apiserver/BUILD +++ b/examples/apiserver/BUILD @@ -16,12 +16,12 @@ go_library( "//cmd/libs/go2idl/client-gen/test_apis/testgroup/v1:go_default_library", "//examples/apiserver/rest:go_default_library", "//pkg/api:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/genericapiserver/authorizer:go_default_library", - "//pkg/genericapiserver/options:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", + "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubeapiserver/options:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go index c0de9d7b7a..bf443c9811 100644 --- a/examples/apiserver/apiserver.go +++ b/examples/apiserver/apiserver.go @@ -24,12 +24,12 @@ import ( "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1" testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/genericapiserver/authorizer" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" + genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage/storagebackend" // Install the testgroup API diff --git a/examples/apiserver/rest/BUILD b/examples/apiserver/rest/BUILD index ec7e10d1d6..ee2ff33e27 100644 --- a/examples/apiserver/rest/BUILD +++ b/examples/apiserver/rest/BUILD @@ -15,13 +15,13 @@ go_library( "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/examples/apiserver/rest/reststorage.go b/examples/apiserver/rest/reststorage.go index 6b597b596e..7ed4a1e7a0 100644 --- a/examples/apiserver/rest/reststorage.go +++ b/examples/apiserver/rest/reststorage.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/storage" ) diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index acd44953a4..174064cb99 100644 --- a/federation/cmd/federation-apiserver/app/BUILD +++ b/federation/cmd/federation-apiserver/app/BUILD @@ -36,9 +36,11 @@ go_library( "//pkg/cloudprovider/providers:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/genericapiserver/filters:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", + "//pkg/genericapiserver/server/filters:go_default_library", "//pkg/kubeapiserver:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//pkg/registry/batch/job/storage:go_default_library", @@ -52,8 +54,6 @@ go_library( "//pkg/registry/extensions/deployment/storage:go_default_library", "//pkg/registry/extensions/ingress/storage:go_default_library", "//pkg/registry/extensions/replicaset/storage:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//pkg/routes:go_default_library", "//pkg/version:go_default_library", "//plugin/pkg/admission/admit:go_default_library", diff --git a/federation/cmd/federation-apiserver/app/batch.go b/federation/cmd/federation-apiserver/app/batch.go index f86134ff49..d085b3299d 100644 --- a/federation/cmd/federation-apiserver/app/batch.go +++ b/federation/cmd/federation-apiserver/app/batch.go @@ -21,10 +21,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" _ "k8s.io/kubernetes/pkg/apis/batch/install" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" jobstorage "k8s.io/kubernetes/pkg/registry/batch/job/storage" - "k8s.io/kubernetes/pkg/registry/generic" ) func installBatchAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) { diff --git a/federation/cmd/federation-apiserver/app/core.go b/federation/cmd/federation-apiserver/app/core.go index 225d2c8faa..27ba016b60 100644 --- a/federation/cmd/federation-apiserver/app/core.go +++ b/federation/cmd/federation-apiserver/app/core.go @@ -31,14 +31,14 @@ import ( "k8s.io/kubernetes/federation/apis/core/v1" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage" eventstore "k8s.io/kubernetes/pkg/registry/core/event/storage" namespacestore "k8s.io/kubernetes/pkg/registry/core/namespace/storage" secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage" servicestore "k8s.io/kubernetes/pkg/registry/core/service/storage" - "k8s.io/kubernetes/pkg/registry/generic" ) func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) { diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index d36c93564d..21705fd824 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -21,13 +21,13 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" _ "k8s.io/kubernetes/pkg/apis/extensions/install" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" daemonsetstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage" deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage" ingressstore "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage" replicasetstore "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage" - "k8s.io/kubernetes/pkg/registry/generic" ) func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) { diff --git a/federation/cmd/federation-apiserver/app/federation.go b/federation/cmd/federation-apiserver/app/federation.go index 41fa96ae11..1ba1932b88 100644 --- a/federation/cmd/federation-apiserver/app/federation.go +++ b/federation/cmd/federation-apiserver/app/federation.go @@ -21,9 +21,9 @@ import ( "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" _ "k8s.io/kubernetes/federation/apis/federation/install" clusteretcd "k8s.io/kubernetes/federation/registry/cluster/etcd" diff --git a/federation/cmd/federation-apiserver/app/options/BUILD b/federation/cmd/federation-apiserver/app/options/BUILD index 2b71425681..f5e88f117f 100644 --- a/federation/cmd/federation-apiserver/app/options/BUILD +++ b/federation/cmd/federation-apiserver/app/options/BUILD @@ -15,7 +15,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/options:go_default_library", + "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//vendor:github.com/spf13/pflag", ], diff --git a/federation/cmd/federation-apiserver/app/options/options.go b/federation/cmd/federation-apiserver/app/options/options.go index 413965d0ec..0908e0c544 100644 --- a/federation/cmd/federation-apiserver/app/options/options.go +++ b/federation/cmd/federation-apiserver/app/options/options.go @@ -20,7 +20,7 @@ package options import ( "time" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options" + genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" "github.com/spf13/pflag" diff --git a/federation/cmd/federation-apiserver/app/server.go b/federation/cmd/federation-apiserver/app/server.go index 3ae3406066..675bb148c6 100644 --- a/federation/cmd/federation-apiserver/app/server.go +++ b/federation/cmd/federation-apiserver/app/server.go @@ -39,13 +39,13 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/generated/openapi" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/filters" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" + "k8s.io/kubernetes/pkg/genericapiserver/server/filters" "k8s.io/kubernetes/pkg/kubeapiserver" kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" "k8s.io/kubernetes/pkg/registry/cachesize" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/routes" "k8s.io/kubernetes/pkg/version" ) diff --git a/federation/cmd/federation-controller-manager/BUILD b/federation/cmd/federation-controller-manager/BUILD index 1d219d5115..b49af5dc29 100644 --- a/federation/cmd/federation-controller-manager/BUILD +++ b/federation/cmd/federation-controller-manager/BUILD @@ -26,7 +26,7 @@ go_library( "//pkg/util/workqueue/prometheus:go_default_library", "//pkg/version/verflag:go_default_library", "//vendor:github.com/spf13/pflag", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) diff --git a/federation/cmd/federation-controller-manager/app/BUILD b/federation/cmd/federation-controller-manager/app/BUILD index 71dfaaeee6..53f1f8896e 100644 --- a/federation/cmd/federation-controller-manager/app/BUILD +++ b/federation/cmd/federation-controller-manager/app/BUILD @@ -45,7 +45,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) diff --git a/federation/cmd/federation-controller-manager/app/controllermanager.go b/federation/cmd/federation-controller-manager/app/controllermanager.go index 41a4806aa8..cc667842dc 100644 --- a/federation/cmd/federation-controller-manager/app/controllermanager.go +++ b/federation/cmd/federation-controller-manager/app/controllermanager.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options" "k8s.io/kubernetes/federation/pkg/dnsprovider" diff --git a/federation/cmd/federation-controller-manager/controller-manager.go b/federation/cmd/federation-controller-manager/controller-manager.go index 839d434034..05f0de7cbb 100644 --- a/federation/cmd/federation-controller-manager/controller-manager.go +++ b/federation/cmd/federation-controller-manager/controller-manager.go @@ -21,7 +21,7 @@ import ( "os" "github.com/spf13/pflag" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options" "k8s.io/kubernetes/pkg/util/flag" diff --git a/federation/registry/cluster/BUILD b/federation/registry/cluster/BUILD index 3be487b194..bf8fb89d1d 100644 --- a/federation/registry/cluster/BUILD +++ b/federation/registry/cluster/BUILD @@ -20,15 +20,15 @@ go_library( "//federation/apis/federation/validation:go_default_library", "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -45,7 +45,7 @@ go_test( "//pkg/fields:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/federation/registry/cluster/etcd/BUILD b/federation/registry/cluster/etcd/BUILD index a2069f5391..00b72d9695 100644 --- a/federation/registry/cluster/etcd/BUILD +++ b/federation/registry/cluster/etcd/BUILD @@ -15,11 +15,11 @@ go_library( deps = [ "//federation/apis/federation:go_default_library", "//federation/registry/cluster:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -32,7 +32,7 @@ go_test( "//federation/apis/federation:go_default_library", "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/federation/registry/cluster/etcd/etcd.go b/federation/registry/cluster/etcd/etcd.go index f2e66b5b2b..68013b3afc 100644 --- a/federation/registry/cluster/etcd/etcd.go +++ b/federation/registry/cluster/etcd/etcd.go @@ -18,12 +18,12 @@ package etcd import ( "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/registry/cluster" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) type REST struct { diff --git a/federation/registry/cluster/etcd/etcd_test.go b/federation/registry/cluster/etcd/etcd_test.go index 1b862de0d4..f2b0d535da 100644 --- a/federation/registry/cluster/etcd/etcd_test.go +++ b/federation/registry/cluster/etcd/etcd_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/federation/registry/cluster/registry.go b/federation/registry/cluster/registry.go index bad6e6d5d9..76cfb3fe7b 100644 --- a/federation/registry/cluster/registry.go +++ b/federation/registry/cluster/registry.go @@ -19,10 +19,10 @@ package cluster import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store Cluster objects. diff --git a/federation/registry/cluster/strategy.go b/federation/registry/cluster/strategy.go index a9c9a15659..28344ac9cb 100644 --- a/federation/registry/cluster/strategy.go +++ b/federation/registry/cluster/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/apis/federation/validation" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/federation/registry/cluster/strategy_test.go b/federation/registry/cluster/strategy_test.go index 07afe8b991..c823863f2d 100644 --- a/federation/registry/cluster/strategy_test.go +++ b/federation/registry/cluster/strategy_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" diff --git a/hack/.linted_packages b/hack/.linted_packages index d53d9615dc..9f31d4ae19 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -180,13 +180,13 @@ pkg/controller/volume/statusupdater pkg/conversion pkg/conversion/queryparams pkg/credentialprovider/aws -pkg/genericapiserver/api/audit -pkg/genericapiserver/api/handlers/responsewriters -pkg/genericapiserver/api/openapi -pkg/genericapiserver/api/request -pkg/genericapiserver/filters -pkg/genericapiserver/mux -pkg/genericapiserver/routes +pkg/genericapiserver/endpoints/audit +pkg/genericapiserver/endpoints/handlers/responsewriters +pkg/genericapiserver/endpoints/openapi +pkg/genericapiserver/endpoints/request +pkg/genericapiserver/server/filters +pkg/genericapiserver/server/mux +pkg/genericapiserver/server/routes pkg/hyperkube pkg/kubelet/api pkg/kubelet/container diff --git a/hack/build-ui.sh b/hack/build-ui.sh index 85afb1eabb..c084f554b1 100755 --- a/hack/build-ui.sh +++ b/hack/build-ui.sh @@ -37,7 +37,7 @@ readonly SWAGGER_PKG="swagger" function kube::hack::build_ui() { local pkg="$1" local src="$2" - local output_file="pkg/genericapiserver/routes/data/${pkg}/datafile.go" + local output_file="pkg/genericapiserver/server/routes/data/${pkg}/datafile.go" go-bindata -nocompress -o "${output_file}" -prefix ${PWD} -pkg "${pkg}" "${src}" diff --git a/pkg/BUILD b/pkg/BUILD index a3e7a47015..6b3ce0c7c6 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -26,6 +26,7 @@ filegroup( "//pkg/apis/componentconfig:all-srcs", "//pkg/apis/extensions:all-srcs", "//pkg/apis/imagepolicy:all-srcs", + "//pkg/apis/meta/v1:all-srcs", "//pkg/apis/policy:all-srcs", "//pkg/apis/rbac:all-srcs", "//pkg/apis/storage:all-srcs", diff --git a/pkg/apis/meta/v1/BUILD b/pkg/apis/meta/v1/BUILD new file mode 100644 index 0000000000..6a99c1b382 --- /dev/null +++ b/pkg/apis/meta/v1/BUILD @@ -0,0 +1,32 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = ["time.go"], + tags = ["automanaged"], + deps = [ + "//pkg/genericapiserver/server/openapi/common:go_default_library", + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/google/gofuzz", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/pkg/apis/meta/v1/time.go b/pkg/apis/meta/v1/time.go new file mode 100644 index 0000000000..4c0ea1041a --- /dev/null +++ b/pkg/apis/meta/v1/time.go @@ -0,0 +1,180 @@ +/* +Copyright 2014 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +import ( + "encoding/json" + "time" + + "k8s.io/kubernetes/pkg/genericapiserver/server/openapi/common" + + "github.com/go-openapi/spec" + "github.com/google/gofuzz" +) + +// Time is a wrapper around time.Time which supports correct +// marshaling to YAML and JSON. Wrappers are provided for many +// of the factory methods that the time package offers. +// +// +protobuf.options.marshal=false +// +protobuf.as=Timestamp +// +protobuf.options.(gogoproto.goproto_stringer)=false +type Time struct { + time.Time `protobuf:"-"` +} + +// DeepCopy returns a deep-copy of the Time value. The underlying time.Time +// type is effectively immutable in the time API, so it is safe to +// copy-by-assign, despite the presence of (unexported) Pointer fields. +func (t Time) DeepCopy() Time { + return t +} + +// String returns the representation of the time. +func (t Time) String() string { + return t.Time.String() +} + +// NewTime returns a wrapped instance of the provided time +func NewTime(time time.Time) Time { + return Time{time} +} + +// Date returns the Time corresponding to the supplied parameters +// by wrapping time.Date. +func Date(year int, month time.Month, day, hour, min, sec, nsec int, loc *time.Location) Time { + return Time{time.Date(year, month, day, hour, min, sec, nsec, loc)} +} + +// Now returns the current local time. +func Now() Time { + return Time{time.Now()} +} + +// IsZero returns true if the value is nil or time is zero. +func (t *Time) IsZero() bool { + if t == nil { + return true + } + return t.Time.IsZero() +} + +// Before reports whether the time instant t is before u. +func (t Time) Before(u Time) bool { + return t.Time.Before(u.Time) +} + +// Equal reports whether the time instant t is equal to u. +func (t Time) Equal(u Time) bool { + return t.Time.Equal(u.Time) +} + +// Unix returns the local time corresponding to the given Unix time +// by wrapping time.Unix. +func Unix(sec int64, nsec int64) Time { + return Time{time.Unix(sec, nsec)} +} + +// Rfc3339Copy returns a copy of the Time at second-level precision. +func (t Time) Rfc3339Copy() Time { + copied, _ := time.Parse(time.RFC3339, t.Format(time.RFC3339)) + return Time{copied} +} + +// UnmarshalJSON implements the json.Unmarshaller interface. +func (t *Time) UnmarshalJSON(b []byte) error { + if len(b) == 4 && string(b) == "null" { + t.Time = time.Time{} + return nil + } + + var str string + json.Unmarshal(b, &str) + + pt, err := time.Parse(time.RFC3339, str) + if err != nil { + return err + } + + t.Time = pt.Local() + return nil +} + +// UnmarshalQueryParameter converts from a URL query parameter value to an object +func (t *Time) UnmarshalQueryParameter(str string) error { + if len(str) == 0 { + t.Time = time.Time{} + return nil + } + // Tolerate requests from older clients that used JSON serialization to build query params + if len(str) == 4 && str == "null" { + t.Time = time.Time{} + return nil + } + + pt, err := time.Parse(time.RFC3339, str) + if err != nil { + return err + } + + t.Time = pt.Local() + return nil +} + +// MarshalJSON implements the json.Marshaler interface. +func (t Time) MarshalJSON() ([]byte, error) { + if t.IsZero() { + // Encode unset/nil objects as JSON's "null". + return []byte("null"), nil + } + + return json.Marshal(t.UTC().Format(time.RFC3339)) +} + +func (_ Time) OpenAPIDefinition() common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "date-time", + }, + }, + } +} + +// MarshalQueryParameter converts to a URL query parameter value +func (t Time) MarshalQueryParameter() (string, error) { + if t.IsZero() { + // Encode unset/nil objects as an empty string + return "", nil + } + + return t.UTC().Format(time.RFC3339), nil +} + +// Fuzz satisfies fuzz.Interface. +func (t *Time) Fuzz(c fuzz.Continue) { + if t == nil { + return + } + // Allow for about 1000 years of randomness. Leave off nanoseconds + // because JSON doesn't represent them so they can't round-trip + // properly. + t.Time = time.Unix(c.Rand.Int63n(1000*365*24*60*60), 0) +} + +var _ fuzz.Interface = &Time{} diff --git a/pkg/controller/serviceaccount/BUILD b/pkg/controller/serviceaccount/BUILD index 5e07e54d65..7a80b477f0 100644 --- a/pkg/controller/serviceaccount/BUILD +++ b/pkg/controller/serviceaccount/BUILD @@ -25,11 +25,11 @@ go_library( "//pkg/client/retry:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/core/secret:go_default_library", "//pkg/registry/core/secret/storage:go_default_library", "//pkg/registry/core/serviceaccount:go_default_library", "//pkg/registry/core/serviceaccount/storage:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/serviceaccount:go_default_library", "//pkg/storage/storagebackend:go_default_library", "//pkg/util/metrics:go_default_library", @@ -45,7 +45,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index d7dc513dd4..4b694e7103 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -18,14 +18,14 @@ package serviceaccount import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/core/secret" secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage" serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount" serviceaccountstore "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/serviceaccount" "k8s.io/kubernetes/pkg/storage/storagebackend" ) diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index 1efc0430c3..842a0828f4 100644 --- a/pkg/genericapiserver/BUILD +++ b/pkg/genericapiserver/BUILD @@ -5,109 +5,12 @@ licenses(["notice"]) load( "@io_bazel_rules_go//go:def.bzl", "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = [ - "genericapiserver_test.go", - "resource_config_test.go", - "serve_test.go", - "server_run_options_test.go", - "storage_factory_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/testapi:go_default_library", - "//pkg/api/v1:go_default_library", - "//pkg/apis/autoscaling:go_default_library", - "//pkg/apis/extensions:go_default_library", - "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/genericapiserver/options:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/storagebackend:go_default_library", - "//pkg/util/cert:go_default_library", - "//pkg/util/config:go_default_library", - "//vendor:github.com/go-openapi/spec", - "//vendor:github.com/stretchr/testify/assert", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apimachinery", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apimachinery/pkg/version", - "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/request", - ], ) go_library( name = "go_default_library", - srcs = [ - "config.go", - "config_selfclient.go", - "discovery.go", - "doc.go", - "genericapiserver.go", - "healthz.go", - "hooks.go", - "resource_config.go", - "resource_encoding_config.go", - "serve.go", - "storage_factory.go", - ], + srcs = ["doc.go"], tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/client/restclient:go_default_library", - "//pkg/genericapiserver/api:go_default_library", - "//pkg/genericapiserver/api/filters:go_default_library", - "//pkg/genericapiserver/api/openapi:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/genericapiserver/authenticator:go_default_library", - "//pkg/genericapiserver/authorizer:go_default_library", - "//pkg/genericapiserver/filters:go_default_library", - "//pkg/genericapiserver/mux:go_default_library", - "//pkg/genericapiserver/options:go_default_library", - "//pkg/genericapiserver/routes:go_default_library", - "//pkg/storage/storagebackend:go_default_library", - "//pkg/util/cert:go_default_library", - "//vendor:github.com/coreos/go-systemd/daemon", - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/emicklei/go-restful/swagger", - "//vendor:github.com/go-openapi/spec", - "//vendor:github.com/golang/glog", - "//vendor:github.com/pborman/uuid", - "//vendor:github.com/pkg/errors", - "//vendor:gopkg.in/natefinch/lumberjack.v2", - "//vendor:k8s.io/apimachinery/pkg/apimachinery", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/openapi", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apimachinery/pkg/util/validation", - "//vendor:k8s.io/apimachinery/pkg/version", - "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", - "//vendor:k8s.io/apiserver/pkg/authentication/request/union", - "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/authorization/union", - "//vendor:k8s.io/apiserver/pkg/healthz", - "//vendor:k8s.io/apiserver/pkg/request", - ], ) filegroup( @@ -121,14 +24,11 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/genericapiserver/api:all-srcs", "//pkg/genericapiserver/authenticator:all-srcs", "//pkg/genericapiserver/authorizer:all-srcs", - "//pkg/genericapiserver/filters:all-srcs", - "//pkg/genericapiserver/mux:all-srcs", - "//pkg/genericapiserver/openapi:all-srcs", - "//pkg/genericapiserver/options:all-srcs", - "//pkg/genericapiserver/routes:all-srcs", + "//pkg/genericapiserver/endpoints:all-srcs", + "//pkg/genericapiserver/registry:all-srcs", + "//pkg/genericapiserver/server:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/genericapiserver/doc.go b/pkg/genericapiserver/doc.go index 9aee5ea3ed..c8b72f4e7d 100644 --- a/pkg/genericapiserver/doc.go +++ b/pkg/genericapiserver/doc.go @@ -15,7 +15,7 @@ limitations under the License. */ // Package genericapiserver contains code to setup a generic kubernetes-like API server. -// This does not contain any kubernetes API specific code. +// This does not contain any Kubernetes specific API types. // Note that this is a work in progress. We are pulling out generic code (specifically from // pkg/master) here. // We plan to move this package into a separate repo on github once it is done. diff --git a/pkg/genericapiserver/endpoints/BUILD b/pkg/genericapiserver/endpoints/BUILD index 1af16153ce..5ba2d9d510 100644 --- a/pkg/genericapiserver/endpoints/BUILD +++ b/pkg/genericapiserver/endpoints/BUILD @@ -8,37 +8,6 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = [ - "apiserver.go", - "discovery.go", - "doc.go", - "groupversion.go", - "installer.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/handlers:go_default_library", - "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//vendor:github.com/emicklei/go-restful", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apimachinery/pkg/util/errors", - "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/apiserver/pkg/handlers/negotiation", - "//vendor:k8s.io/apiserver/pkg/metrics", - "//vendor:k8s.io/apiserver/pkg/request", - ], -) - go_test( name = "go_default_test", srcs = [ @@ -54,11 +23,11 @@ go_test( "//pkg/api/testing:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/filters:go_default_library", - "//pkg/genericapiserver/api/handlers:go_default_library", - "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/genericapiserver/api/testing:go_default_library", + "//pkg/genericapiserver/endpoints/filters:go_default_library", + "//pkg/genericapiserver/endpoints/handlers:go_default_library", + "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", + "//pkg/genericapiserver/endpoints/testing:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//plugin/pkg/admission/admit:go_default_library", "//plugin/pkg/admission/deny:go_default_library", "//vendor:github.com/emicklei/go-restful", @@ -76,7 +45,38 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + ], +) + +go_library( + name = "go_default_library", + srcs = [ + "apiserver.go", + "discovery.go", + "doc.go", + "groupversion.go", + "installer.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/endpoints/handlers:go_default_library", + "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//vendor:github.com/emicklei/go-restful", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/conversion", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", + "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -91,11 +91,10 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/genericapiserver/api/filters:all-srcs", - "//pkg/genericapiserver/api/handlers:all-srcs", - "//pkg/genericapiserver/api/openapi:all-srcs", - "//pkg/genericapiserver/api/rest:all-srcs", - "//pkg/genericapiserver/api/testing:all-srcs", + "//pkg/genericapiserver/endpoints/filters:all-srcs", + "//pkg/genericapiserver/endpoints/handlers:all-srcs", + "//pkg/genericapiserver/endpoints/openapi:all-srcs", + "//pkg/genericapiserver/endpoints/testing:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/genericapiserver/endpoints/apiserver.go b/pkg/genericapiserver/endpoints/apiserver.go index 1970f2c0aa..933363bffe 100644 --- a/pkg/genericapiserver/endpoints/apiserver.go +++ b/pkg/genericapiserver/endpoints/apiserver.go @@ -17,7 +17,7 @@ limitations under the License. package endpoints import ( - "k8s.io/apiserver/pkg/metrics" + "k8s.io/apiserver/pkg/endpoints/metrics" ) func init() { diff --git a/pkg/genericapiserver/endpoints/apiserver_test.go b/pkg/genericapiserver/endpoints/apiserver_test.go index eff5c5756d..03c8b1b360 100644 --- a/pkg/genericapiserver/endpoints/apiserver_test.go +++ b/pkg/genericapiserver/endpoints/apiserver_test.go @@ -44,15 +44,15 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/fields" - genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - genericapitesting "k8s.io/kubernetes/pkg/genericapiserver/api/testing" + genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + genericapitesting "k8s.io/kubernetes/pkg/genericapiserver/endpoints/testing" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/admission/deny" @@ -3082,7 +3082,7 @@ func TestWriteJSONDecodeError(t *testing.T) { if status.Reason != metav1.StatusReasonUnknown { t.Errorf("unexpected reason %#v", status) } - if !strings.Contains(status.Message, "no kind is registered for the type api.UnregisteredAPIObject") { + if !strings.Contains(status.Message, "no kind is registered for the type endpoints.UnregisteredAPIObject") { t.Errorf("unexpected message %#v", status) } } diff --git a/pkg/genericapiserver/endpoints/discovery.go b/pkg/genericapiserver/endpoints/discovery.go index d5408a74ca..65c16b868a 100644 --- a/pkg/genericapiserver/endpoints/discovery.go +++ b/pkg/genericapiserver/endpoints/discovery.go @@ -27,9 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apiserver/pkg/handlers/negotiation" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" ) // AddApiWebService adds a service to return the supported api versions at the legacy /api. diff --git a/pkg/genericapiserver/endpoints/doc.go b/pkg/genericapiserver/endpoints/doc.go index 406620e5f9..d7010712bf 100644 --- a/pkg/genericapiserver/endpoints/doc.go +++ b/pkg/genericapiserver/endpoints/doc.go @@ -16,4 +16,3 @@ limitations under the License. // Package endpoints contains the generic code that provides a RESTful Kubernetes-style API service. package endpoints // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints" - diff --git a/pkg/genericapiserver/endpoints/filters/BUILD b/pkg/genericapiserver/endpoints/filters/BUILD index fb822b14ad..acb0546f65 100644 --- a/pkg/genericapiserver/endpoints/filters/BUILD +++ b/pkg/genericapiserver/endpoints/filters/BUILD @@ -22,12 +22,12 @@ go_test( deps = [ "//pkg/apis/authentication:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", + "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -45,7 +45,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/authentication:go_default_library", - "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", + "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/pborman/uuid", "//vendor:github.com/prometheus/client_golang/prometheus", @@ -54,8 +54,8 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authentication/serviceaccount", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/httplog", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/server/httplog", ], ) diff --git a/pkg/genericapiserver/endpoints/filters/audit.go b/pkg/genericapiserver/endpoints/filters/audit.go index b6ae5b504f..251bbea45b 100644 --- a/pkg/genericapiserver/endpoints/filters/audit.go +++ b/pkg/genericapiserver/endpoints/filters/audit.go @@ -30,9 +30,9 @@ import ( "github.com/pborman/uuid" utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/request" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" ) var _ http.ResponseWriter = &auditResponseWriter{} diff --git a/pkg/genericapiserver/endpoints/filters/audit_test.go b/pkg/genericapiserver/endpoints/filters/audit_test.go index f77fdcd9c7..211fd5778a 100644 --- a/pkg/genericapiserver/endpoints/filters/audit_test.go +++ b/pkg/genericapiserver/endpoints/filters/audit_test.go @@ -29,7 +29,7 @@ import ( "testing" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/request" ) type simpleResponseWriter struct { diff --git a/pkg/genericapiserver/api/filters/authentication.go b/pkg/genericapiserver/endpoints/filters/authentication.go similarity index 98% rename from pkg/genericapiserver/api/filters/authentication.go rename to pkg/genericapiserver/endpoints/filters/authentication.go index c3027617b2..17bc44f7b7 100644 --- a/pkg/genericapiserver/api/filters/authentication.go +++ b/pkg/genericapiserver/endpoints/filters/authentication.go @@ -24,7 +24,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "k8s.io/apiserver/pkg/authentication/authenticator" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" ) var ( diff --git a/pkg/genericapiserver/api/filters/authentication_test.go b/pkg/genericapiserver/endpoints/filters/authentication_test.go similarity index 98% rename from pkg/genericapiserver/api/filters/authentication_test.go rename to pkg/genericapiserver/endpoints/filters/authentication_test.go index f12049d532..eae3f86c21 100644 --- a/pkg/genericapiserver/api/filters/authentication_test.go +++ b/pkg/genericapiserver/endpoints/filters/authentication_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" ) func TestAuthenticateRequest(t *testing.T) { diff --git a/pkg/genericapiserver/endpoints/filters/authorization.go b/pkg/genericapiserver/endpoints/filters/authorization.go index 2d15212ca5..59e286557d 100644 --- a/pkg/genericapiserver/endpoints/filters/authorization.go +++ b/pkg/genericapiserver/endpoints/filters/authorization.go @@ -23,8 +23,8 @@ import ( "github.com/golang/glog" "k8s.io/apiserver/pkg/authorization/authorizer" - "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" ) // WithAuthorizationCheck passes all authorized requests on to handler, and returns a forbidden error otherwise. diff --git a/pkg/genericapiserver/endpoints/filters/authorization_test.go b/pkg/genericapiserver/endpoints/filters/authorization_test.go index 644bde9151..8449fc1c61 100644 --- a/pkg/genericapiserver/endpoints/filters/authorization_test.go +++ b/pkg/genericapiserver/endpoints/filters/authorization_test.go @@ -24,9 +24,9 @@ import ( "testing" "k8s.io/apiserver/pkg/authorization/authorizer" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" ) func TestGetAuthorizerAttributes(t *testing.T) { diff --git a/pkg/genericapiserver/endpoints/filters/doc.go b/pkg/genericapiserver/endpoints/filters/doc.go index 534db30c3e..5563d5e4bc 100644 --- a/pkg/genericapiserver/endpoints/filters/doc.go +++ b/pkg/genericapiserver/endpoints/filters/doc.go @@ -15,5 +15,7 @@ limitations under the License. */ // Package filters contains all the http handler chain filters which -// _are_ api related. -package filters // import "k8s.io/kubernetes/pkg/genericapiserver/api/filters" +// _are_ api related, i.e. which are prerequisite for the API services +// to work (in contrast to the filters in the server package which are +// not part of the API contract). +package filters // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" diff --git a/pkg/genericapiserver/endpoints/filters/impersonation.go b/pkg/genericapiserver/endpoints/filters/impersonation.go index fce2de65fd..d682909f65 100644 --- a/pkg/genericapiserver/endpoints/filters/impersonation.go +++ b/pkg/genericapiserver/endpoints/filters/impersonation.go @@ -27,11 +27,11 @@ import ( "k8s.io/apiserver/pkg/authentication/serviceaccount" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - "k8s.io/apiserver/pkg/httplog" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/server/httplog" "k8s.io/kubernetes/pkg/api" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" ) // WithImpersonation is a filter that will inspect and check requests that attempt to change the user.Info for their requests diff --git a/pkg/genericapiserver/endpoints/filters/impersonation_test.go b/pkg/genericapiserver/endpoints/filters/impersonation_test.go index 6481d8cd69..3d0eb23c50 100644 --- a/pkg/genericapiserver/endpoints/filters/impersonation_test.go +++ b/pkg/genericapiserver/endpoints/filters/impersonation_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/request" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" ) diff --git a/pkg/genericapiserver/endpoints/filters/requestinfo.go b/pkg/genericapiserver/endpoints/filters/requestinfo.go index 64e8fb8a10..75344abf6f 100644 --- a/pkg/genericapiserver/endpoints/filters/requestinfo.go +++ b/pkg/genericapiserver/endpoints/filters/requestinfo.go @@ -21,8 +21,8 @@ import ( "fmt" "net/http" - "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" ) // WithRequestInfo attaches a RequestInfo to the context. diff --git a/pkg/genericapiserver/endpoints/filters/requestinfo_test.go b/pkg/genericapiserver/endpoints/filters/requestinfo_test.go index f77307339f..7420287264 100644 --- a/pkg/genericapiserver/endpoints/filters/requestinfo_test.go +++ b/pkg/genericapiserver/endpoints/filters/requestinfo_test.go @@ -18,7 +18,7 @@ package filters import ( "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/request" ) func newTestRequestInfoResolver() *request.RequestInfoFactory { diff --git a/pkg/genericapiserver/endpoints/groupversion.go b/pkg/genericapiserver/endpoints/groupversion.go index 182563f508..bee6f541e8 100644 --- a/pkg/genericapiserver/endpoints/groupversion.go +++ b/pkg/genericapiserver/endpoints/groupversion.go @@ -30,9 +30,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // APIGroupVersion is a helper for exposing rest.Storage objects as http.Handlers via go-restful diff --git a/pkg/genericapiserver/endpoints/handlers/BUILD b/pkg/genericapiserver/endpoints/handlers/BUILD index 6a3bc3e613..55bb8bf214 100644 --- a/pkg/genericapiserver/endpoints/handlers/BUILD +++ b/pkg/genericapiserver/endpoints/handlers/BUILD @@ -17,7 +17,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/evanphx/json-patch", @@ -27,7 +27,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -45,8 +45,8 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/util:go_default_library", "//pkg/util/httpstream:go_default_library", "//pkg/util/proxy:go_default_library", @@ -66,10 +66,10 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/apiserver/pkg/handlers/negotiation", - "//vendor:k8s.io/apiserver/pkg/httplog", - "//vendor:k8s.io/apiserver/pkg/metrics", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", + "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/server/httplog", "//vendor:k8s.io/apiserver/pkg/util/wsstream", ], ) @@ -85,7 +85,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/genericapiserver/api/handlers/responsewriters:all-srcs", + "//pkg/genericapiserver/endpoints/handlers/responsewriters:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/genericapiserver/endpoints/handlers/discovery.go b/pkg/genericapiserver/endpoints/handlers/discovery.go index 0a8eef1343..d1ae7fd1ce 100644 --- a/pkg/genericapiserver/endpoints/handlers/discovery.go +++ b/pkg/genericapiserver/endpoints/handlers/discovery.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" "github.com/emicklei/go-restful" ) diff --git a/pkg/genericapiserver/endpoints/handlers/doc.go b/pkg/genericapiserver/endpoints/handlers/doc.go index 68e8ccbf05..a3658757f6 100644 --- a/pkg/genericapiserver/endpoints/handlers/doc.go +++ b/pkg/genericapiserver/endpoints/handlers/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package handlers contains HTTP handlers to implement the apiserver APIs. -package handlers // import "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" +package handlers // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" diff --git a/pkg/genericapiserver/endpoints/handlers/proxy.go b/pkg/genericapiserver/endpoints/handlers/proxy.go index 731d911428..50a6a24969 100644 --- a/pkg/genericapiserver/endpoints/handlers/proxy.go +++ b/pkg/genericapiserver/endpoints/handlers/proxy.go @@ -31,12 +31,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/net" - "k8s.io/apiserver/pkg/httplog" - "k8s.io/apiserver/pkg/metrics" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/metrics" + "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/server/httplog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "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" diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD b/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD index 2c3fcec1f5..52445d47f6 100644 --- a/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD +++ b/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD @@ -31,14 +31,14 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/handlers/negotiation", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", "//vendor:k8s.io/apiserver/pkg/util/flushwriter", "//vendor:k8s.io/apiserver/pkg/util/wsstream", ], diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go b/pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go index 7c75ef9e72..59bbafc2cb 100644 --- a/pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go +++ b/pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package responsewriters containers helpers to write responses in HTTP handlers. -package responsewriters // import "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" +package responsewriters // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go b/pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go index bfdadfa7bc..e475c0ee17 100644 --- a/pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go +++ b/pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apiserver/pkg/handlers/negotiation" + "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" "k8s.io/apiserver/pkg/util/flushwriter" "k8s.io/apiserver/pkg/util/wsstream" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // WriteObject renders a returned runtime.Object to the response as a stream or an encoded object. If the object diff --git a/pkg/genericapiserver/endpoints/handlers/rest.go b/pkg/genericapiserver/endpoints/handlers/rest.go index 1bfc759048..b56aec33b4 100644 --- a/pkg/genericapiserver/endpoints/handlers/rest.go +++ b/pkg/genericapiserver/endpoints/handlers/rest.go @@ -35,12 +35,12 @@ import ( "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/handlers/negotiation" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" + "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/strategicpatch" diff --git a/pkg/genericapiserver/endpoints/handlers/rest_test.go b/pkg/genericapiserver/endpoints/handlers/rest_test.go index 9dda1d29e2..c23083f20b 100644 --- a/pkg/genericapiserver/endpoints/handlers/rest_test.go +++ b/pkg/genericapiserver/endpoints/handlers/rest_test.go @@ -32,11 +32,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/util/strategicpatch" ) diff --git a/pkg/genericapiserver/endpoints/handlers/watch.go b/pkg/genericapiserver/endpoints/handlers/watch.go index 381c0c5e7d..07ac4d570c 100755 --- a/pkg/genericapiserver/endpoints/handlers/watch.go +++ b/pkg/genericapiserver/endpoints/handlers/watch.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer/streaming" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - "k8s.io/apiserver/pkg/handlers/negotiation" - "k8s.io/apiserver/pkg/httplog" + "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" + "k8s.io/apiserver/pkg/server/httplog" "k8s.io/apiserver/pkg/util/wsstream" "github.com/emicklei/go-restful" diff --git a/pkg/genericapiserver/endpoints/installer.go b/pkg/genericapiserver/endpoints/installer.go index c0f94581d7..9af985c346 100644 --- a/pkg/genericapiserver/endpoints/installer.go +++ b/pkg/genericapiserver/endpoints/installer.go @@ -35,12 +35,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/apiserver/pkg/handlers/negotiation" - "k8s.io/apiserver/pkg/metrics" - "k8s.io/apiserver/pkg/request" + "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" + "k8s.io/apiserver/pkg/endpoints/metrics" + "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "github.com/emicklei/go-restful" ) diff --git a/pkg/genericapiserver/endpoints/proxy_test.go b/pkg/genericapiserver/endpoints/proxy_test.go index 448e697d0d..829d3115f6 100644 --- a/pkg/genericapiserver/endpoints/proxy_test.go +++ b/pkg/genericapiserver/endpoints/proxy_test.go @@ -36,7 +36,7 @@ import ( "golang.org/x/net/websocket" utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) { diff --git a/pkg/genericapiserver/endpoints/watch_test.go b/pkg/genericapiserver/endpoints/watch_test.go index 42726c5f02..53376a509e 100644 --- a/pkg/genericapiserver/endpoints/watch_test.go +++ b/pkg/genericapiserver/endpoints/watch_test.go @@ -39,9 +39,9 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - apitesting "k8s.io/kubernetes/pkg/genericapiserver/api/testing" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" + apitesting "k8s.io/kubernetes/pkg/genericapiserver/endpoints/testing" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // watchJSON defines the expected JSON wire equivalent of watch.Event diff --git a/pkg/genericapiserver/registry/BUILD b/pkg/genericapiserver/registry/BUILD new file mode 100644 index 0000000000..b67b7c1eab --- /dev/null +++ b/pkg/genericapiserver/registry/BUILD @@ -0,0 +1,31 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = ["doc.go"], + tags = ["automanaged"], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [ + ":package-srcs", + "//pkg/genericapiserver/registry/generic:all-srcs", + "//pkg/genericapiserver/registry/rest:all-srcs", + ], + tags = ["automanaged"], +) diff --git a/pkg/genericapiserver/registry/generic/BUILD b/pkg/genericapiserver/registry/generic/BUILD index 0b0c09aa1d..1e1010ee17 100644 --- a/pkg/genericapiserver/registry/generic/BUILD +++ b/pkg/genericapiserver/registry/generic/BUILD @@ -39,8 +39,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/generic/registry:all-srcs", - "//pkg/registry/generic/rest:all-srcs", + "//pkg/genericapiserver/registry/generic/registry:all-srcs", + "//pkg/genericapiserver/registry/generic/rest:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/genericapiserver/registry/generic/doc.go b/pkg/genericapiserver/registry/generic/doc.go index 002e0fd42a..f743ae1334 100644 --- a/pkg/genericapiserver/registry/generic/doc.go +++ b/pkg/genericapiserver/registry/generic/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package generic provides a generic object store interface and a // generic label/field matching type. -package generic // import "k8s.io/kubernetes/pkg/registry/generic" +package generic // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" diff --git a/pkg/genericapiserver/registry/generic/registry/BUILD b/pkg/genericapiserver/registry/generic/registry/BUILD index 857c1928d1..030a581977 100644 --- a/pkg/genericapiserver/registry/generic/registry/BUILD +++ b/pkg/genericapiserver/registry/generic/registry/BUILD @@ -22,9 +22,9 @@ go_library( "//pkg/api/errors/storage:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//pkg/storage/etcd:go_default_library", "//pkg/storage/storagebackend:go_default_library", @@ -40,7 +40,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -56,9 +56,9 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/pod:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//pkg/storage/etcd:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -73,7 +73,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/genericapiserver/registry/generic/registry/decorated_watcher.go b/pkg/genericapiserver/registry/generic/registry/decorated_watcher.go index d36b8dfb81..d131ba80ea 100644 --- a/pkg/genericapiserver/registry/generic/registry/decorated_watcher.go +++ b/pkg/genericapiserver/registry/generic/registry/decorated_watcher.go @@ -23,7 +23,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) type decoratedWatcher struct { diff --git a/pkg/genericapiserver/registry/generic/registry/doc.go b/pkg/genericapiserver/registry/generic/registry/doc.go index ea3c0c94ff..95cdb9cc33 100644 --- a/pkg/genericapiserver/registry/generic/registry/doc.go +++ b/pkg/genericapiserver/registry/generic/registry/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package etcd has a generic implementation of a registry that // stores things in etcd. -package registry // import "k8s.io/kubernetes/pkg/registry/generic/registry" +package registry // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" diff --git a/pkg/genericapiserver/registry/generic/registry/storage_factory.go b/pkg/genericapiserver/registry/generic/registry/storage_factory.go index 896196bdb2..3a8c8d87b0 100644 --- a/pkg/genericapiserver/registry/generic/registry/storage_factory.go +++ b/pkg/genericapiserver/registry/generic/registry/storage_factory.go @@ -18,7 +18,7 @@ package registry import ( "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" "k8s.io/kubernetes/pkg/storage/storagebackend" diff --git a/pkg/genericapiserver/registry/generic/registry/store.go b/pkg/genericapiserver/registry/generic/registry/store.go index c9ddf55f1d..c6a90a5bca 100644 --- a/pkg/genericapiserver/registry/generic/registry/store.go +++ b/pkg/genericapiserver/registry/generic/registry/store.go @@ -32,14 +32,14 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" "github.com/golang/glog" diff --git a/pkg/genericapiserver/registry/generic/registry/store_test.go b/pkg/genericapiserver/registry/generic/registry/store_test.go index 82cce00270..046b43c583 100644 --- a/pkg/genericapiserver/registry/generic/registry/store_test.go +++ b/pkg/genericapiserver/registry/generic/registry/store_test.go @@ -34,14 +34,14 @@ import ( "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/wait" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/pod" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/genericapiserver/registry/generic/rest/BUILD b/pkg/genericapiserver/registry/generic/rest/BUILD index 55a8735654..ad216ed873 100644 --- a/pkg/genericapiserver/registry/generic/rest/BUILD +++ b/pkg/genericapiserver/registry/generic/rest/BUILD @@ -18,7 +18,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/util/config:go_default_library", "//pkg/util/httpstream:go_default_library", "//pkg/util/proxy:go_default_library", diff --git a/pkg/genericapiserver/registry/generic/rest/doc.go b/pkg/genericapiserver/registry/generic/rest/doc.go index d08a7f680e..abe523eb94 100644 --- a/pkg/genericapiserver/registry/generic/rest/doc.go +++ b/pkg/genericapiserver/registry/generic/rest/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package rest has generic implementations of resources used for // REST responses -package rest // import "k8s.io/kubernetes/pkg/registry/generic/rest" +package rest // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" diff --git a/pkg/genericapiserver/registry/generic/rest/proxy.go b/pkg/genericapiserver/registry/generic/rest/proxy.go index e6e986b3b7..3262092d16 100644 --- a/pkg/genericapiserver/registry/generic/rest/proxy.go +++ b/pkg/genericapiserver/registry/generic/rest/proxy.go @@ -99,7 +99,7 @@ func (h *UpgradeAwareProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Re loc.Path += "/" } - // From pkg/genericapiserver/api/handlers/proxy.go#ServeHTTP: + // From pkg/genericapiserver/endpoints/handlers/proxy.go#ServeHTTP: // Redirect requests with an empty path to a location that ends with a '/' // This is essentially a hack for http://issue.k8s.io/4958. // Note: Keep this code after tryUpgrade to not break that flow. diff --git a/pkg/genericapiserver/registry/generic/rest/streamer.go b/pkg/genericapiserver/registry/generic/rest/streamer.go index 247b7c52c7..24fe7f9867 100644 --- a/pkg/genericapiserver/registry/generic/rest/streamer.go +++ b/pkg/genericapiserver/registry/generic/rest/streamer.go @@ -23,7 +23,7 @@ import ( "strings" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // LocationStreamer is a resource that streams the contents of a particular diff --git a/pkg/genericapiserver/registry/rest/BUILD b/pkg/genericapiserver/registry/rest/BUILD index ed55f45e73..1440ab85e9 100644 --- a/pkg/genericapiserver/registry/rest/BUILD +++ b/pkg/genericapiserver/registry/rest/BUILD @@ -17,7 +17,6 @@ go_library( "export.go", "meta.go", "rest.go", - "types.go", "update.go", ], tags = ["automanaged"], @@ -33,7 +32,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -49,7 +48,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/genericapiserver/api/rest/resttest:all-srcs", + "//pkg/genericapiserver/registry/rest/resttest:all-srcs", ], tags = ["automanaged"], ) @@ -63,6 +62,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/genericapiserver/registry/rest/create.go b/pkg/genericapiserver/registry/rest/create.go index 8b4c758590..185696d291 100644 --- a/pkg/genericapiserver/registry/rest/create.go +++ b/pkg/genericapiserver/registry/rest/create.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation/genericvalidation" diff --git a/pkg/genericapiserver/registry/rest/delete.go b/pkg/genericapiserver/registry/rest/delete.go index 56acd73f57..15e1d96701 100644 --- a/pkg/genericapiserver/registry/rest/delete.go +++ b/pkg/genericapiserver/registry/rest/delete.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" ) diff --git a/pkg/genericapiserver/registry/rest/doc.go b/pkg/genericapiserver/registry/rest/doc.go index 379b9e6b5e..6f9855077a 100644 --- a/pkg/genericapiserver/registry/rest/doc.go +++ b/pkg/genericapiserver/registry/rest/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package rest defines common logic around changes to Kubernetes-style resources. -package rest // import "k8s.io/kubernetes/pkg/genericapiserver/api/rest" +package rest // import "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" diff --git a/pkg/genericapiserver/registry/rest/export.go b/pkg/genericapiserver/registry/rest/export.go index a29c9b79af..40ba999917 100644 --- a/pkg/genericapiserver/registry/rest/export.go +++ b/pkg/genericapiserver/registry/rest/export.go @@ -18,7 +18,7 @@ package rest import ( "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" ) // RESTExportStrategy is the interface that defines how to export a Kubernetes object diff --git a/pkg/genericapiserver/registry/rest/meta.go b/pkg/genericapiserver/registry/rest/meta.go index f119a478aa..f7c9aec345 100644 --- a/pkg/genericapiserver/registry/rest/meta.go +++ b/pkg/genericapiserver/registry/rest/meta.go @@ -18,7 +18,7 @@ package rest import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/util/uuid" ) @@ -36,7 +36,7 @@ func FillObjectMetaSystemFields(ctx genericapirequest.Context, meta *metav1.Obje } // ValidNamespace returns false if the namespace on the context differs from the resource. If the resource has no namespace, it is set to the value in the context. -// TODO(sttts): move into pkg/genericapiserver/api +// TODO(sttts): move into pkg/genericapiserver/endpoints func ValidNamespace(ctx genericapirequest.Context, resource *metav1.ObjectMeta) bool { ns, ok := genericapirequest.NamespaceFrom(ctx) if len(resource.Namespace) == 0 { diff --git a/pkg/genericapiserver/registry/rest/meta_test.go b/pkg/genericapiserver/registry/rest/meta_test.go index 805f6a4051..8967979e0a 100644 --- a/pkg/genericapiserver/registry/rest/meta_test.go +++ b/pkg/genericapiserver/registry/rest/meta_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/util/uuid" ) diff --git a/pkg/genericapiserver/registry/rest/rest.go b/pkg/genericapiserver/registry/rest/rest.go index ab47884f34..09e3f8a337 100644 --- a/pkg/genericapiserver/registry/rest/rest.go +++ b/pkg/genericapiserver/registry/rest/rest.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry +package rest import ( "io" @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" ) diff --git a/pkg/genericapiserver/registry/rest/resttest/BUILD b/pkg/genericapiserver/registry/rest/resttest/BUILD index c64767ec0b..46ceed3313 100644 --- a/pkg/genericapiserver/registry/rest/resttest/BUILD +++ b/pkg/genericapiserver/registry/rest/resttest/BUILD @@ -15,7 +15,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/conversion", @@ -23,7 +23,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/genericapiserver/registry/rest/resttest/resttest.go b/pkg/genericapiserver/registry/rest/resttest/resttest.go index c2cb40d198..d043cbc23b 100644 --- a/pkg/genericapiserver/registry/rest/resttest/resttest.go +++ b/pkg/genericapiserver/registry/rest/resttest/resttest.go @@ -30,11 +30,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) type Tester struct { diff --git a/pkg/genericapiserver/registry/rest/update.go b/pkg/genericapiserver/registry/rest/update.go index 7e14b29481..8ee085bc01 100644 --- a/pkg/genericapiserver/registry/rest/update.go +++ b/pkg/genericapiserver/registry/rest/update.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation/genericvalidation" ) diff --git a/pkg/genericapiserver/server/BUILD b/pkg/genericapiserver/server/BUILD new file mode 100644 index 0000000000..1e8bc26af7 --- /dev/null +++ b/pkg/genericapiserver/server/BUILD @@ -0,0 +1,131 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", + "go_test", +) + +go_test( + name = "go_default_test", + srcs = [ + "genericapiserver_test.go", + "resource_config_test.go", + "serve_test.go", + "server_run_options_test.go", + "storage_factory_test.go", + ], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/testapi:go_default_library", + "//pkg/api/v1:go_default_library", + "//pkg/apis/autoscaling:go_default_library", + "//pkg/apis/extensions:go_default_library", + "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/generated/openapi:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server/options:go_default_library", + "//pkg/storage/etcd/testing:go_default_library", + "//pkg/storage/storagebackend:go_default_library", + "//pkg/util/cert:go_default_library", + "//pkg/util/config:go_default_library", + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/stretchr/testify/assert", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/apimachinery", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/version", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + ], +) + +go_library( + name = "go_default_library", + srcs = [ + "config.go", + "config_selfclient.go", + "discovery.go", + "doc.go", + "genericapiserver.go", + "healthz.go", + "hooks.go", + "resource_config.go", + "resource_encoding_config.go", + "serve.go", + "storage_factory.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/client/restclient:go_default_library", + "//pkg/genericapiserver/authenticator:go_default_library", + "//pkg/genericapiserver/authorizer:go_default_library", + "//pkg/genericapiserver/endpoints:go_default_library", + "//pkg/genericapiserver/endpoints/filters:go_default_library", + "//pkg/genericapiserver/endpoints/openapi:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server/filters:go_default_library", + "//pkg/genericapiserver/server/mux:go_default_library", + "//pkg/genericapiserver/server/options:go_default_library", + "//pkg/genericapiserver/server/routes:go_default_library", + "//pkg/storage/storagebackend:go_default_library", + "//pkg/util/cert:go_default_library", + "//vendor:github.com/coreos/go-systemd/daemon", + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/emicklei/go-restful/swagger", + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/golang/glog", + "//vendor:github.com/pborman/uuid", + "//vendor:github.com/pkg/errors", + "//vendor:gopkg.in/natefinch/lumberjack.v2", + "//vendor:k8s.io/apimachinery/pkg/apimachinery", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/openapi", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/recognizer", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/validation", + "//vendor:k8s.io/apimachinery/pkg/version", + "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", + "//vendor:k8s.io/apiserver/pkg/authentication/request/union", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/authorization/union", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/server/healthz", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [ + ":package-srcs", + "//pkg/genericapiserver/server/filters:all-srcs", + "//pkg/genericapiserver/server/mux:all-srcs", + "//pkg/genericapiserver/server/openapi:all-srcs", + "//pkg/genericapiserver/server/options:all-srcs", + "//pkg/genericapiserver/server/routes:all-srcs", + ], + tags = ["automanaged"], +) diff --git a/pkg/genericapiserver/server/config.go b/pkg/genericapiserver/server/config.go index f2dbeb9ea8..1371433303 100644 --- a/pkg/genericapiserver/server/config.go +++ b/pkg/genericapiserver/server/config.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "crypto/tls" @@ -47,18 +47,18 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" authorizerunion "k8s.io/apiserver/pkg/authorization/union" - "k8s.io/apiserver/pkg/healthz" - apirequest "k8s.io/apiserver/pkg/request" + apirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient" - genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters" - apiopenapi "k8s.io/kubernetes/pkg/genericapiserver/api/openapi" genericauthenticator "k8s.io/kubernetes/pkg/genericapiserver/authenticator" genericauthorizer "k8s.io/kubernetes/pkg/genericapiserver/authorizer" - genericfilters "k8s.io/kubernetes/pkg/genericapiserver/filters" - "k8s.io/kubernetes/pkg/genericapiserver/mux" - "k8s.io/kubernetes/pkg/genericapiserver/options" - "k8s.io/kubernetes/pkg/genericapiserver/routes" + genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" + apiopenapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints/openapi" + genericfilters "k8s.io/kubernetes/pkg/genericapiserver/server/filters" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/kubernetes/pkg/genericapiserver/server/options" + "k8s.io/kubernetes/pkg/genericapiserver/server/routes" certutil "k8s.io/kubernetes/pkg/util/cert" ) diff --git a/pkg/genericapiserver/server/config_selfclient.go b/pkg/genericapiserver/server/config_selfclient.go index 056612e344..df0db58d13 100644 --- a/pkg/genericapiserver/server/config_selfclient.go +++ b/pkg/genericapiserver/server/config_selfclient.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "bytes" diff --git a/pkg/genericapiserver/server/discovery.go b/pkg/genericapiserver/server/discovery.go index 7e631ef0b9..fc523e35b5 100644 --- a/pkg/genericapiserver/server/discovery.go +++ b/pkg/genericapiserver/server/discovery.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "net" diff --git a/pkg/genericapiserver/server/doc.go b/pkg/genericapiserver/server/doc.go index 9aee5ea3ed..b61ec1f5bb 100644 --- a/pkg/genericapiserver/server/doc.go +++ b/pkg/genericapiserver/server/doc.go @@ -14,10 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package genericapiserver contains code to setup a generic kubernetes-like API server. -// This does not contain any kubernetes API specific code. -// Note that this is a work in progress. We are pulling out generic code (specifically from -// pkg/master) here. -// We plan to move this package into a separate repo on github once it is done. -// For more details: https://github.com/kubernetes/kubernetes/issues/2742 -package genericapiserver // import "k8s.io/kubernetes/pkg/genericapiserver" +// Package server contains the plumbing to create kubernetes-like API server command. +package server // import "k8s.io/kubernetes/pkg/genericapiserver/server" diff --git a/pkg/genericapiserver/server/filters/BUILD b/pkg/genericapiserver/server/filters/BUILD index ac031b5695..8a16796f7b 100644 --- a/pkg/genericapiserver/server/filters/BUILD +++ b/pkg/genericapiserver/server/filters/BUILD @@ -26,8 +26,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apiserver/pkg/httplog", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/server/httplog", ], ) @@ -41,10 +41,10 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/api/filters:go_default_library", + "//pkg/genericapiserver/endpoints/filters:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/genericapiserver/server/filters/doc.go b/pkg/genericapiserver/server/filters/doc.go index 3fbe2978e1..8ccdbb5973 100644 --- a/pkg/genericapiserver/server/filters/doc.go +++ b/pkg/genericapiserver/server/filters/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package filters contains all the http handler chain filters which // are not api related. -package filters // import "k8s.io/kubernetes/pkg/genericapiserver/filters" +package filters // import "k8s.io/kubernetes/pkg/genericapiserver/server/filters" diff --git a/pkg/genericapiserver/server/filters/longrunning.go b/pkg/genericapiserver/server/filters/longrunning.go index 39831ef3b0..4ea58625b6 100644 --- a/pkg/genericapiserver/server/filters/longrunning.go +++ b/pkg/genericapiserver/server/filters/longrunning.go @@ -20,7 +20,7 @@ import ( "net/http" "k8s.io/apimachinery/pkg/util/sets" - apirequest "k8s.io/apiserver/pkg/request" + apirequest "k8s.io/apiserver/pkg/endpoints/request" ) // LongRunningRequestCheck is a predicate which is true for long-running http requests. diff --git a/pkg/genericapiserver/server/filters/maxinflight.go b/pkg/genericapiserver/server/filters/maxinflight.go index 41b7aa05a2..c480d7b6e2 100644 --- a/pkg/genericapiserver/server/filters/maxinflight.go +++ b/pkg/genericapiserver/server/filters/maxinflight.go @@ -22,9 +22,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/apiserver/pkg/httplog" - apirequest "k8s.io/apiserver/pkg/request" - genericapirequest "k8s.io/apiserver/pkg/request" + apirequest "k8s.io/apiserver/pkg/endpoints/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/server/httplog" "github.com/golang/glog" ) diff --git a/pkg/genericapiserver/server/filters/maxinflight_test.go b/pkg/genericapiserver/server/filters/maxinflight_test.go index 687fc524e8..872fe074ce 100644 --- a/pkg/genericapiserver/server/filters/maxinflight_test.go +++ b/pkg/genericapiserver/server/filters/maxinflight_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/util/sets" - apirequest "k8s.io/apiserver/pkg/request" - apifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters" + apirequest "k8s.io/apiserver/pkg/endpoints/request" + apifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" ) func createMaxInflightServer(callsWg, blockWg *sync.WaitGroup, disableCallsWg *bool, disableCallsWgMutex *sync.Mutex, nonMutating, mutating int) *httptest.Server { diff --git a/pkg/genericapiserver/server/filters/panics.go b/pkg/genericapiserver/server/filters/panics.go index aba7ae934d..4f651360c3 100644 --- a/pkg/genericapiserver/server/filters/panics.go +++ b/pkg/genericapiserver/server/filters/panics.go @@ -24,8 +24,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apiserver/pkg/httplog" - apirequest "k8s.io/apiserver/pkg/request" + apirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/server/httplog" ) // WithPanicRecovery wraps an http Handler to recover and log panics. diff --git a/pkg/genericapiserver/server/filters/timeout.go b/pkg/genericapiserver/server/filters/timeout.go index 3a81b0462f..69617f1520 100644 --- a/pkg/genericapiserver/server/filters/timeout.go +++ b/pkg/genericapiserver/server/filters/timeout.go @@ -26,7 +26,7 @@ import ( "time" "k8s.io/apimachinery/pkg/api/errors" - apirequest "k8s.io/apiserver/pkg/request" + apirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" ) diff --git a/pkg/genericapiserver/server/genericapiserver.go b/pkg/genericapiserver/server/genericapiserver.go index ae3f333d18..4244d16272 100644 --- a/pkg/genericapiserver/server/genericapiserver.go +++ b/pkg/genericapiserver/server/genericapiserver.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "fmt" @@ -38,14 +38,14 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/healthz" - apirequest "k8s.io/apiserver/pkg/request" + apirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient" - genericapi "k8s.io/kubernetes/pkg/genericapiserver/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - genericmux "k8s.io/kubernetes/pkg/genericapiserver/mux" - "k8s.io/kubernetes/pkg/genericapiserver/routes" + genericapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericmux "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/kubernetes/pkg/genericapiserver/server/routes" ) // Info about an API group. diff --git a/pkg/genericapiserver/server/genericapiserver_test.go b/pkg/genericapiserver/server/genericapiserver_test.go index a0b9133cef..6a1f38f9e3 100644 --- a/pkg/genericapiserver/server/genericapiserver_test.go +++ b/pkg/genericapiserver/server/genericapiserver_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "encoding/json" @@ -42,13 +42,13 @@ import ( "k8s.io/apimachinery/pkg/version" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" openapigen "k8s.io/kubernetes/pkg/generated/openapi" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/genericapiserver/server/healthz.go b/pkg/genericapiserver/server/healthz.go index 1d642f9dde..db8a132c4e 100644 --- a/pkg/genericapiserver/server/healthz.go +++ b/pkg/genericapiserver/server/healthz.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "fmt" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" ) // AddHealthzCheck allows you to add a HealthzCheck. diff --git a/pkg/genericapiserver/server/hooks.go b/pkg/genericapiserver/server/hooks.go index c2cca57d9f..54290761b3 100644 --- a/pkg/genericapiserver/server/hooks.go +++ b/pkg/genericapiserver/server/hooks.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "errors" @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/pkg/client/restclient" ) diff --git a/pkg/genericapiserver/server/mux/BUILD b/pkg/genericapiserver/server/mux/BUILD index 28af4a6ee0..21aab7f270 100644 --- a/pkg/genericapiserver/server/mux/BUILD +++ b/pkg/genericapiserver/server/mux/BUILD @@ -18,7 +18,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", + "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", diff --git a/pkg/genericapiserver/server/mux/container.go b/pkg/genericapiserver/server/mux/container.go index aedec2ec6a..6d9c72dad0 100644 --- a/pkg/genericapiserver/server/mux/container.go +++ b/pkg/genericapiserver/server/mux/container.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" ) // APIContainer is a restful container which in addition support registering diff --git a/pkg/genericapiserver/server/openapi/BUILD b/pkg/genericapiserver/server/openapi/BUILD index d0697a6dc4..92d2154054 100644 --- a/pkg/genericapiserver/server/openapi/BUILD +++ b/pkg/genericapiserver/server/openapi/BUILD @@ -17,7 +17,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/mux:go_default_library", + "//pkg/genericapiserver/server/mux:go_default_library", "//pkg/util:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/go-openapi/spec", @@ -48,6 +48,9 @@ filegroup( filegroup( name = "all-srcs", - srcs = [":package-srcs"], + srcs = [ + ":package-srcs", + "//pkg/genericapiserver/server/openapi/common:all-srcs", + ], tags = ["automanaged"], ) diff --git a/pkg/genericapiserver/server/openapi/openapi.go b/pkg/genericapiserver/server/openapi/openapi.go index 6155b7ca25..ca5b51cf49 100644 --- a/pkg/genericapiserver/server/openapi/openapi.go +++ b/pkg/genericapiserver/server/openapi/openapi.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/openapi" "k8s.io/apimachinery/pkg/util/json" - genericmux "k8s.io/kubernetes/pkg/genericapiserver/mux" + genericmux "k8s.io/kubernetes/pkg/genericapiserver/server/mux" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/genericapiserver/server/options/doc.go b/pkg/genericapiserver/server/options/doc.go index 3247f4c57b..dfe986fe0d 100644 --- a/pkg/genericapiserver/server/options/doc.go +++ b/pkg/genericapiserver/server/options/doc.go @@ -18,4 +18,4 @@ limitations under the License. // server. It takes a minimal set of dependencies and does not reference // implementations, in order to ensure it may be reused by multiple components // (such as CLI commands that wish to generate or validate config). -package options // import "k8s.io/kubernetes/pkg/genericapiserver/options" +package options // import "k8s.io/kubernetes/pkg/genericapiserver/server/options" diff --git a/pkg/genericapiserver/server/resource_config.go b/pkg/genericapiserver/server/resource_config.go index 7c3d634887..06be1a55fe 100644 --- a/pkg/genericapiserver/server/resource_config.go +++ b/pkg/genericapiserver/server/resource_config.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/genericapiserver/server/resource_config_test.go b/pkg/genericapiserver/server/resource_config_test.go index cb3ddd6c4f..576b24a89c 100644 --- a/pkg/genericapiserver/server/resource_config_test.go +++ b/pkg/genericapiserver/server/resource_config_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "testing" diff --git a/pkg/genericapiserver/server/resource_encoding_config.go b/pkg/genericapiserver/server/resource_encoding_config.go index 26c9d84619..9fd1889512 100644 --- a/pkg/genericapiserver/server/resource_encoding_config.go +++ b/pkg/genericapiserver/server/resource_encoding_config.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/genericapiserver/server/routes/BUILD b/pkg/genericapiserver/server/routes/BUILD index 621a2d14c1..21e8f8068e 100644 --- a/pkg/genericapiserver/server/routes/BUILD +++ b/pkg/genericapiserver/server/routes/BUILD @@ -21,10 +21,10 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/mux:go_default_library", - "//pkg/genericapiserver/openapi:go_default_library", - "//pkg/genericapiserver/routes/data/swagger:go_default_library", + "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", + "//pkg/genericapiserver/server/mux:go_default_library", + "//pkg/genericapiserver/server/openapi:go_default_library", + "//pkg/genericapiserver/server/routes/data/swagger:go_default_library", "//vendor:github.com/elazarl/go-bindata-assetfs", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/emicklei/go-restful/swagger", @@ -33,7 +33,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/openapi", "//vendor:k8s.io/apimachinery/pkg/version", - "//vendor:k8s.io/apiserver/pkg/metrics", + "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics", ], ) @@ -49,7 +49,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/genericapiserver/routes/data/swagger:all-srcs", + "//pkg/genericapiserver/server/routes/data/swagger:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/genericapiserver/server/routes/data/README.md b/pkg/genericapiserver/server/routes/data/README.md index a267e3a944..974aec20a1 100644 --- a/pkg/genericapiserver/server/routes/data/README.md +++ b/pkg/genericapiserver/server/routes/data/README.md @@ -9,4 +9,4 @@ Do not edit by hand. [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/pkg/genericapiserver/addons/data/README.md?pixel)]() -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/pkg/genericapiserver/routes/data/README.md?pixel)]() +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/pkg/genericapiserver/server/routes/data/README.md?pixel)]() diff --git a/pkg/genericapiserver/server/routes/index.go b/pkg/genericapiserver/server/routes/index.go index 7ddef65900..cb4f813e35 100644 --- a/pkg/genericapiserver/server/routes/index.go +++ b/pkg/genericapiserver/server/routes/index.go @@ -21,8 +21,8 @@ import ( "sort" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/mux" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" ) // Index provides a webservice for the http root / listing all known paths. diff --git a/pkg/genericapiserver/server/routes/metrics.go b/pkg/genericapiserver/server/routes/metrics.go index 8ea28de7b6..13bba925b7 100644 --- a/pkg/genericapiserver/server/routes/metrics.go +++ b/pkg/genericapiserver/server/routes/metrics.go @@ -20,9 +20,9 @@ import ( "io" "net/http" - apimetrics "k8s.io/apiserver/pkg/metrics" + apimetrics "k8s.io/apiserver/pkg/endpoints/metrics" etcdmetrics "k8s.io/apiserver/pkg/storage/etcd/metrics" - "k8s.io/kubernetes/pkg/genericapiserver/mux" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/genericapiserver/server/routes/openapi.go b/pkg/genericapiserver/server/routes/openapi.go index 8dd61daa23..2561b30947 100644 --- a/pkg/genericapiserver/server/routes/openapi.go +++ b/pkg/genericapiserver/server/routes/openapi.go @@ -18,8 +18,8 @@ package routes import ( "k8s.io/apimachinery/pkg/openapi" - "k8s.io/kubernetes/pkg/genericapiserver/mux" - apiserveropenapi "k8s.io/kubernetes/pkg/genericapiserver/openapi" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + apiserveropenapi "k8s.io/kubernetes/pkg/genericapiserver/server/openapi" "github.com/golang/glog" ) diff --git a/pkg/genericapiserver/server/routes/profiling.go b/pkg/genericapiserver/server/routes/profiling.go index eee109fbe8..4d8384a087 100644 --- a/pkg/genericapiserver/server/routes/profiling.go +++ b/pkg/genericapiserver/server/routes/profiling.go @@ -19,7 +19,7 @@ package routes import ( "net/http/pprof" - "k8s.io/kubernetes/pkg/genericapiserver/mux" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" ) // Profiling adds handlers for pprof under /debug/pprof. diff --git a/pkg/genericapiserver/server/routes/swagger.go b/pkg/genericapiserver/server/routes/swagger.go index d60a90f781..352c4f5e98 100644 --- a/pkg/genericapiserver/server/routes/swagger.go +++ b/pkg/genericapiserver/server/routes/swagger.go @@ -17,7 +17,7 @@ limitations under the License. package routes import ( - "k8s.io/kubernetes/pkg/genericapiserver/mux" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" "github.com/emicklei/go-restful/swagger" ) diff --git a/pkg/genericapiserver/server/routes/swaggerui.go b/pkg/genericapiserver/server/routes/swaggerui.go index 5551466914..0b7f252c32 100644 --- a/pkg/genericapiserver/server/routes/swaggerui.go +++ b/pkg/genericapiserver/server/routes/swaggerui.go @@ -21,8 +21,8 @@ import ( assetfs "github.com/elazarl/go-bindata-assetfs" - "k8s.io/kubernetes/pkg/genericapiserver/mux" - "k8s.io/kubernetes/pkg/genericapiserver/routes/data/swagger" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/kubernetes/pkg/genericapiserver/server/routes/data/swagger" ) // SwaggerUI exposes files in third_party/swagger-ui/ under /swagger-ui. diff --git a/pkg/genericapiserver/server/routes/version.go b/pkg/genericapiserver/server/routes/version.go index a0ecc643b6..fdb1a7343b 100644 --- a/pkg/genericapiserver/server/routes/version.go +++ b/pkg/genericapiserver/server/routes/version.go @@ -22,8 +22,8 @@ import ( "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/version" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/mux" + "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" ) // Version provides a webservice with version information. diff --git a/pkg/genericapiserver/server/serve.go b/pkg/genericapiserver/server/serve.go index fc548ae3ae..ea2f2870e1 100644 --- a/pkg/genericapiserver/server/serve.go +++ b/pkg/genericapiserver/server/serve.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "crypto/tls" diff --git a/pkg/genericapiserver/server/serve_test.go b/pkg/genericapiserver/server/serve_test.go index de2d94591e..67f0f7aa5f 100644 --- a/pkg/genericapiserver/server/serve_test.go +++ b/pkg/genericapiserver/server/serve_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "crypto/tls" @@ -32,7 +32,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/genericapiserver/options" + "k8s.io/kubernetes/pkg/genericapiserver/server/options" utilcert "k8s.io/kubernetes/pkg/util/cert" "k8s.io/kubernetes/pkg/util/config" ) diff --git a/pkg/genericapiserver/server/server_run_options_test.go b/pkg/genericapiserver/server/server_run_options_test.go index 6fcfc03ddd..967f1928ac 100644 --- a/pkg/genericapiserver/server/server_run_options_test.go +++ b/pkg/genericapiserver/server/server_run_options_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "reflect" @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/options" + "k8s.io/kubernetes/pkg/genericapiserver/server/options" ) func TestGenerateStorageVersionMap(t *testing.T) { diff --git a/pkg/genericapiserver/server/storage_factory.go b/pkg/genericapiserver/server/storage_factory.go index 14b66573e9..5b8332c883 100644 --- a/pkg/genericapiserver/server/storage_factory.go +++ b/pkg/genericapiserver/server/storage_factory.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "fmt" diff --git a/pkg/genericapiserver/server/storage_factory_test.go b/pkg/genericapiserver/server/storage_factory_test.go index 119c436071..614425884d 100644 --- a/pkg/genericapiserver/server/storage_factory_test.go +++ b/pkg/genericapiserver/server/storage_factory_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package genericapiserver +package server import ( "reflect" @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/options" + "k8s.io/kubernetes/pkg/genericapiserver/server/options" "k8s.io/kubernetes/pkg/storage/storagebackend" ) diff --git a/pkg/kubeapiserver/BUILD b/pkg/kubeapiserver/BUILD index ea13b84aa9..21406f6aa1 100644 --- a/pkg/kubeapiserver/BUILD +++ b/pkg/kubeapiserver/BUILD @@ -17,7 +17,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/storage/storagebackend:go_default_library", "//pkg/util/config:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", @@ -55,7 +55,7 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/install:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/genericapiserver:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", ], ) diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index 98eb4d1a9f..40df70b16d 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder.go +++ b/pkg/kubeapiserver/default_storage_factory_builder.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/util/config" ) diff --git a/pkg/kubeapiserver/default_storage_factory_builder_test.go b/pkg/kubeapiserver/default_storage_factory_builder_test.go index 9124cc3a65..cf956bb863 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder_test.go +++ b/pkg/kubeapiserver/default_storage_factory_builder_test.go @@ -26,7 +26,7 @@ import ( apiv1 "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apis/extensions/install" extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" ) func TestParseRuntimeConfig(t *testing.T) { diff --git a/pkg/kubeapiserver/options/BUILD b/pkg/kubeapiserver/options/BUILD index 1254759101..9e286c9347 100644 --- a/pkg/kubeapiserver/options/BUILD +++ b/pkg/kubeapiserver/options/BUILD @@ -19,8 +19,8 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/controller/informers:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/options:go_default_library", + "//pkg/genericapiserver/server:go_default_library", + "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubeapiserver/authenticator:go_default_library", "//pkg/kubeapiserver/authorizer:go_default_library", "//vendor:github.com/golang/glog", diff --git a/pkg/kubeapiserver/options/authentication.go b/pkg/kubeapiserver/options/authentication.go index 6a2cb0a8f8..971c4be413 100644 --- a/pkg/kubeapiserver/options/authentication.go +++ b/pkg/kubeapiserver/options/authentication.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "github.com/spf13/pflag" - "k8s.io/kubernetes/pkg/genericapiserver" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" + genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" "k8s.io/kubernetes/pkg/kubeapiserver/authenticator" "k8s.io/kubernetes/pkg/kubeapiserver/authorizer" ) diff --git a/pkg/kubeapiserver/options/cloudprovider.go b/pkg/kubeapiserver/options/cloudprovider.go index 9ed89b913b..8f877b6555 100644 --- a/pkg/kubeapiserver/options/cloudprovider.go +++ b/pkg/kubeapiserver/options/cloudprovider.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/cloudprovider" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options" + genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" ) type CloudProviderOptions struct { diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 008441689e..c54c95cc16 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -44,8 +44,8 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/healthz", - "//vendor:k8s.io/apiserver/pkg/httplog", + "//vendor:k8s.io/apiserver/pkg/server/healthz", + "//vendor:k8s.io/apiserver/pkg/server/httplog", "//vendor:k8s.io/apiserver/pkg/util/flushwriter", ], ) diff --git a/pkg/kubelet/server/remotecommand/BUILD b/pkg/kubelet/server/remotecommand/BUILD index d4e16652b6..062b1f4906 100644 --- a/pkg/kubelet/server/remotecommand/BUILD +++ b/pkg/kubelet/server/remotecommand/BUILD @@ -29,7 +29,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apiserver/pkg/httplog", + "//vendor:k8s.io/apiserver/pkg/server/httplog", "//vendor:k8s.io/apiserver/pkg/util/wsstream", ], ) diff --git a/pkg/kubelet/server/remotecommand/websocket.go b/pkg/kubelet/server/remotecommand/websocket.go index d8b9644e03..c60012b21f 100644 --- a/pkg/kubelet/server/remotecommand/websocket.go +++ b/pkg/kubelet/server/remotecommand/websocket.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apiserver/pkg/httplog" + "k8s.io/apiserver/pkg/server/httplog" "k8s.io/apiserver/pkg/util/wsstream" ) diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 0bad9ff591..76eb3ef13d 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -43,8 +43,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authorization/authorizer" - "k8s.io/apiserver/pkg/healthz" - "k8s.io/apiserver/pkg/httplog" + "k8s.io/apiserver/pkg/server/healthz" + "k8s.io/apiserver/pkg/server/httplog" "k8s.io/apiserver/pkg/util/flushwriter" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 6d1d41d1e0..61b9db77d0 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -49,7 +49,9 @@ go_library( "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", - "//pkg/genericapiserver:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master/thirdparty:go_default_library", "//pkg/master/tunneler:go_default_library", @@ -65,8 +67,6 @@ go_library( "//pkg/registry/core/service/ipallocator/controller:go_default_library", "//pkg/registry/core/service/portallocator/controller:go_default_library", "//pkg/registry/extensions/rest:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//pkg/registry/policy/rest:go_default_library", "//pkg/registry/rbac/rest:go_default_library", "//pkg/registry/storage/rest:go_default_library", @@ -82,7 +82,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) @@ -116,7 +116,7 @@ go_test( "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/util/intstr:go_default_library", @@ -132,7 +132,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/version", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/master/controller.go b/pkg/master/controller.go index dcde14046c..631dea6e20 100644 --- a/pkg/master/controller.go +++ b/pkg/master/controller.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/endpoints" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" - "k8s.io/kubernetes/pkg/genericapiserver" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" corerest "k8s.io/kubernetes/pkg/registry/core/rest" servicecontroller "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller" diff --git a/pkg/master/master.go b/pkg/master/master.go index 90e3cb86af..31cef28d77 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1" @@ -43,12 +43,12 @@ import ( storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" corev1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" - "k8s.io/kubernetes/pkg/genericapiserver" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/thirdparty" "k8s.io/kubernetes/pkg/master/tunneler" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/routes" nodeutil "k8s.io/kubernetes/pkg/util/node" diff --git a/pkg/master/master_openapi_test.go b/pkg/master/master_openapi_test.go index b0c44771e4..d4a557e7f8 100644 --- a/pkg/master/master_openapi_test.go +++ b/pkg/master/master_openapi_test.go @@ -28,7 +28,7 @@ import ( "testing" openapigen "k8s.io/kubernetes/pkg/generated/openapi" - "k8s.io/kubernetes/pkg/genericapiserver" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "github.com/go-openapi/loads" "github.com/go-openapi/spec" diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 6dc4ba9f84..cb262730c5 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -32,7 +32,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/version" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apiv1 "k8s.io/kubernetes/pkg/api/v1" @@ -49,7 +49,7 @@ import ( "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/restclient" - "k8s.io/kubernetes/pkg/genericapiserver" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" kubeversion "k8s.io/kubernetes/pkg/version" diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index 61c7c95cd1..6cea76968e 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -14,21 +14,21 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api:go_default_library", - "//pkg/genericapiserver/api/handlers:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/endpoints:go_default_library", + "//pkg/genericapiserver/endpoints/handlers:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/extensions/rest:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata/storage:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 746c14f5ef..6f8e06e95f 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -27,17 +27,17 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver" - genericapi "k8s.io/kubernetes/pkg/genericapiserver/api" - genericapihandlers "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + genericapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints" + genericapihandlers "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" thirdpartyresourcedatastore "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/storage" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage/storagebackend" ) diff --git a/pkg/registry/BUILD b/pkg/registry/BUILD index efb0f0a433..0a8ac4e278 100644 --- a/pkg/registry/BUILD +++ b/pkg/registry/BUILD @@ -69,7 +69,6 @@ filegroup( "//pkg/registry/extensions/rest:all-srcs", "//pkg/registry/extensions/thirdpartyresource:all-srcs", "//pkg/registry/extensions/thirdpartyresourcedata:all-srcs", - "//pkg/registry/generic:all-srcs", "//pkg/registry/policy/poddisruptionbudget:all-srcs", "//pkg/registry/policy/rest:all-srcs", "//pkg/registry/rbac:all-srcs", diff --git a/pkg/registry/apps/petset/BUILD b/pkg/registry/apps/petset/BUILD index c6ce956f87..0a67cc998c 100644 --- a/pkg/registry/apps/petset/BUILD +++ b/pkg/registry/apps/petset/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -39,7 +39,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/apps/petset/storage/BUILD b/pkg/registry/apps/petset/storage/BUILD index 27a4ceb959..4527373ee3 100644 --- a/pkg/registry/apps/petset/storage/BUILD +++ b/pkg/registry/apps/petset/storage/BUILD @@ -17,13 +17,13 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -33,13 +33,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/apps:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/apps/petset:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/apps/petset/storage/storage.go b/pkg/registry/apps/petset/storage/storage.go index b35fb45cc2..0c89049a93 100644 --- a/pkg/registry/apps/petset/storage/storage.go +++ b/pkg/registry/apps/petset/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" appsapi "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/apps/petset" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // rest implements a RESTStorage for replication controllers against etcd diff --git a/pkg/registry/apps/petset/storage/storage_test.go b/pkg/registry/apps/petset/storage/storage_test.go index 94b68b89c0..6764051eac 100644 --- a/pkg/registry/apps/petset/storage/storage_test.go +++ b/pkg/registry/apps/petset/storage/storage_test.go @@ -21,12 +21,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/apps/petset/strategy.go b/pkg/registry/apps/petset/strategy.go index 7155bbf8a0..06e7fc611c 100644 --- a/pkg/registry/apps/petset/strategy.go +++ b/pkg/registry/apps/petset/strategy.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/apps/petset/strategy_test.go b/pkg/registry/apps/petset/strategy_test.go index 2d8b610443..f5d7049e10 100644 --- a/pkg/registry/apps/petset/strategy_test.go +++ b/pkg/registry/apps/petset/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" ) diff --git a/pkg/registry/apps/rest/BUILD b/pkg/registry/apps/rest/BUILD index 38e9c29b1d..7efd8eb5b8 100644 --- a/pkg/registry/apps/rest/BUILD +++ b/pkg/registry/apps/rest/BUILD @@ -14,10 +14,10 @@ go_library( deps = [ "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/apps/petset/storage:go_default_library", - "//pkg/registry/generic:go_default_library", ], ) diff --git a/pkg/registry/apps/rest/storage_apps.go b/pkg/registry/apps/rest/storage_apps.go index 016eb096a6..7ff6a0ac50 100644 --- a/pkg/registry/apps/rest/storage_apps.go +++ b/pkg/registry/apps/rest/storage_apps.go @@ -19,10 +19,10 @@ package rest import ( "k8s.io/kubernetes/pkg/apis/apps" appsapiv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" statefulsetstore "k8s.io/kubernetes/pkg/registry/apps/petset/storage" - "k8s.io/kubernetes/pkg/registry/generic" ) type RESTStorageProvider struct{} diff --git a/pkg/registry/authentication/rest/BUILD b/pkg/registry/authentication/rest/BUILD index 0922d47750..27675333c6 100644 --- a/pkg/registry/authentication/rest/BUILD +++ b/pkg/registry/authentication/rest/BUILD @@ -14,10 +14,10 @@ go_library( deps = [ "//pkg/apis/authentication:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/authentication/tokenreview:go_default_library", - "//pkg/registry/generic:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", ], ) diff --git a/pkg/registry/authentication/rest/storage_authentication.go b/pkg/registry/authentication/rest/storage_authentication.go index 58537f9886..4f910622c8 100644 --- a/pkg/registry/authentication/rest/storage_authentication.go +++ b/pkg/registry/authentication/rest/storage_authentication.go @@ -20,10 +20,10 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/kubernetes/pkg/apis/authentication" authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/registry/authentication/tokenreview" - "k8s.io/kubernetes/pkg/registry/generic" ) type RESTStorageProvider struct { diff --git a/pkg/registry/authentication/tokenreview/BUILD b/pkg/registry/authentication/tokenreview/BUILD index f380d98f8b..0725452ed0 100644 --- a/pkg/registry/authentication/tokenreview/BUILD +++ b/pkg/registry/authentication/tokenreview/BUILD @@ -16,7 +16,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/authentication/tokenreview/storage.go b/pkg/registry/authentication/tokenreview/storage.go index 7f66911735..3c681ef9d2 100644 --- a/pkg/registry/authentication/tokenreview/storage.go +++ b/pkg/registry/authentication/tokenreview/storage.go @@ -23,7 +23,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authentication/authenticator" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/authentication" ) diff --git a/pkg/registry/authorization/localsubjectaccessreview/BUILD b/pkg/registry/authorization/localsubjectaccessreview/BUILD index ba4bff1c7c..78ace523a3 100644 --- a/pkg/registry/authorization/localsubjectaccessreview/BUILD +++ b/pkg/registry/authorization/localsubjectaccessreview/BUILD @@ -18,7 +18,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/authorization/localsubjectaccessreview/rest.go b/pkg/registry/authorization/localsubjectaccessreview/rest.go index 44532ccabb..379a42b96b 100644 --- a/pkg/registry/authorization/localsubjectaccessreview/rest.go +++ b/pkg/registry/authorization/localsubjectaccessreview/rest.go @@ -22,7 +22,7 @@ import ( kapierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation" authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util" diff --git a/pkg/registry/authorization/rest/BUILD b/pkg/registry/authorization/rest/BUILD index 666a15a9b3..2d91afa22c 100644 --- a/pkg/registry/authorization/rest/BUILD +++ b/pkg/registry/authorization/rest/BUILD @@ -14,12 +14,12 @@ go_library( deps = [ "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/authorization/localsubjectaccessreview:go_default_library", "//pkg/registry/authorization/selfsubjectaccessreview:go_default_library", "//pkg/registry/authorization/subjectaccessreview:go_default_library", - "//pkg/registry/generic:go_default_library", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/registry/authorization/rest/storage_authorization.go b/pkg/registry/authorization/rest/storage_authorization.go index 20cd2648a0..9310d69d81 100644 --- a/pkg/registry/authorization/rest/storage_authorization.go +++ b/pkg/registry/authorization/rest/storage_authorization.go @@ -20,12 +20,12 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/apis/authorization" authorizationv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/registry/authorization/localsubjectaccessreview" "k8s.io/kubernetes/pkg/registry/authorization/selfsubjectaccessreview" "k8s.io/kubernetes/pkg/registry/authorization/subjectaccessreview" - "k8s.io/kubernetes/pkg/registry/generic" ) type RESTStorageProvider struct { diff --git a/pkg/registry/authorization/selfsubjectaccessreview/BUILD b/pkg/registry/authorization/selfsubjectaccessreview/BUILD index ba4bff1c7c..78ace523a3 100644 --- a/pkg/registry/authorization/selfsubjectaccessreview/BUILD +++ b/pkg/registry/authorization/selfsubjectaccessreview/BUILD @@ -18,7 +18,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/authorization/selfsubjectaccessreview/rest.go b/pkg/registry/authorization/selfsubjectaccessreview/rest.go index 9a2d8ebefb..94b4c06d72 100644 --- a/pkg/registry/authorization/selfsubjectaccessreview/rest.go +++ b/pkg/registry/authorization/selfsubjectaccessreview/rest.go @@ -22,7 +22,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation" authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util" diff --git a/pkg/registry/authorization/subjectaccessreview/BUILD b/pkg/registry/authorization/subjectaccessreview/BUILD index ba4bff1c7c..78ace523a3 100644 --- a/pkg/registry/authorization/subjectaccessreview/BUILD +++ b/pkg/registry/authorization/subjectaccessreview/BUILD @@ -18,7 +18,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/authorization/subjectaccessreview/rest.go b/pkg/registry/authorization/subjectaccessreview/rest.go index 93aa33dd10..5b984b4c8b 100644 --- a/pkg/registry/authorization/subjectaccessreview/rest.go +++ b/pkg/registry/authorization/subjectaccessreview/rest.go @@ -22,7 +22,7 @@ import ( kapierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation" authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util" diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD index e913cb17ac..384da088eb 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD @@ -24,7 +24,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD index 06f446c8ef..c8c1a66ebd 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD @@ -18,7 +18,7 @@ go_test( "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -33,13 +33,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/autoscaling:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go index d9e14f4f0a..c5808938e3 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/autoscaling" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go index 8f720aef43..96e1556204 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" _ "k8s.io/kubernetes/pkg/apis/autoscaling/v1" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go b/pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go index 5b1a895a71..fcf730719b 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" diff --git a/pkg/registry/autoscaling/rest/BUILD b/pkg/registry/autoscaling/rest/BUILD index d6aa964aa5..9ce8efa8a6 100644 --- a/pkg/registry/autoscaling/rest/BUILD +++ b/pkg/registry/autoscaling/rest/BUILD @@ -14,10 +14,10 @@ go_library( deps = [ "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", - "//pkg/registry/generic:go_default_library", ], ) diff --git a/pkg/registry/autoscaling/rest/storage_autoscaling.go b/pkg/registry/autoscaling/rest/storage_autoscaling.go index 7d1cbc940c..58d9b414a5 100644 --- a/pkg/registry/autoscaling/rest/storage_autoscaling.go +++ b/pkg/registry/autoscaling/rest/storage_autoscaling.go @@ -19,10 +19,10 @@ package rest import ( "k8s.io/kubernetes/pkg/apis/autoscaling" autoscalingapiv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" horizontalpodautoscalerstore "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" - "k8s.io/kubernetes/pkg/registry/generic" ) type RESTStorageProvider struct{} diff --git a/pkg/registry/batch/cronjob/BUILD b/pkg/registry/batch/cronjob/BUILD index f1f59a2a80..f56de1a77c 100644 --- a/pkg/registry/batch/cronjob/BUILD +++ b/pkg/registry/batch/cronjob/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -40,7 +40,7 @@ go_test( "//pkg/api/testing:go_default_library", "//pkg/apis/batch:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/batch/cronjob/storage/BUILD b/pkg/registry/batch/cronjob/storage/BUILD index 3ce32529ea..6df5943d4e 100644 --- a/pkg/registry/batch/cronjob/storage/BUILD +++ b/pkg/registry/batch/cronjob/storage/BUILD @@ -19,7 +19,7 @@ go_test( "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -34,13 +34,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/batch/cronjob:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/batch/cronjob/storage/storage.go b/pkg/registry/batch/cronjob/storage/storage.go index be34c6a637..5a4091bcf8 100644 --- a/pkg/registry/batch/cronjob/storage/storage.go +++ b/pkg/registry/batch/cronjob/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/batch/cronjob" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // REST implements a RESTStorage for scheduled jobs against etcd diff --git a/pkg/registry/batch/cronjob/storage/storage_test.go b/pkg/registry/batch/cronjob/storage/storage_test.go index 9c1b045f69..e12b7b94d0 100644 --- a/pkg/registry/batch/cronjob/storage/storage_test.go +++ b/pkg/registry/batch/cronjob/storage/storage_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/batch/cronjob/strategy.go b/pkg/registry/batch/cronjob/strategy.go index e6ef0cdd04..b2609c012f 100644 --- a/pkg/registry/batch/cronjob/strategy.go +++ b/pkg/registry/batch/cronjob/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/batch/cronjob/strategy_test.go b/pkg/registry/batch/cronjob/strategy_test.go index 668daee862..2ad31e8b39 100644 --- a/pkg/registry/batch/cronjob/strategy_test.go +++ b/pkg/registry/batch/cronjob/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/apis/batch" diff --git a/pkg/registry/batch/job/BUILD b/pkg/registry/batch/job/BUILD index b9632ba5e9..cb68209d63 100644 --- a/pkg/registry/batch/job/BUILD +++ b/pkg/registry/batch/job/BUILD @@ -20,13 +20,13 @@ go_library( "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -43,7 +43,7 @@ go_test( "//pkg/apis/batch:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/batch/job/storage/BUILD b/pkg/registry/batch/job/storage/BUILD index 25f59ab567..ed47fcb607 100644 --- a/pkg/registry/batch/job/storage/BUILD +++ b/pkg/registry/batch/job/storage/BUILD @@ -17,7 +17,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -32,13 +32,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/batch/job:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/batch/job/storage/storage.go b/pkg/registry/batch/job/storage/storage.go index 01649b0240..00a188cd7c 100644 --- a/pkg/registry/batch/job/storage/storage.go +++ b/pkg/registry/batch/job/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/batch/job" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // JobStorage includes dummy storage for Job. diff --git a/pkg/registry/batch/job/storage/storage_test.go b/pkg/registry/batch/job/storage/storage_test.go index 03d96bccd7..a1e3b8b2ac 100644 --- a/pkg/registry/batch/job/storage/storage_test.go +++ b/pkg/registry/batch/job/storage/storage_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/batch/job/strategy.go b/pkg/registry/batch/job/strategy.go index cd01c8e9da..72ecb12fb6 100644 --- a/pkg/registry/batch/job/strategy.go +++ b/pkg/registry/batch/job/strategy.go @@ -24,13 +24,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/batch/job/strategy_test.go b/pkg/registry/batch/job/strategy_test.go index 651476730d..5c67d570a5 100644 --- a/pkg/registry/batch/job/strategy_test.go +++ b/pkg/registry/batch/job/strategy_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" diff --git a/pkg/registry/batch/rest/BUILD b/pkg/registry/batch/rest/BUILD index 53feeff642..046e59e02e 100644 --- a/pkg/registry/batch/rest/BUILD +++ b/pkg/registry/batch/rest/BUILD @@ -15,11 +15,11 @@ go_library( "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/batch/cronjob/storage:go_default_library", "//pkg/registry/batch/job/storage:go_default_library", - "//pkg/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", ], ) diff --git a/pkg/registry/batch/rest/storage_batch.go b/pkg/registry/batch/rest/storage_batch.go index 88cee3066a..4760af9b79 100644 --- a/pkg/registry/batch/rest/storage_batch.go +++ b/pkg/registry/batch/rest/storage_batch.go @@ -21,11 +21,11 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" batchapiv1 "k8s.io/kubernetes/pkg/apis/batch/v1" batchapiv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" cronjobstore "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage" jobstore "k8s.io/kubernetes/pkg/registry/batch/job/storage" - "k8s.io/kubernetes/pkg/registry/generic" ) type RESTStorageProvider struct{} diff --git a/pkg/registry/certificates/certificates/BUILD b/pkg/registry/certificates/certificates/BUILD index 52cef8aa08..1681801bbf 100644 --- a/pkg/registry/certificates/certificates/BUILD +++ b/pkg/registry/certificates/certificates/BUILD @@ -21,15 +21,15 @@ go_library( "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -44,7 +44,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/certificates/certificates/registry.go b/pkg/registry/certificates/certificates/registry.go index 94f9f9db4b..09738385ae 100644 --- a/pkg/registry/certificates/certificates/registry.go +++ b/pkg/registry/certificates/certificates/registry.go @@ -19,10 +19,10 @@ package certificates import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/certificates" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store CSRs. diff --git a/pkg/registry/certificates/certificates/storage/BUILD b/pkg/registry/certificates/certificates/storage/BUILD index 699ed0e399..4730f0b210 100644 --- a/pkg/registry/certificates/certificates/storage/BUILD +++ b/pkg/registry/certificates/certificates/storage/BUILD @@ -13,12 +13,12 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/certificates:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/certificates/certificates:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/certificates/certificates/storage/storage.go b/pkg/registry/certificates/certificates/storage/storage.go index ad70d45938..7b2c119bac 100644 --- a/pkg/registry/certificates/certificates/storage/storage.go +++ b/pkg/registry/certificates/certificates/storage/storage.go @@ -18,12 +18,12 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/certificates" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" csrregistry "k8s.io/kubernetes/pkg/registry/certificates/certificates" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // REST implements a RESTStorage for CertificateSigningRequest diff --git a/pkg/registry/certificates/certificates/strategy.go b/pkg/registry/certificates/certificates/strategy.go index 0b4d42f8b4..0c036b8748 100644 --- a/pkg/registry/certificates/certificates/strategy.go +++ b/pkg/registry/certificates/certificates/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/certificates/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/certificates/certificates/strategy_test.go b/pkg/registry/certificates/certificates/strategy_test.go index 7dacc7df84..57f2f471da 100644 --- a/pkg/registry/certificates/certificates/strategy_test.go +++ b/pkg/registry/certificates/certificates/strategy_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apiserver/pkg/authentication/user" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" certapi "k8s.io/kubernetes/pkg/apis/certificates" ) diff --git a/pkg/registry/certificates/rest/BUILD b/pkg/registry/certificates/rest/BUILD index 6291d07aec..177c4c12d5 100644 --- a/pkg/registry/certificates/rest/BUILD +++ b/pkg/registry/certificates/rest/BUILD @@ -14,10 +14,10 @@ go_library( deps = [ "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/v1alpha1:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/certificates/certificates/storage:go_default_library", - "//pkg/registry/generic:go_default_library", ], ) diff --git a/pkg/registry/certificates/rest/storage_certificates.go b/pkg/registry/certificates/rest/storage_certificates.go index 1cfee647f3..d1f909e60f 100644 --- a/pkg/registry/certificates/rest/storage_certificates.go +++ b/pkg/registry/certificates/rest/storage_certificates.go @@ -19,10 +19,10 @@ package rest import ( "k8s.io/kubernetes/pkg/apis/certificates" certificatesapiv1alpha1 "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" certificatestore "k8s.io/kubernetes/pkg/registry/certificates/certificates/storage" - "k8s.io/kubernetes/pkg/registry/generic" ) type RESTStorageProvider struct{} diff --git a/pkg/registry/core/componentstatus/BUILD b/pkg/registry/core/componentstatus/BUILD index dc281019df..bb1f391452 100644 --- a/pkg/registry/core/componentstatus/BUILD +++ b/pkg/registry/core/componentstatus/BUILD @@ -23,7 +23,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -40,7 +40,7 @@ go_test( "//pkg/probe:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/componentstatus/rest.go b/pkg/registry/core/componentstatus/rest.go index c0d0be566a..1ab8ea05ab 100644 --- a/pkg/registry/core/componentstatus/rest.go +++ b/pkg/registry/core/componentstatus/rest.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/probe" httpprober "k8s.io/kubernetes/pkg/probe/http" diff --git a/pkg/registry/core/componentstatus/rest_test.go b/pkg/registry/core/componentstatus/rest_test.go index f5e990cb41..1d505007fb 100644 --- a/pkg/registry/core/componentstatus/rest_test.go +++ b/pkg/registry/core/componentstatus/rest_test.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/diff" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/probe" ) diff --git a/pkg/registry/core/configmap/BUILD b/pkg/registry/core/configmap/BUILD index 90bec9ec25..cd8e9f20f6 100644 --- a/pkg/registry/core/configmap/BUILD +++ b/pkg/registry/core/configmap/BUILD @@ -20,15 +20,15 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -42,7 +42,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/configmap/registry.go b/pkg/registry/core/configmap/registry.go index 0367dbb292..62e1497d5b 100644 --- a/pkg/registry/core/configmap/registry.go +++ b/pkg/registry/core/configmap/registry.go @@ -19,9 +19,9 @@ package configmap import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ConfigMaps. diff --git a/pkg/registry/core/configmap/storage/BUILD b/pkg/registry/core/configmap/storage/BUILD index 990a286135..507652ca4d 100644 --- a/pkg/registry/core/configmap/storage/BUILD +++ b/pkg/registry/core/configmap/storage/BUILD @@ -16,7 +16,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -31,9 +31,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/core/configmap:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/core/configmap/storage/storage.go b/pkg/registry/core/configmap/storage/storage.go index ee3edd8242..7ab07af21e 100644 --- a/pkg/registry/core/configmap/storage/storage.go +++ b/pkg/registry/core/configmap/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/core/configmap" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // REST implements a RESTStorage for ConfigMap diff --git a/pkg/registry/core/configmap/storage/storage_test.go b/pkg/registry/core/configmap/storage/storage_test.go index 2755f62671..e7ba2b00c4 100644 --- a/pkg/registry/core/configmap/storage/storage_test.go +++ b/pkg/registry/core/configmap/storage/storage_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/configmap/strategy.go b/pkg/registry/core/configmap/strategy.go index 2c9bf186e9..a80000fdde 100644 --- a/pkg/registry/core/configmap/strategy.go +++ b/pkg/registry/core/configmap/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/configmap/strategy_test.go b/pkg/registry/core/configmap/strategy_test.go index 9e5934b0d3..03ff8ae181 100644 --- a/pkg/registry/core/configmap/strategy_test.go +++ b/pkg/registry/core/configmap/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) diff --git a/pkg/registry/core/controller/BUILD b/pkg/registry/core/controller/BUILD index bf3c0e70bb..617dbc6f70 100644 --- a/pkg/registry/core/controller/BUILD +++ b/pkg/registry/core/controller/BUILD @@ -20,15 +20,15 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -42,7 +42,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/controller/registry.go b/pkg/registry/core/controller/registry.go index f928b13c87..38329a9273 100644 --- a/pkg/registry/core/controller/registry.go +++ b/pkg/registry/core/controller/registry.go @@ -23,9 +23,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ReplicationControllers. diff --git a/pkg/registry/core/controller/storage/BUILD b/pkg/registry/core/controller/storage/BUILD index f9ef8378e2..c210062292 100644 --- a/pkg/registry/core/controller/storage/BUILD +++ b/pkg/registry/core/controller/storage/BUILD @@ -17,8 +17,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -26,7 +26,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -38,15 +38,15 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/validation:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/controller:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/controller/storage/storage.go b/pkg/registry/core/controller/storage/storage.go index b3b69a1cd2..5f36b1d45c 100644 --- a/pkg/registry/core/controller/storage/storage.go +++ b/pkg/registry/core/controller/storage/storage.go @@ -25,14 +25,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling/validation" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/controller" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // ControllerStorage includes dummy storage for Replication Controllers and for Scale subresource. diff --git a/pkg/registry/core/controller/storage/storage_test.go b/pkg/registry/core/controller/storage/storage_test.go index eedacce53e..da5cec5bab 100644 --- a/pkg/registry/core/controller/storage/storage_test.go +++ b/pkg/registry/core/controller/storage/storage_test.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/controller/strategy.go b/pkg/registry/core/controller/strategy.go index 1a4fc39ede..bea21b85f1 100644 --- a/pkg/registry/core/controller/strategy.go +++ b/pkg/registry/core/controller/strategy.go @@ -26,13 +26,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/controller/strategy_test.go b/pkg/registry/core/controller/strategy_test.go index ec0ebc48e7..d60dcee1dd 100644 --- a/pkg/registry/core/controller/strategy_test.go +++ b/pkg/registry/core/controller/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) diff --git a/pkg/registry/core/endpoint/BUILD b/pkg/registry/core/endpoint/BUILD index 4dbc191594..77166ff98a 100644 --- a/pkg/registry/core/endpoint/BUILD +++ b/pkg/registry/core/endpoint/BUILD @@ -21,15 +21,15 @@ go_library( "//pkg/api/endpoints:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/core/endpoint/registry.go b/pkg/registry/core/endpoint/registry.go index 845ded3cf6..5a2aab16d7 100644 --- a/pkg/registry/core/endpoint/registry.go +++ b/pkg/registry/core/endpoint/registry.go @@ -19,9 +19,9 @@ package endpoint import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store endpoints. diff --git a/pkg/registry/core/endpoint/storage/BUILD b/pkg/registry/core/endpoint/storage/BUILD index 6cb7adae02..f176fbfd0c 100644 --- a/pkg/registry/core/endpoint/storage/BUILD +++ b/pkg/registry/core/endpoint/storage/BUILD @@ -16,7 +16,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -31,9 +31,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/core/endpoint:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/core/endpoint/storage/storage.go b/pkg/registry/core/endpoint/storage/storage.go index ec5fa18a9a..875817d4b5 100644 --- a/pkg/registry/core/endpoint/storage/storage.go +++ b/pkg/registry/core/endpoint/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/core/endpoint" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/endpoint/storage/storage_test.go b/pkg/registry/core/endpoint/storage/storage_test.go index 8a3ce3f08e..aec9a14004 100644 --- a/pkg/registry/core/endpoint/storage/storage_test.go +++ b/pkg/registry/core/endpoint/storage/storage_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/endpoint/strategy.go b/pkg/registry/core/endpoint/strategy.go index d5203f5685..41b9499244 100644 --- a/pkg/registry/core/endpoint/strategy.go +++ b/pkg/registry/core/endpoint/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" endptspkg "k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" pkgstorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/event/BUILD b/pkg/registry/core/event/BUILD index 08723d2847..818591675b 100644 --- a/pkg/registry/core/event/BUILD +++ b/pkg/registry/core/event/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/core/event/storage/BUILD b/pkg/registry/core/event/storage/BUILD index d09e4eaeae..5dbfca473b 100644 --- a/pkg/registry/core/event/storage/BUILD +++ b/pkg/registry/core/event/storage/BUILD @@ -15,7 +15,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -29,9 +29,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/core/event:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/core/event/storage/storage.go b/pkg/registry/core/event/storage/storage.go index 8583607651..ff5222bd8a 100644 --- a/pkg/registry/core/event/storage/storage.go +++ b/pkg/registry/core/event/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/core/event" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/event/storage/storage_test.go b/pkg/registry/core/event/storage/storage_test.go index 1abeb2412d..b804225766 100644 --- a/pkg/registry/core/event/storage/storage_test.go +++ b/pkg/registry/core/event/storage/storage_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/event/strategy.go b/pkg/registry/core/event/strategy.go index 9ce61daf8d..4bdde6238b 100644 --- a/pkg/registry/core/event/strategy.go +++ b/pkg/registry/core/event/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/limitrange/BUILD b/pkg/registry/core/limitrange/BUILD index 7c1853fd6b..4f794a78a5 100644 --- a/pkg/registry/core/limitrange/BUILD +++ b/pkg/registry/core/limitrange/BUILD @@ -24,7 +24,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/core/limitrange/storage/BUILD b/pkg/registry/core/limitrange/storage/BUILD index af39ad17b1..cc43ece74d 100644 --- a/pkg/registry/core/limitrange/storage/BUILD +++ b/pkg/registry/core/limitrange/storage/BUILD @@ -17,7 +17,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -32,9 +32,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/core/limitrange:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/core/limitrange/storage/storage.go b/pkg/registry/core/limitrange/storage/storage.go index 299df9b280..d0ce011fe5 100644 --- a/pkg/registry/core/limitrange/storage/storage.go +++ b/pkg/registry/core/limitrange/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/core/limitrange" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/limitrange/storage/storage_test.go b/pkg/registry/core/limitrange/storage/storage_test.go index d3a4375f4b..a5be4793e3 100644 --- a/pkg/registry/core/limitrange/storage/storage_test.go +++ b/pkg/registry/core/limitrange/storage/storage_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/limitrange/strategy.go b/pkg/registry/core/limitrange/strategy.go index aae6fa0a2c..ec7f445a97 100644 --- a/pkg/registry/core/limitrange/strategy.go +++ b/pkg/registry/core/limitrange/strategy.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" diff --git a/pkg/registry/core/namespace/BUILD b/pkg/registry/core/namespace/BUILD index 5ac9c3eb05..a1dafd9871 100644 --- a/pkg/registry/core/namespace/BUILD +++ b/pkg/registry/core/namespace/BUILD @@ -20,15 +20,15 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -42,7 +42,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/namespace/registry.go b/pkg/registry/core/namespace/registry.go index a0b1bd2819..9361b6f30a 100644 --- a/pkg/registry/core/namespace/registry.go +++ b/pkg/registry/core/namespace/registry.go @@ -19,9 +19,9 @@ package namespace import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store Namespace objects. diff --git a/pkg/registry/core/namespace/storage/BUILD b/pkg/registry/core/namespace/storage/BUILD index 2254c15eff..90a44db8db 100644 --- a/pkg/registry/core/namespace/storage/BUILD +++ b/pkg/registry/core/namespace/storage/BUILD @@ -16,12 +16,12 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -32,15 +32,15 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/namespace:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/namespace/storage/storage.go b/pkg/registry/core/namespace/storage/storage.go index ab05b0d8ff..d6854bb957 100644 --- a/pkg/registry/core/namespace/storage/storage.go +++ b/pkg/registry/core/namespace/storage/storage.go @@ -22,13 +22,13 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" storageerr "k8s.io/kubernetes/pkg/api/errors/storage" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/namespace" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/namespace/storage/storage_test.go b/pkg/registry/core/namespace/storage/storage_test.go index f5ff06d96d..19d89a72cc 100644 --- a/pkg/registry/core/namespace/storage/storage_test.go +++ b/pkg/registry/core/namespace/storage/storage_test.go @@ -21,10 +21,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/namespace/strategy.go b/pkg/registry/core/namespace/strategy.go index c5d700522a..febbcf78f7 100644 --- a/pkg/registry/core/namespace/strategy.go +++ b/pkg/registry/core/namespace/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/namespace/strategy_test.go b/pkg/registry/core/namespace/strategy_test.go index e47565a724..37691ac720 100644 --- a/pkg/registry/core/namespace/strategy_test.go +++ b/pkg/registry/core/namespace/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) diff --git a/pkg/registry/core/node/BUILD b/pkg/registry/core/node/BUILD index 3e7ae6ba5e..f2a8c4a95e 100644 --- a/pkg/registry/core/node/BUILD +++ b/pkg/registry/core/node/BUILD @@ -20,9 +20,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -32,7 +32,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/core/node/registry.go b/pkg/registry/core/node/registry.go index d2a1be1142..e903f973cb 100644 --- a/pkg/registry/core/node/registry.go +++ b/pkg/registry/core/node/registry.go @@ -19,9 +19,9 @@ package node import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store node. diff --git a/pkg/registry/core/node/rest/BUILD b/pkg/registry/core/node/rest/BUILD index e550aed4d5..0162d0fcd2 100644 --- a/pkg/registry/core/node/rest/BUILD +++ b/pkg/registry/core/node/rest/BUILD @@ -14,13 +14,13 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/capabilities:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/node:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//pkg/registry/generic/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/node/rest/proxy.go b/pkg/registry/core/node/rest/proxy.go index 8e1e778693..5195707e1e 100644 --- a/pkg/registry/core/node/rest/proxy.go +++ b/pkg/registry/core/node/rest/proxy.go @@ -23,14 +23,14 @@ import ( "path" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/capabilities" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/node" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" - genericrest "k8s.io/kubernetes/pkg/registry/generic/rest" ) // ProxyREST implements the proxy subresource for a Node diff --git a/pkg/registry/core/node/storage/BUILD b/pkg/registry/core/node/storage/BUILD index f5685eafb5..42c22f22dd 100644 --- a/pkg/registry/core/node/storage/BUILD +++ b/pkg/registry/core/node/storage/BUILD @@ -17,8 +17,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/kubelet/client:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -34,15 +34,15 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/node:go_default_library", "//pkg/registry/core/node/rest:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/node/storage/storage.go b/pkg/registry/core/node/storage/storage.go index c6882c3374..d76ee3df5a 100644 --- a/pkg/registry/core/node/storage/storage.go +++ b/pkg/registry/core/node/storage/storage.go @@ -23,15 +23,15 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/node" noderest "k8s.io/kubernetes/pkg/registry/core/node/rest" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // NodeStorage includes storage for nodes and all sub resources diff --git a/pkg/registry/core/node/storage/storage_test.go b/pkg/registry/core/node/storage/storage_test.go index 7a88b61b72..09adc23948 100644 --- a/pkg/registry/core/node/storage/storage_test.go +++ b/pkg/registry/core/node/storage/storage_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/node/strategy.go b/pkg/registry/core/node/strategy.go index d977ee2e32..8ad3a940c8 100644 --- a/pkg/registry/core/node/strategy.go +++ b/pkg/registry/core/node/strategy.go @@ -29,13 +29,13 @@ import ( "k8s.io/apimachinery/pkg/types" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/registry/generic" pkgstorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/persistentvolume/BUILD b/pkg/registry/core/persistentvolume/BUILD index 882315a325..a30471d941 100644 --- a/pkg/registry/core/persistentvolume/BUILD +++ b/pkg/registry/core/persistentvolume/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/core/persistentvolume/storage/BUILD b/pkg/registry/core/persistentvolume/storage/BUILD index 9d2bc4506d..ed5562f78e 100644 --- a/pkg/registry/core/persistentvolume/storage/BUILD +++ b/pkg/registry/core/persistentvolume/storage/BUILD @@ -17,15 +17,15 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -35,13 +35,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/persistentvolume:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/persistentvolume/storage/storage.go b/pkg/registry/core/persistentvolume/storage/storage.go index 693072b876..cb22e33d6d 100644 --- a/pkg/registry/core/persistentvolume/storage/storage.go +++ b/pkg/registry/core/persistentvolume/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/persistentvolume" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/persistentvolume/storage/storage_test.go b/pkg/registry/core/persistentvolume/storage/storage_test.go index 7ff7709e8e..a2f5ee3738 100644 --- a/pkg/registry/core/persistentvolume/storage/storage_test.go +++ b/pkg/registry/core/persistentvolume/storage/storage_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/persistentvolume/strategy.go b/pkg/registry/core/persistentvolume/strategy.go index fcf36cd2cd..c381876df0 100644 --- a/pkg/registry/core/persistentvolume/strategy.go +++ b/pkg/registry/core/persistentvolume/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/persistentvolumeclaim/BUILD b/pkg/registry/core/persistentvolumeclaim/BUILD index 1cf12f7f1d..2bee5fdcae 100644 --- a/pkg/registry/core/persistentvolumeclaim/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/core/persistentvolumeclaim/storage/BUILD b/pkg/registry/core/persistentvolumeclaim/storage/BUILD index 7981c4c1bc..a9081d1e1c 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/storage/BUILD @@ -17,15 +17,15 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -35,13 +35,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/persistentvolumeclaim:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/persistentvolumeclaim/storage/storage.go b/pkg/registry/core/persistentvolumeclaim/storage/storage.go index 775416b68f..239d9775fe 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go index 3b79dc42d7..78d82f3cf9 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/persistentvolumeclaim/strategy.go b/pkg/registry/core/persistentvolumeclaim/strategy.go index bb039cc8ea..25bc845fdb 100644 --- a/pkg/registry/core/persistentvolumeclaim/strategy.go +++ b/pkg/registry/core/persistentvolumeclaim/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/pod/BUILD b/pkg/registry/core/pod/BUILD index 0ae9227cf7..6940247b0d 100644 --- a/pkg/registry/core/pod/BUILD +++ b/pkg/registry/core/pod/BUILD @@ -19,9 +19,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/kubelet/qos:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -30,7 +30,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -49,7 +49,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/pod/rest/BUILD b/pkg/registry/core/pod/rest/BUILD index 3c3208819e..b81f667df8 100644 --- a/pkg/registry/core/pod/rest/BUILD +++ b/pkg/registry/core/pod/rest/BUILD @@ -19,14 +19,14 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/capabilities:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/pod:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//pkg/registry/generic/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -37,11 +37,11 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/pod/rest/log.go b/pkg/registry/core/pod/rest/log.go index 87911e097c..ded62e4c09 100644 --- a/pkg/registry/core/pod/rest/log.go +++ b/pkg/registry/core/pod/rest/log.go @@ -21,14 +21,14 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" - genericrest "k8s.io/kubernetes/pkg/registry/generic/rest" ) // LogREST implements the log endpoint for a Pod diff --git a/pkg/registry/core/pod/rest/log_test.go b/pkg/registry/core/pod/rest/log_test.go index 7486e00958..9e2a2d77d9 100644 --- a/pkg/registry/core/pod/rest/log_test.go +++ b/pkg/registry/core/pod/rest/log_test.go @@ -20,10 +20,10 @@ import ( "testing" "k8s.io/apimachinery/pkg/api/errors" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/core/pod/rest/subresources.go b/pkg/registry/core/pod/rest/subresources.go index 47b2cdbb6e..9534d99538 100644 --- a/pkg/registry/core/pod/rest/subresources.go +++ b/pkg/registry/core/pod/rest/subresources.go @@ -23,14 +23,14 @@ import ( "path" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/capabilities" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" - genericrest "k8s.io/kubernetes/pkg/registry/generic/rest" ) // ProxyREST implements the proxy subresource for a Pod diff --git a/pkg/registry/core/pod/storage/BUILD b/pkg/registry/core/pod/storage/BUILD index 65306dc2c3..4d9055a4fd 100644 --- a/pkg/registry/core/pod/storage/BUILD +++ b/pkg/registry/core/pod/storage/BUILD @@ -17,8 +17,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/securitycontext:go_default_library", "//pkg/storage:go_default_library", @@ -29,7 +29,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -47,19 +47,19 @@ go_library( "//pkg/apis/policy:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/client/retry:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/pod:go_default_library", "//pkg/registry/core/pod/rest:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/pod/storage/eviction.go b/pkg/registry/core/pod/storage/eviction.go index 60a63b9db7..5b4852c262 100644 --- a/pkg/registry/core/pod/storage/eviction.go +++ b/pkg/registry/core/pod/storage/eviction.go @@ -25,13 +25,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/client/retry" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) const ( diff --git a/pkg/registry/core/pod/storage/storage.go b/pkg/registry/core/pod/storage/storage.go index 48d56ea077..2af4220fb3 100644 --- a/pkg/registry/core/pod/storage/storage.go +++ b/pkg/registry/core/pod/storage/storage.go @@ -24,17 +24,17 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/validation" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" podrest "k8s.io/kubernetes/pkg/registry/core/pod/rest" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/pod/storage/storage_test.go b/pkg/registry/core/pod/storage/storage_test.go index 8e68929f21..7958195d16 100644 --- a/pkg/registry/core/pod/storage/storage_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -26,12 +26,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/securitycontext" "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/core/pod/strategy.go b/pkg/registry/core/pod/strategy.go index 9b38843742..5b01082957 100644 --- a/pkg/registry/core/pod/strategy.go +++ b/pkg/registry/core/pod/strategy.go @@ -32,14 +32,14 @@ import ( "k8s.io/apimachinery/pkg/types" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/kubelet/qos" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/pod/strategy_test.go b/pkg/registry/core/pod/strategy_test.go index c11962cd74..5e67fd2adb 100644 --- a/pkg/registry/core/pod/strategy_test.go +++ b/pkg/registry/core/pod/strategy_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" apitesting "k8s.io/kubernetes/pkg/api/testing" diff --git a/pkg/registry/core/podtemplate/BUILD b/pkg/registry/core/podtemplate/BUILD index 5610976fa0..7562abce47 100644 --- a/pkg/registry/core/podtemplate/BUILD +++ b/pkg/registry/core/podtemplate/BUILD @@ -23,7 +23,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/core/podtemplate/storage/BUILD b/pkg/registry/core/podtemplate/storage/BUILD index 72bcd490b7..4a0dea9f64 100644 --- a/pkg/registry/core/podtemplate/storage/BUILD +++ b/pkg/registry/core/podtemplate/storage/BUILD @@ -16,7 +16,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -31,9 +31,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/core/podtemplate:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/core/podtemplate/storage/storage.go b/pkg/registry/core/podtemplate/storage/storage.go index 3c75f73433..bb548e1202 100644 --- a/pkg/registry/core/podtemplate/storage/storage.go +++ b/pkg/registry/core/podtemplate/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/core/podtemplate" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/podtemplate/storage/storage_test.go b/pkg/registry/core/podtemplate/storage/storage_test.go index 34b21ed339..0cf1bd9d8b 100644 --- a/pkg/registry/core/podtemplate/storage/storage_test.go +++ b/pkg/registry/core/podtemplate/storage/storage_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/podtemplate/strategy.go b/pkg/registry/core/podtemplate/strategy.go index 8c6f403e7e..b567ef27e1 100644 --- a/pkg/registry/core/podtemplate/strategy.go +++ b/pkg/registry/core/podtemplate/strategy.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" diff --git a/pkg/registry/core/resourcequota/BUILD b/pkg/registry/core/resourcequota/BUILD index 66de72918e..305f57478a 100644 --- a/pkg/registry/core/resourcequota/BUILD +++ b/pkg/registry/core/resourcequota/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -39,7 +39,7 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/resourcequota/storage/BUILD b/pkg/registry/core/resourcequota/storage/BUILD index 8d210a736b..74e44014c5 100644 --- a/pkg/registry/core/resourcequota/storage/BUILD +++ b/pkg/registry/core/resourcequota/storage/BUILD @@ -17,14 +17,14 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -34,13 +34,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/resourcequota:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/resourcequota/storage/storage.go b/pkg/registry/core/resourcequota/storage/storage.go index 1a9baf273e..c0f37c2d20 100644 --- a/pkg/registry/core/resourcequota/storage/storage.go +++ b/pkg/registry/core/resourcequota/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/resourcequota" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/resourcequota/storage/storage_test.go b/pkg/registry/core/resourcequota/storage/storage_test.go index a73fd95dd6..8ffd106a11 100644 --- a/pkg/registry/core/resourcequota/storage/storage_test.go +++ b/pkg/registry/core/resourcequota/storage/storage_test.go @@ -22,12 +22,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/diff" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/resourcequota/strategy.go b/pkg/registry/core/resourcequota/strategy.go index 5611d61864..5a03436eb8 100644 --- a/pkg/registry/core/resourcequota/strategy.go +++ b/pkg/registry/core/resourcequota/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/resourcequota/strategy_test.go b/pkg/registry/core/resourcequota/strategy_test.go index d9ccf22203..66512aff44 100644 --- a/pkg/registry/core/resourcequota/strategy_test.go +++ b/pkg/registry/core/resourcequota/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" apitesting "k8s.io/kubernetes/pkg/api/testing" diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index 58d53aebe0..eab805776a 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -27,8 +27,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/registry/core/componentstatus:go_default_library", @@ -54,7 +55,6 @@ go_library( "//pkg/registry/core/service/portallocator:go_default_library", "//pkg/registry/core/service/storage:go_default_library", "//pkg/registry/core/serviceaccount/storage:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/storage/etcd/util:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go index d2f856dd72..c90eec160e 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -32,8 +32,9 @@ import ( "k8s.io/kubernetes/pkg/api" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/client/restclient" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/registry/core/componentstatus" @@ -59,7 +60,6 @@ import ( "k8s.io/kubernetes/pkg/registry/core/service/portallocator" servicestore "k8s.io/kubernetes/pkg/registry/core/service/storage" serviceaccountstore "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage" - "k8s.io/kubernetes/pkg/registry/generic" etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" ) diff --git a/pkg/registry/core/secret/BUILD b/pkg/registry/core/secret/BUILD index 4358b096dd..ae08d46fdd 100644 --- a/pkg/registry/core/secret/BUILD +++ b/pkg/registry/core/secret/BUILD @@ -20,8 +20,8 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -29,7 +29,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -44,7 +44,7 @@ go_test( "//pkg/api/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/secret/registry.go b/pkg/registry/core/secret/registry.go index 770eafe521..db75679b43 100644 --- a/pkg/registry/core/secret/registry.go +++ b/pkg/registry/core/secret/registry.go @@ -19,9 +19,9 @@ package secret import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store Secret objects. diff --git a/pkg/registry/core/secret/storage/BUILD b/pkg/registry/core/secret/storage/BUILD index 6aae383d50..74b2524456 100644 --- a/pkg/registry/core/secret/storage/BUILD +++ b/pkg/registry/core/secret/storage/BUILD @@ -16,7 +16,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -31,9 +31,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/core/secret:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/core/secret/storage/storage.go b/pkg/registry/core/secret/storage/storage.go index 02ece0a7f5..1f4c7a5b76 100644 --- a/pkg/registry/core/secret/storage/storage.go +++ b/pkg/registry/core/secret/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/core/secret" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/secret/storage/storage_test.go b/pkg/registry/core/secret/storage/storage_test.go index 09c7b39811..cf8a405cac 100644 --- a/pkg/registry/core/secret/storage/storage_test.go +++ b/pkg/registry/core/secret/storage/storage_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/secret/strategy.go b/pkg/registry/core/secret/strategy.go index 8a1136e53f..c97f868a52 100644 --- a/pkg/registry/core/secret/strategy.go +++ b/pkg/registry/core/secret/strategy.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/secret/strategy_test.go b/pkg/registry/core/secret/strategy_test.go index ec4e95ab87..f021be5d64 100644 --- a/pkg/registry/core/secret/strategy_test.go +++ b/pkg/registry/core/secret/strategy_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) diff --git a/pkg/registry/core/service/BUILD b/pkg/registry/core/service/BUILD index f71d17265d..8ee74fd372 100644 --- a/pkg/registry/core/service/BUILD +++ b/pkg/registry/core/service/BUILD @@ -24,12 +24,12 @@ go_library( "//pkg/api/validation:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/endpoint:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/rest:go_default_library", "//pkg/storage:go_default_library", "//pkg/util/config:go_default_library", "//vendor:github.com/golang/glog", @@ -41,7 +41,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -58,7 +58,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/service:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -68,7 +68,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/service/allocator/storage/BUILD b/pkg/registry/core/service/allocator/storage/BUILD index 4620b685a7..4362a93e00 100644 --- a/pkg/registry/core/service/allocator/storage/BUILD +++ b/pkg/registry/core/service/allocator/storage/BUILD @@ -30,9 +30,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/core/rangeallocation:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//pkg/storage/storagebackend:go_default_library", "//vendor:golang.org/x/net/context", diff --git a/pkg/registry/core/service/allocator/storage/storage.go b/pkg/registry/core/service/allocator/storage/storage.go index 64be54e9ef..eb488c07cf 100644 --- a/pkg/registry/core/service/allocator/storage/storage.go +++ b/pkg/registry/core/service/allocator/storage/storage.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" "k8s.io/kubernetes/pkg/registry/core/service/allocator" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/storage/storagebackend" diff --git a/pkg/registry/core/service/ipallocator/storage/BUILD b/pkg/registry/core/service/ipallocator/storage/BUILD index 3eebe88522..5f7d7f36df 100644 --- a/pkg/registry/core/service/ipallocator/storage/BUILD +++ b/pkg/registry/core/service/ipallocator/storage/BUILD @@ -15,10 +15,10 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", "//pkg/registry/core/service/allocator/storage:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", - "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage:go_default_library", "//pkg/storage/etcd/testing:go_default_library", diff --git a/pkg/registry/core/service/ipallocator/storage/storage_test.go b/pkg/registry/core/service/ipallocator/storage/storage_test.go index 94f002cb91..3a50a1bf8e 100644 --- a/pkg/registry/core/service/ipallocator/storage/storage_test.go +++ b/pkg/registry/core/service/ipallocator/storage/storage_test.go @@ -22,10 +22,10 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/core/service/allocator" allocatorstore "k8s.io/kubernetes/pkg/registry/core/service/allocator/storage" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/storage" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/core/service/proxy.go b/pkg/registry/core/service/proxy.go index 1d741bc4c5..bb65050db8 100644 --- a/pkg/registry/core/service/proxy.go +++ b/pkg/registry/core/service/proxy.go @@ -23,11 +23,11 @@ import ( "path" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/capabilities" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - genericrest "k8s.io/kubernetes/pkg/registry/generic/rest" + genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // ProxyREST implements the proxy subresource for a Service diff --git a/pkg/registry/core/service/registry.go b/pkg/registry/core/service/registry.go index 665f77619f..6162c6f71b 100644 --- a/pkg/registry/core/service/registry.go +++ b/pkg/registry/core/service/registry.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store services. diff --git a/pkg/registry/core/service/rest.go b/pkg/registry/core/service/rest.go index 22b2990ffd..176789fc24 100644 --- a/pkg/registry/core/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -32,11 +32,11 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" apiservice "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/endpoint" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" diff --git a/pkg/registry/core/service/rest_test.go b/pkg/registry/core/service/rest_test.go index be3b171785..fabed35d24 100644 --- a/pkg/registry/core/service/rest_test.go +++ b/pkg/registry/core/service/rest_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilnet "k8s.io/apimachinery/pkg/util/net" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/service" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/registry/registrytest" diff --git a/pkg/registry/core/service/storage/BUILD b/pkg/registry/core/service/storage/BUILD index af36b1c413..12db7f6dda 100644 --- a/pkg/registry/core/service/storage/BUILD +++ b/pkg/registry/core/service/storage/BUILD @@ -16,7 +16,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/util/intstr:go_default_library", @@ -32,13 +32,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/service:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/core/service/storage/storage.go b/pkg/registry/core/service/storage/storage.go index bf5f115d61..00be8e8b1d 100644 --- a/pkg/registry/core/service/storage/storage.go +++ b/pkg/registry/core/service/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/service" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/service/storage/storage_test.go b/pkg/registry/core/service/storage/storage_test.go index 79e99562f0..7a6d5fb19d 100644 --- a/pkg/registry/core/service/storage/storage_test.go +++ b/pkg/registry/core/service/storage/storage_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/registry/core/service/strategy.go b/pkg/registry/core/service/strategy.go index c65b2b2abe..4e7a799e85 100644 --- a/pkg/registry/core/service/strategy.go +++ b/pkg/registry/core/service/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go index b6b04b37dd..d92e748f3b 100644 --- a/pkg/registry/core/service/strategy_test.go +++ b/pkg/registry/core/service/strategy_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/registry/core/serviceaccount/BUILD b/pkg/registry/core/serviceaccount/BUILD index 2473032021..b01333886e 100644 --- a/pkg/registry/core/serviceaccount/BUILD +++ b/pkg/registry/core/serviceaccount/BUILD @@ -20,15 +20,15 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/core/serviceaccount/registry.go b/pkg/registry/core/serviceaccount/registry.go index 097c5c0dfd..dddb9cebc8 100644 --- a/pkg/registry/core/serviceaccount/registry.go +++ b/pkg/registry/core/serviceaccount/registry.go @@ -19,9 +19,9 @@ package serviceaccount import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store ServiceAccount objects. diff --git a/pkg/registry/core/serviceaccount/storage/BUILD b/pkg/registry/core/serviceaccount/storage/BUILD index 3c40d1d234..5b5e187baa 100644 --- a/pkg/registry/core/serviceaccount/storage/BUILD +++ b/pkg/registry/core/serviceaccount/storage/BUILD @@ -16,7 +16,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -31,9 +31,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/core/serviceaccount:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/core/serviceaccount/storage/storage.go b/pkg/registry/core/serviceaccount/storage/storage.go index ecdd4f5da6..65b671c088 100644 --- a/pkg/registry/core/serviceaccount/storage/storage.go +++ b/pkg/registry/core/serviceaccount/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/core/serviceaccount" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) type REST struct { diff --git a/pkg/registry/core/serviceaccount/storage/storage_test.go b/pkg/registry/core/serviceaccount/storage/storage_test.go index d652ca96f8..46a4d36b00 100644 --- a/pkg/registry/core/serviceaccount/storage/storage_test.go +++ b/pkg/registry/core/serviceaccount/storage/storage_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/core/serviceaccount/strategy.go b/pkg/registry/core/serviceaccount/strategy.go index 044ffa23f9..4c15d6333f 100644 --- a/pkg/registry/core/serviceaccount/strategy.go +++ b/pkg/registry/core/serviceaccount/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/controller/storage/BUILD b/pkg/registry/extensions/controller/storage/BUILD index a2740c0080..c272bcddac 100644 --- a/pkg/registry/extensions/controller/storage/BUILD +++ b/pkg/registry/extensions/controller/storage/BUILD @@ -16,14 +16,14 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/storage/storagebackend/factory:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -35,14 +35,14 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/controller:go_default_library", "//pkg/registry/core/controller/storage:go_default_library", - "//pkg/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/controller/storage/storage.go b/pkg/registry/extensions/controller/storage/storage.go index ae480bde2a..6ee7705999 100644 --- a/pkg/registry/extensions/controller/storage/storage.go +++ b/pkg/registry/extensions/controller/storage/storage.go @@ -22,14 +22,14 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/controller" controllerstore "k8s.io/kubernetes/pkg/registry/core/controller/storage" - "k8s.io/kubernetes/pkg/registry/generic" ) // Container includes dummy storage for RC pods and experimental storage for Scale. diff --git a/pkg/registry/extensions/controller/storage/storage_test.go b/pkg/registry/extensions/controller/storage/storage_test.go index 7ef4daa88e..19a753ce94 100644 --- a/pkg/registry/extensions/controller/storage/storage_test.go +++ b/pkg/registry/extensions/controller/storage/storage_test.go @@ -20,11 +20,11 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/storage" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/extensions/daemonset/BUILD b/pkg/registry/extensions/daemonset/BUILD index 63bc8460f6..7e44a67d0b 100644 --- a/pkg/registry/extensions/daemonset/BUILD +++ b/pkg/registry/extensions/daemonset/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/extensions/daemonset/storage/BUILD b/pkg/registry/extensions/daemonset/storage/BUILD index 9cff00d63c..75fc0795bd 100644 --- a/pkg/registry/extensions/daemonset/storage/BUILD +++ b/pkg/registry/extensions/daemonset/storage/BUILD @@ -17,7 +17,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -32,13 +32,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/extensions/daemonset:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/daemonset/storage/storage.go b/pkg/registry/extensions/daemonset/storage/storage.go index 5f1e832195..468f66b3fb 100644 --- a/pkg/registry/extensions/daemonset/storage/storage.go +++ b/pkg/registry/extensions/daemonset/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/extensions/daemonset" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // rest implements a RESTStorage for DaemonSets diff --git a/pkg/registry/extensions/daemonset/storage/storage_test.go b/pkg/registry/extensions/daemonset/storage/storage_test.go index d150410c15..88bc4db3d3 100644 --- a/pkg/registry/extensions/daemonset/storage/storage_test.go +++ b/pkg/registry/extensions/daemonset/storage/storage_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/extensions/daemonset/strategy.go b/pkg/registry/extensions/daemonset/strategy.go index 2af39b1f1b..996c23d211 100644 --- a/pkg/registry/extensions/daemonset/strategy.go +++ b/pkg/registry/extensions/daemonset/strategy.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/deployment/BUILD b/pkg/registry/extensions/deployment/BUILD index da4cf8f2e0..886c4c3da4 100644 --- a/pkg/registry/extensions/deployment/BUILD +++ b/pkg/registry/extensions/deployment/BUILD @@ -22,14 +22,14 @@ go_library( "//pkg/apis/extensions/validation:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -46,7 +46,7 @@ go_test( "//pkg/apis/extensions:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/deployment/registry.go b/pkg/registry/extensions/deployment/registry.go index f87d406fb4..47fdad93c7 100644 --- a/pkg/registry/extensions/deployment/registry.go +++ b/pkg/registry/extensions/deployment/registry.go @@ -20,10 +20,10 @@ import ( "fmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store Deployments. diff --git a/pkg/registry/extensions/deployment/storage/BUILD b/pkg/registry/extensions/deployment/storage/BUILD index 39c37dd34f..64342aa412 100644 --- a/pkg/registry/extensions/deployment/storage/BUILD +++ b/pkg/registry/extensions/deployment/storage/BUILD @@ -18,8 +18,8 @@ go_test( "//pkg/api/errors/storage:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/util/intstr:go_default_library", @@ -28,7 +28,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -40,15 +40,15 @@ go_library( "//pkg/api/errors/storage:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/extensions/deployment:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/deployment/storage/storage.go b/pkg/registry/extensions/deployment/storage/storage.go index e66ca92680..cb06288222 100644 --- a/pkg/registry/extensions/deployment/storage/storage.go +++ b/pkg/registry/extensions/deployment/storage/storage.go @@ -23,14 +23,14 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/extensions/deployment" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/deployment/storage/storage_test.go b/pkg/registry/extensions/deployment/storage/storage_test.go index c14022e6f0..7b05947e12 100644 --- a/pkg/registry/extensions/deployment/storage/storage_test.go +++ b/pkg/registry/extensions/deployment/storage/storage_test.go @@ -25,13 +25,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/registry/extensions/deployment/strategy.go b/pkg/registry/extensions/deployment/strategy.go index 0145b85e8d..5c92eca548 100644 --- a/pkg/registry/extensions/deployment/strategy.go +++ b/pkg/registry/extensions/deployment/strategy.go @@ -25,15 +25,15 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/deployment/strategy_test.go b/pkg/registry/extensions/deployment/strategy_test.go index b81eeb3a7f..c166457f12 100644 --- a/pkg/registry/extensions/deployment/strategy_test.go +++ b/pkg/registry/extensions/deployment/strategy_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" diff --git a/pkg/registry/extensions/ingress/BUILD b/pkg/registry/extensions/ingress/BUILD index 97e7290e4a..544fc7aaf6 100644 --- a/pkg/registry/extensions/ingress/BUILD +++ b/pkg/registry/extensions/ingress/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -42,7 +42,7 @@ go_test( "//pkg/apis/extensions:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/ingress/storage/BUILD b/pkg/registry/extensions/ingress/storage/BUILD index df8e7027b1..618555704e 100644 --- a/pkg/registry/extensions/ingress/storage/BUILD +++ b/pkg/registry/extensions/ingress/storage/BUILD @@ -17,7 +17,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/util/intstr:go_default_library", @@ -33,13 +33,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/extensions/ingress:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/ingress/storage/storage.go b/pkg/registry/extensions/ingress/storage/storage.go index 23629552c1..702672f45d 100644 --- a/pkg/registry/extensions/ingress/storage/storage.go +++ b/pkg/registry/extensions/ingress/storage/storage.go @@ -19,12 +19,12 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/extensions/ingress" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // rest implements a RESTStorage for replication controllers diff --git a/pkg/registry/extensions/ingress/storage/storage_test.go b/pkg/registry/extensions/ingress/storage/storage_test.go index b0fbd8f171..6fd0ca62a4 100644 --- a/pkg/registry/extensions/ingress/storage/storage_test.go +++ b/pkg/registry/extensions/ingress/storage/storage_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/registry/extensions/ingress/strategy.go b/pkg/registry/extensions/ingress/strategy.go index ccd7b8180e..b4d576ed6e 100644 --- a/pkg/registry/extensions/ingress/strategy.go +++ b/pkg/registry/extensions/ingress/strategy.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/ingress/strategy_test.go b/pkg/registry/extensions/ingress/strategy_test.go index 9ea4aa5436..42523f8c3b 100644 --- a/pkg/registry/extensions/ingress/strategy_test.go +++ b/pkg/registry/extensions/ingress/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" diff --git a/pkg/registry/extensions/networkpolicy/BUILD b/pkg/registry/extensions/networkpolicy/BUILD index 07d74f8eb9..73fb7add64 100644 --- a/pkg/registry/extensions/networkpolicy/BUILD +++ b/pkg/registry/extensions/networkpolicy/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -39,7 +39,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/networkpolicy/storage/BUILD b/pkg/registry/extensions/networkpolicy/storage/BUILD index fc248b2fd9..44f7a8eef6 100644 --- a/pkg/registry/extensions/networkpolicy/storage/BUILD +++ b/pkg/registry/extensions/networkpolicy/storage/BUILD @@ -17,14 +17,14 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -34,9 +34,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/extensions/networkpolicy:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/extensions/networkpolicy/storage/storage.go b/pkg/registry/extensions/networkpolicy/storage/storage.go index f2a1410422..aa7cc8bf7a 100644 --- a/pkg/registry/extensions/networkpolicy/storage/storage.go +++ b/pkg/registry/extensions/networkpolicy/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" extensionsapi "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // rest implements a RESTStorage for network policies diff --git a/pkg/registry/extensions/networkpolicy/storage/storage_test.go b/pkg/registry/extensions/networkpolicy/storage/storage_test.go index 199733ce6d..0d17ce3fff 100644 --- a/pkg/registry/extensions/networkpolicy/storage/storage_test.go +++ b/pkg/registry/extensions/networkpolicy/storage/storage_test.go @@ -22,11 +22,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/registry/extensions/networkpolicy/strategy.go b/pkg/registry/extensions/networkpolicy/strategy.go index 5955ba5432..606058d010 100644 --- a/pkg/registry/extensions/networkpolicy/strategy.go +++ b/pkg/registry/extensions/networkpolicy/strategy.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/networkpolicy/strategy_test.go b/pkg/registry/extensions/networkpolicy/strategy_test.go index 39b95e0d5e..61e6735429 100644 --- a/pkg/registry/extensions/networkpolicy/strategy_test.go +++ b/pkg/registry/extensions/networkpolicy/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" ) diff --git a/pkg/registry/extensions/podsecuritypolicy/BUILD b/pkg/registry/extensions/podsecuritypolicy/BUILD index c75283720e..0ae79be7ec 100644 --- a/pkg/registry/extensions/podsecuritypolicy/BUILD +++ b/pkg/registry/extensions/podsecuritypolicy/BUILD @@ -19,13 +19,13 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/BUILD b/pkg/registry/extensions/podsecuritypolicy/storage/BUILD index 8dafb2ca7c..d434266aeb 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/BUILD +++ b/pkg/registry/extensions/podsecuritypolicy/storage/BUILD @@ -17,7 +17,7 @@ go_test( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -32,9 +32,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/extensions/podsecuritypolicy:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/storage.go b/pkg/registry/extensions/podsecuritypolicy/storage/storage.go index f41c3d4607..58816ae832 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/storage.go +++ b/pkg/registry/extensions/podsecuritypolicy/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // REST implements a RESTStorage for PodSecurityPolicies. diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go index f7af3c4339..4d7e7bf96e 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go +++ b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/extensions/podsecuritypolicy/strategy.go b/pkg/registry/extensions/podsecuritypolicy/strategy.go index 216b88c0ae..17e9eac5ef 100644 --- a/pkg/registry/extensions/podsecuritypolicy/strategy.go +++ b/pkg/registry/extensions/podsecuritypolicy/strategy.go @@ -22,14 +22,14 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/replicaset/BUILD b/pkg/registry/extensions/replicaset/BUILD index 1cc3e6fbc2..07a48b4164 100644 --- a/pkg/registry/extensions/replicaset/BUILD +++ b/pkg/registry/extensions/replicaset/BUILD @@ -21,15 +21,15 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -43,7 +43,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/replicaset/registry.go b/pkg/registry/extensions/replicaset/registry.go index e217a25e93..6a465df05b 100644 --- a/pkg/registry/extensions/replicaset/registry.go +++ b/pkg/registry/extensions/replicaset/registry.go @@ -23,10 +23,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ReplicaSets. diff --git a/pkg/registry/extensions/replicaset/storage/BUILD b/pkg/registry/extensions/replicaset/storage/BUILD index ba929f82b5..8ca7137483 100644 --- a/pkg/registry/extensions/replicaset/storage/BUILD +++ b/pkg/registry/extensions/replicaset/storage/BUILD @@ -17,8 +17,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -26,7 +26,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -37,14 +37,14 @@ go_library( deps = [ "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/extensions/replicaset:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/replicaset/storage/storage.go b/pkg/registry/extensions/replicaset/storage/storage.go index ec9dc76d7e..366d0fb23f 100644 --- a/pkg/registry/extensions/replicaset/storage/storage.go +++ b/pkg/registry/extensions/replicaset/storage/storage.go @@ -24,13 +24,13 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/extensions/replicaset" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // ReplicaSetStorage includes dummy storage for ReplicaSets and for Scale subresource. diff --git a/pkg/registry/extensions/replicaset/storage/storage_test.go b/pkg/registry/extensions/replicaset/storage/storage_test.go index b92b040f0f..7d9f23663d 100644 --- a/pkg/registry/extensions/replicaset/storage/storage_test.go +++ b/pkg/registry/extensions/replicaset/storage/storage_test.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/extensions/replicaset/strategy.go b/pkg/registry/extensions/replicaset/strategy.go index c9acce1f8b..a206ced12f 100644 --- a/pkg/registry/extensions/replicaset/strategy.go +++ b/pkg/registry/extensions/replicaset/strategy.go @@ -26,14 +26,14 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/replicaset/strategy_test.go b/pkg/registry/extensions/replicaset/strategy_test.go index 02c2a9bf6b..927a9a2860 100644 --- a/pkg/registry/extensions/replicaset/strategy_test.go +++ b/pkg/registry/extensions/replicaset/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" ) diff --git a/pkg/registry/extensions/rest/BUILD b/pkg/registry/extensions/rest/BUILD index 3e882e30c9..e65993ec61 100644 --- a/pkg/registry/extensions/rest/BUILD +++ b/pkg/registry/extensions/rest/BUILD @@ -20,8 +20,9 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", "//pkg/registry/batch/job/storage:go_default_library", "//pkg/registry/extensions/controller/storage:go_default_library", @@ -33,7 +34,6 @@ go_library( "//pkg/registry/extensions/replicaset/storage:go_default_library", "//pkg/registry/extensions/thirdpartyresource/storage:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", - "//pkg/registry/generic:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/runtime", diff --git a/pkg/registry/extensions/rest/storage_extensions.go b/pkg/registry/extensions/rest/storage_extensions.go index fb91da295c..d5e121d85b 100644 --- a/pkg/registry/extensions/rest/storage_extensions.go +++ b/pkg/registry/extensions/rest/storage_extensions.go @@ -27,8 +27,9 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" horizontalpodautoscalerstore "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" jobstore "k8s.io/kubernetes/pkg/registry/batch/job/storage" expcontrollerstore "k8s.io/kubernetes/pkg/registry/extensions/controller/storage" @@ -39,7 +40,6 @@ import ( pspstore "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage" replicasetstore "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage" thirdpartyresourcestore "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource/storage" - "k8s.io/kubernetes/pkg/registry/generic" ) type RESTStorageProvider struct { diff --git a/pkg/registry/extensions/thirdpartyresource/BUILD b/pkg/registry/extensions/thirdpartyresource/BUILD index 305ce7466f..3b13d41857 100644 --- a/pkg/registry/extensions/thirdpartyresource/BUILD +++ b/pkg/registry/extensions/thirdpartyresource/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/extensions/thirdpartyresource/storage/BUILD b/pkg/registry/extensions/thirdpartyresource/storage/BUILD index f00e2206b4..a2e9c1c0c4 100644 --- a/pkg/registry/extensions/thirdpartyresource/storage/BUILD +++ b/pkg/registry/extensions/thirdpartyresource/storage/BUILD @@ -17,7 +17,7 @@ go_test( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -32,9 +32,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/extensions/thirdpartyresource:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/extensions/thirdpartyresource/storage/storage.go b/pkg/registry/extensions/thirdpartyresource/storage/storage.go index 8329614e71..93a424366c 100644 --- a/pkg/registry/extensions/thirdpartyresource/storage/storage.go +++ b/pkg/registry/extensions/thirdpartyresource/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // REST implements a RESTStorage for ThirdPartyResources diff --git a/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go index be069ea675..d4b02780e9 100644 --- a/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go +++ b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/extensions/thirdpartyresource/strategy.go b/pkg/registry/extensions/thirdpartyresource/strategy.go index 7da966caaa..1a0f87827f 100644 --- a/pkg/registry/extensions/thirdpartyresource/strategy.go +++ b/pkg/registry/extensions/thirdpartyresource/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/BUILD index 613472e73a..540dc2578a 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/BUILD @@ -26,7 +26,7 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -36,7 +36,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/util/yaml", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/registry.go b/pkg/registry/extensions/thirdpartyresourcedata/registry.go index 1c8decba60..2717f81ca1 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/registry.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/registry.go @@ -19,10 +19,10 @@ package thirdpartyresourcedata import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store ThirdPartyResourceData objects. diff --git a/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD index e2b481c06e..9255a4d03a 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD @@ -18,7 +18,7 @@ go_test( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -33,9 +33,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go index b094abb603..3eb8963bd4 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go @@ -21,9 +21,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) // REST implements a RESTStorage for ThirdPartyResourceData diff --git a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go index e2625b419f..50e18d2114 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/strategy.go b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go index 7546bc431e..bc91a2af25 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/strategy.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/policy/poddisruptionbudget/BUILD b/pkg/registry/policy/poddisruptionbudget/BUILD index 525923c075..dcede4576d 100644 --- a/pkg/registry/policy/poddisruptionbudget/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -40,7 +40,7 @@ go_test( "//pkg/apis/policy:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/policy/poddisruptionbudget/storage/BUILD b/pkg/registry/policy/poddisruptionbudget/storage/BUILD index 4196fb51f1..a62f0f01c4 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/storage/BUILD @@ -17,14 +17,14 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -34,13 +34,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/policy:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/policy/poddisruptionbudget:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage.go b/pkg/registry/policy/poddisruptionbudget/storage/storage.go index f4764e7ae7..a8877143ad 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage.go @@ -19,11 +19,11 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" policyapi "k8s.io/kubernetes/pkg/apis/policy" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget" ) diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go index f6d8d98d81..d4cbd6aaf5 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -21,12 +21,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/registry/policy/poddisruptionbudget/strategy.go b/pkg/registry/policy/poddisruptionbudget/strategy.go index 485a3286b6..fd946d9670 100644 --- a/pkg/registry/policy/poddisruptionbudget/strategy.go +++ b/pkg/registry/policy/poddisruptionbudget/strategy.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/policy/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/policy/poddisruptionbudget/strategy_test.go b/pkg/registry/policy/poddisruptionbudget/strategy_test.go index 235e1bdb12..e65a497374 100644 --- a/pkg/registry/policy/poddisruptionbudget/strategy_test.go +++ b/pkg/registry/policy/poddisruptionbudget/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/registry/policy/rest/BUILD b/pkg/registry/policy/rest/BUILD index dd6c2eeaa2..855ffcce17 100644 --- a/pkg/registry/policy/rest/BUILD +++ b/pkg/registry/policy/rest/BUILD @@ -14,9 +14,9 @@ go_library( deps = [ "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/policy/poddisruptionbudget/storage:go_default_library", ], ) diff --git a/pkg/registry/policy/rest/storage_policy.go b/pkg/registry/policy/rest/storage_policy.go index 073ea343f0..2a43406548 100644 --- a/pkg/registry/policy/rest/storage_policy.go +++ b/pkg/registry/policy/rest/storage_policy.go @@ -19,9 +19,9 @@ package rest import ( "k8s.io/kubernetes/pkg/apis/policy" policyapiv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" poddisruptionbudgetstore "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage" ) diff --git a/pkg/registry/rbac/BUILD b/pkg/registry/rbac/BUILD index cd5c3daa99..1a772340d0 100644 --- a/pkg/registry/rbac/BUILD +++ b/pkg/registry/rbac/BUILD @@ -16,7 +16,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/rbac/clusterrole/BUILD b/pkg/registry/rbac/clusterrole/BUILD index e1646e975e..9e997883c0 100644 --- a/pkg/registry/rbac/clusterrole/BUILD +++ b/pkg/registry/rbac/clusterrole/BUILD @@ -20,14 +20,14 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/rbac/clusterrole/policybased/BUILD b/pkg/registry/rbac/clusterrole/policybased/BUILD index 7aac977d76..283641a4fb 100644 --- a/pkg/registry/rbac/clusterrole/policybased/BUILD +++ b/pkg/registry/rbac/clusterrole/policybased/BUILD @@ -13,12 +13,12 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/rbac/clusterrole/policybased/storage.go b/pkg/registry/rbac/clusterrole/policybased/storage.go index 4cb234f2f5..40d56c8378 100644 --- a/pkg/registry/rbac/clusterrole/policybased/storage.go +++ b/pkg/registry/rbac/clusterrole/policybased/storage.go @@ -20,9 +20,9 @@ package policybased import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/clusterrole/registry.go b/pkg/registry/rbac/clusterrole/registry.go index 984fc1624a..314d991fe9 100644 --- a/pkg/registry/rbac/clusterrole/registry.go +++ b/pkg/registry/rbac/clusterrole/registry.go @@ -19,10 +19,10 @@ package clusterrole import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ClusterRoles. diff --git a/pkg/registry/rbac/clusterrole/storage/BUILD b/pkg/registry/rbac/clusterrole/storage/BUILD index 0d4501cbcb..10f0227198 100644 --- a/pkg/registry/rbac/clusterrole/storage/BUILD +++ b/pkg/registry/rbac/clusterrole/storage/BUILD @@ -13,8 +13,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/rbac/clusterrole:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/registry/rbac/clusterrole/storage/storage.go b/pkg/registry/rbac/clusterrole/storage/storage.go index 404c610c62..5139775a75 100644 --- a/pkg/registry/rbac/clusterrole/storage/storage.go +++ b/pkg/registry/rbac/clusterrole/storage/storage.go @@ -19,8 +19,8 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" ) diff --git a/pkg/registry/rbac/clusterrole/strategy.go b/pkg/registry/rbac/clusterrole/strategy.go index 79729ee5ff..1629e73eef 100644 --- a/pkg/registry/rbac/clusterrole/strategy.go +++ b/pkg/registry/rbac/clusterrole/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/clusterrolebinding/BUILD b/pkg/registry/rbac/clusterrolebinding/BUILD index 5b66fecebb..4df31bbc3a 100644 --- a/pkg/registry/rbac/clusterrolebinding/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/BUILD @@ -20,14 +20,14 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD index 4d16eb8f39..332a2e0455 100644 --- a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD @@ -13,13 +13,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/storage.go b/pkg/registry/rbac/clusterrolebinding/policybased/storage.go index 11d7f2dc4a..8f2aff1f10 100644 --- a/pkg/registry/rbac/clusterrolebinding/policybased/storage.go +++ b/pkg/registry/rbac/clusterrolebinding/policybased/storage.go @@ -21,9 +21,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/clusterrolebinding/registry.go b/pkg/registry/rbac/clusterrolebinding/registry.go index 9b33835785..48d65bd4eb 100644 --- a/pkg/registry/rbac/clusterrolebinding/registry.go +++ b/pkg/registry/rbac/clusterrolebinding/registry.go @@ -19,10 +19,10 @@ package clusterrolebinding import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ClusterRoleBindings. diff --git a/pkg/registry/rbac/clusterrolebinding/storage/BUILD b/pkg/registry/rbac/clusterrolebinding/storage/BUILD index d86efb3c36..443dbde95c 100644 --- a/pkg/registry/rbac/clusterrolebinding/storage/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/storage/BUILD @@ -13,8 +13,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/rbac/clusterrolebinding:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/registry/rbac/clusterrolebinding/storage/storage.go b/pkg/registry/rbac/clusterrolebinding/storage/storage.go index 419d0640af..6ecee2d60c 100644 --- a/pkg/registry/rbac/clusterrolebinding/storage/storage.go +++ b/pkg/registry/rbac/clusterrolebinding/storage/storage.go @@ -19,8 +19,8 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding" ) diff --git a/pkg/registry/rbac/clusterrolebinding/strategy.go b/pkg/registry/rbac/clusterrolebinding/strategy.go index bae25f67e9..9b47bc59dd 100644 --- a/pkg/registry/rbac/clusterrolebinding/strategy.go +++ b/pkg/registry/rbac/clusterrolebinding/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/escalation_check.go b/pkg/registry/rbac/escalation_check.go index db493f180c..5872504bd4 100644 --- a/pkg/registry/rbac/escalation_check.go +++ b/pkg/registry/rbac/escalation_check.go @@ -22,7 +22,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/rbac" ) diff --git a/pkg/registry/rbac/rest/BUILD b/pkg/registry/rbac/rest/BUILD index edfca694f4..92bfa4bfbf 100644 --- a/pkg/registry/rbac/rest/BUILD +++ b/pkg/registry/rbac/rest/BUILD @@ -17,9 +17,9 @@ go_library( "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/apis/rbac/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/rbac/clusterrole:go_default_library", "//pkg/registry/rbac/clusterrole/policybased:go_default_library", "//pkg/registry/rbac/clusterrole/storage:go_default_library", diff --git a/pkg/registry/rbac/rest/storage_rbac.go b/pkg/registry/rbac/rest/storage_rbac.go index 3ca1dec78e..7c1f2333cb 100644 --- a/pkg/registry/rbac/rest/storage_rbac.go +++ b/pkg/registry/rbac/rest/storage_rbac.go @@ -32,9 +32,9 @@ import ( rbacapiv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" rbacapiv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" rbacclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" clusterrolepolicybased "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/policybased" clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage" diff --git a/pkg/registry/rbac/role/BUILD b/pkg/registry/rbac/role/BUILD index 97248fcfda..6adaec549e 100644 --- a/pkg/registry/rbac/role/BUILD +++ b/pkg/registry/rbac/role/BUILD @@ -20,14 +20,14 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/rbac/role/policybased/BUILD b/pkg/registry/rbac/role/policybased/BUILD index 7aac977d76..283641a4fb 100644 --- a/pkg/registry/rbac/role/policybased/BUILD +++ b/pkg/registry/rbac/role/policybased/BUILD @@ -13,12 +13,12 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/rbac/role/policybased/storage.go b/pkg/registry/rbac/role/policybased/storage.go index 40d4a2ddaf..f121972a74 100644 --- a/pkg/registry/rbac/role/policybased/storage.go +++ b/pkg/registry/rbac/role/policybased/storage.go @@ -20,9 +20,9 @@ package policybased import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/role/registry.go b/pkg/registry/rbac/role/registry.go index 4c734c180f..a0b6a47237 100644 --- a/pkg/registry/rbac/role/registry.go +++ b/pkg/registry/rbac/role/registry.go @@ -19,10 +19,10 @@ package role import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store Roles. diff --git a/pkg/registry/rbac/role/storage/BUILD b/pkg/registry/rbac/role/storage/BUILD index 050e74bd8d..ac83440dbe 100644 --- a/pkg/registry/rbac/role/storage/BUILD +++ b/pkg/registry/rbac/role/storage/BUILD @@ -13,8 +13,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/rbac/role:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/registry/rbac/role/storage/storage.go b/pkg/registry/rbac/role/storage/storage.go index 022fa095c6..44f53eba03 100644 --- a/pkg/registry/rbac/role/storage/storage.go +++ b/pkg/registry/rbac/role/storage/storage.go @@ -19,8 +19,8 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/rbac/role" ) diff --git a/pkg/registry/rbac/role/strategy.go b/pkg/registry/rbac/role/strategy.go index 86544f30cf..74a5eb323a 100644 --- a/pkg/registry/rbac/role/strategy.go +++ b/pkg/registry/rbac/role/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/rolebinding/BUILD b/pkg/registry/rbac/rolebinding/BUILD index 814c0f6dd2..85670c8caf 100644 --- a/pkg/registry/rbac/rolebinding/BUILD +++ b/pkg/registry/rbac/rolebinding/BUILD @@ -20,14 +20,14 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) diff --git a/pkg/registry/rbac/rolebinding/policybased/BUILD b/pkg/registry/rbac/rolebinding/policybased/BUILD index 4d16eb8f39..332a2e0455 100644 --- a/pkg/registry/rbac/rolebinding/policybased/BUILD +++ b/pkg/registry/rbac/rolebinding/policybased/BUILD @@ -13,13 +13,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/rbac/rolebinding/policybased/storage.go b/pkg/registry/rbac/rolebinding/policybased/storage.go index 8d1c94e9c7..e9f054e086 100644 --- a/pkg/registry/rbac/rolebinding/policybased/storage.go +++ b/pkg/registry/rbac/rolebinding/policybased/storage.go @@ -21,9 +21,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/rolebinding/registry.go b/pkg/registry/rbac/rolebinding/registry.go index 27c1d64236..4e19d067d5 100644 --- a/pkg/registry/rbac/rolebinding/registry.go +++ b/pkg/registry/rbac/rolebinding/registry.go @@ -19,10 +19,10 @@ package rolebinding import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store RoleBindings. diff --git a/pkg/registry/rbac/rolebinding/storage/BUILD b/pkg/registry/rbac/rolebinding/storage/BUILD index 84c8d32714..02b5f84f77 100644 --- a/pkg/registry/rbac/rolebinding/storage/BUILD +++ b/pkg/registry/rbac/rolebinding/storage/BUILD @@ -13,8 +13,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/rbac/rolebinding:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/registry/rbac/rolebinding/storage/storage.go b/pkg/registry/rbac/rolebinding/storage/storage.go index 9a98c01b35..dbc8814ff8 100644 --- a/pkg/registry/rbac/rolebinding/storage/storage.go +++ b/pkg/registry/rbac/rolebinding/storage/storage.go @@ -19,8 +19,8 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/rbac/rolebinding" ) diff --git a/pkg/registry/rbac/rolebinding/strategy.go b/pkg/registry/rbac/rolebinding/strategy.go index b0359cd239..259f4d0856 100644 --- a/pkg/registry/rbac/rolebinding/strategy.go +++ b/pkg/registry/rbac/rolebinding/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/validation/BUILD b/pkg/registry/rbac/validation/BUILD index 0e33a5f1c6..2c30ae1782 100644 --- a/pkg/registry/rbac/validation/BUILD +++ b/pkg/registry/rbac/validation/BUILD @@ -38,7 +38,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apiserver/pkg/authentication/serviceaccount", "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/rbac/validation/rule.go b/pkg/registry/rbac/validation/rule.go index 88432ac6d4..17373bc004 100644 --- a/pkg/registry/rbac/validation/rule.go +++ b/pkg/registry/rbac/validation/rule.go @@ -26,7 +26,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/authentication/serviceaccount" "k8s.io/apiserver/pkg/authentication/user" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/rbac" ) diff --git a/pkg/registry/registrytest/BUILD b/pkg/registry/registrytest/BUILD index af4bb12aa8..e8aa555a65 100644 --- a/pkg/registry/registrytest/BUILD +++ b/pkg/registry/registrytest/BUILD @@ -21,8 +21,8 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/rest/resttest:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/rest/resttest:go_default_library", "//pkg/storage/etcd:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/storage/storagebackend:go_default_library", @@ -33,7 +33,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/registrytest/endpoint.go b/pkg/registry/registrytest/endpoint.go index 3686c6a858..4bdd1f92e5 100644 --- a/pkg/registry/registrytest/endpoint.go +++ b/pkg/registry/registrytest/endpoint.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" ) diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index c0311b3d07..576119300e 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -25,12 +25,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest/resttest" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest/resttest" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/storage/storagebackend" diff --git a/pkg/registry/registrytest/node.go b/pkg/registry/registrytest/node.go index b9f3f74785..bc5341ccae 100644 --- a/pkg/registry/registrytest/node.go +++ b/pkg/registry/registrytest/node.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" ) diff --git a/pkg/registry/registrytest/service.go b/pkg/registry/registrytest/service.go index 5d11f8b537..dde7f78047 100644 --- a/pkg/registry/registrytest/service.go +++ b/pkg/registry/registrytest/service.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" ) diff --git a/pkg/registry/storage/rest/BUILD b/pkg/registry/storage/rest/BUILD index dec64ae3a0..f96296800a 100644 --- a/pkg/registry/storage/rest/BUILD +++ b/pkg/registry/storage/rest/BUILD @@ -14,9 +14,9 @@ go_library( deps = [ "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", - "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/storage/storageclass/storage:go_default_library", ], ) diff --git a/pkg/registry/storage/rest/storage_storage.go b/pkg/registry/storage/rest/storage_storage.go index e88fba0aa2..1dbd12e3df 100644 --- a/pkg/registry/storage/rest/storage_storage.go +++ b/pkg/registry/storage/rest/storage_storage.go @@ -19,9 +19,9 @@ package rest import ( storageapi "k8s.io/kubernetes/pkg/apis/storage" storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" storageclassstore "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage" ) diff --git a/pkg/registry/storage/storageclass/BUILD b/pkg/registry/storage/storageclass/BUILD index a42ae67650..488c2d2fea 100644 --- a/pkg/registry/storage/storageclass/BUILD +++ b/pkg/registry/storage/storageclass/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", ], ) @@ -38,7 +38,7 @@ go_test( deps = [ "//pkg/apis/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/registry/storage/storageclass/storage/BUILD b/pkg/registry/storage/storageclass/storage/BUILD index d2adf7ee5e..2f369d479f 100644 --- a/pkg/registry/storage/storageclass/storage/BUILD +++ b/pkg/registry/storage/storageclass/storage/BUILD @@ -16,7 +16,7 @@ go_test( deps = [ "//pkg/apis/storage:go_default_library", "//pkg/fields:go_default_library", - "//pkg/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -31,8 +31,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/storage:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", + "//pkg/genericapiserver/registry/generic:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/storage/storageclass:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/registry/storage/storageclass/storage/storage.go b/pkg/registry/storage/storageclass/storage/storage.go index 79aed25c00..fe9d0f75a3 100644 --- a/pkg/registry/storage/storageclass/storage/storage.go +++ b/pkg/registry/storage/storageclass/storage/storage.go @@ -19,8 +19,8 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" storageapi "k8s.io/kubernetes/pkg/apis/storage" - "k8s.io/kubernetes/pkg/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/storage/storageclass" ) diff --git a/pkg/registry/storage/storageclass/storage/storage_test.go b/pkg/registry/storage/storageclass/storage/storage_test.go index a27ca4206c..c01366cc27 100644 --- a/pkg/registry/storage/storageclass/storage/storage_test.go +++ b/pkg/registry/storage/storageclass/storage/storage_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" storageapi "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) diff --git a/pkg/registry/storage/storageclass/strategy.go b/pkg/registry/storage/storageclass/strategy.go index 5585853d6e..c314001b51 100644 --- a/pkg/registry/storage/storageclass/strategy.go +++ b/pkg/registry/storage/storageclass/strategy.go @@ -22,13 +22,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/apis/storage/validation" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/storage/storageclass/strategy_test.go b/pkg/registry/storage/storageclass/strategy_test.go index 7c395db31b..2bcbc21b94 100644 --- a/pkg/registry/storage/storageclass/strategy_test.go +++ b/pkg/registry/storage/storageclass/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/storage" ) diff --git a/pkg/routes/BUILD b/pkg/routes/BUILD index 50e5554582..f74afbe2f7 100644 --- a/pkg/routes/BUILD +++ b/pkg/routes/BUILD @@ -16,7 +16,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/mux:go_default_library", + "//pkg/genericapiserver/server/mux:go_default_library", "//vendor:github.com/emicklei/go-restful", ], ) diff --git a/pkg/routes/logs.go b/pkg/routes/logs.go index bbe5512a87..347c411c12 100644 --- a/pkg/routes/logs.go +++ b/pkg/routes/logs.go @@ -22,7 +22,7 @@ import ( "github.com/emicklei/go-restful" - "k8s.io/kubernetes/pkg/genericapiserver/mux" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" ) // Logs adds handlers for the /logs path serving log files from /var/log. diff --git a/pkg/routes/ui.go b/pkg/routes/ui.go index b87e155464..96d0ff235e 100644 --- a/pkg/routes/ui.go +++ b/pkg/routes/ui.go @@ -19,7 +19,7 @@ package routes import ( "net/http" - "k8s.io/kubernetes/pkg/genericapiserver/mux" + "k8s.io/kubernetes/pkg/genericapiserver/server/mux" ) const dashboardPath = "/api/v1/proxy/namespaces/kube-system/services/kubernetes-dashboard" diff --git a/plugin/cmd/kube-scheduler/app/BUILD b/plugin/cmd/kube-scheduler/app/BUILD index 1499c24cc0..32cdca5332 100644 --- a/plugin/cmd/kube-scheduler/app/BUILD +++ b/plugin/cmd/kube-scheduler/app/BUILD @@ -33,7 +33,7 @@ go_library( "//vendor:github.com/spf13/pflag", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) diff --git a/plugin/cmd/kube-scheduler/app/server.go b/plugin/cmd/kube-scheduler/app/server.go index b0d001d838..8e4e1d394f 100644 --- a/plugin/cmd/kube-scheduler/app/server.go +++ b/plugin/cmd/kube-scheduler/app/server.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" diff --git a/plugin/pkg/admission/exec/BUILD b/plugin/pkg/admission/exec/BUILD index acaddd26f3..824add7005 100644 --- a/plugin/pkg/admission/exec/BUILD +++ b/plugin/pkg/admission/exec/BUILD @@ -15,7 +15,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -32,7 +32,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/testing/core:go_default_library", - "//pkg/genericapiserver/api/rest:go_default_library", + "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/admission", diff --git a/plugin/pkg/admission/exec/admission.go b/plugin/pkg/admission/exec/admission.go index 7459116584..e82bb020e8 100644 --- a/plugin/pkg/admission/exec/admission.go +++ b/plugin/pkg/admission/exec/admission.go @@ -25,7 +25,7 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" ) diff --git a/plugin/pkg/admission/exec/admission_test.go b/plugin/pkg/admission/exec/admission_test.go index 9849f502de..b77344265c 100644 --- a/plugin/pkg/admission/exec/admission_test.go +++ b/plugin/pkg/admission/exec/admission_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/testing/core" - "k8s.io/kubernetes/pkg/genericapiserver/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) func TestAdmission(t *testing.T) { diff --git a/plugin/pkg/admission/imagepolicy/BUILD b/plugin/pkg/admission/imagepolicy/BUILD index 6b5f5fdf91..228e544a6e 100644 --- a/plugin/pkg/admission/imagepolicy/BUILD +++ b/plugin/pkg/admission/imagepolicy/BUILD @@ -25,7 +25,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/yaml", "//vendor:k8s.io/apiserver/pkg/admission", "//vendor:k8s.io/apiserver/pkg/util/cache", - "//vendor:k8s.io/apiserver/pkg/webhook", + "//vendor:k8s.io/apiserver/pkg/util/webhook", "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/install", "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1", "//vendor:k8s.io/client-go/rest", diff --git a/plugin/pkg/admission/imagepolicy/admission.go b/plugin/pkg/admission/imagepolicy/admission.go index 1f6aaf666f..3c3c06f9c3 100644 --- a/plugin/pkg/admission/imagepolicy/admission.go +++ b/plugin/pkg/admission/imagepolicy/admission.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/util/cache" - "k8s.io/apiserver/pkg/webhook" + "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1" "k8s.io/client-go/rest" diff --git a/plugin/pkg/auth/authenticator/token/webhook/BUILD b/plugin/pkg/auth/authenticator/token/webhook/BUILD index a2308ab738..96b1a4a0a3 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/BUILD +++ b/plugin/pkg/auth/authenticator/token/webhook/BUILD @@ -18,7 +18,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/util/cache", - "//vendor:k8s.io/apiserver/pkg/webhook", + "//vendor:k8s.io/apiserver/pkg/util/webhook", "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/authentication/install", "//vendor:k8s.io/client-go/pkg/apis/authentication/v1beta1", diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook.go b/plugin/pkg/auth/authenticator/token/webhook/webhook.go index 85476cbf01..a9b5024222 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook.go @@ -27,7 +27,7 @@ import ( authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" authentication "k8s.io/client-go/pkg/apis/authentication/v1beta1" - "k8s.io/apiserver/pkg/webhook" + "k8s.io/apiserver/pkg/util/webhook" _ "k8s.io/client-go/pkg/apis/authentication/install" _ "k8s.io/kubernetes/pkg/apis/authentication/install" diff --git a/plugin/pkg/auth/authorizer/webhook/BUILD b/plugin/pkg/auth/authorizer/webhook/BUILD index c7c8561198..169aba2356 100644 --- a/plugin/pkg/auth/authorizer/webhook/BUILD +++ b/plugin/pkg/auth/authorizer/webhook/BUILD @@ -18,7 +18,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/util/cache", - "//vendor:k8s.io/apiserver/pkg/webhook", + "//vendor:k8s.io/apiserver/pkg/util/webhook", "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/authorization/install", "//vendor:k8s.io/client-go/pkg/apis/authorization/v1beta1", diff --git a/plugin/pkg/auth/authorizer/webhook/webhook.go b/plugin/pkg/auth/authorizer/webhook/webhook.go index 068fc4b851..abcc3340ae 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook.go @@ -29,7 +29,7 @@ import ( authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1" - "k8s.io/apiserver/pkg/webhook" + "k8s.io/apiserver/pkg/util/webhook" _ "k8s.io/client-go/pkg/apis/authorization/install" _ "k8s.io/kubernetes/pkg/apis/authorization/install" diff --git a/plugin/pkg/scheduler/factory/BUILD b/plugin/pkg/scheduler/factory/BUILD index e18fc41e7d..e148effdd2 100644 --- a/plugin/pkg/scheduler/factory/BUILD +++ b/plugin/pkg/scheduler/factory/BUILD @@ -37,7 +37,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go index 1fc40ef411..dad752a33e 100644 --- a/plugin/pkg/scheduler/factory/factory.go +++ b/plugin/pkg/scheduler/factory/factory.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" utilvalidation "k8s.io/apimachinery/pkg/util/validation" - genericapirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go index 784d544c04..759db7a084 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package negotation contains media type negotiation logic. -package negotiation // import "k8s.io/apiserver/pkg/api/handlers/negotiation" +package negotiation // import "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go index a6d25bc5f8..c5e56564ac 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apiserver/pkg/authentication/user" - genericapirequest "k8s.io/apiserver/pkg/api/request" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" ) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go index 2576c52c96..96da6f2b9c 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go @@ -17,4 +17,4 @@ limitations under the License. // Package request contains everything around extracting info from // a http request object. // TODO: this package is temporary. Handlers must move into pkg/apiserver/handlers to avoid dependency cycle -package request // import "k8s.io/apiserver/pkg/api/request" +package request // import "k8s.io/apiserver/pkg/endpoints/request" diff --git a/staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go b/staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go index a1549e2fb4..06e67f6fe3 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go @@ -16,6 +16,6 @@ limitations under the License. // Package healthz implements basic http server health checking. // Usage: -// import "k8s.io/apiserver/pkg/healthz" +// import "k8s.io/apiserver/pkg/server/healthz" // healthz.DefaultHealthz() -package healthz // import "k8s.io/apiserver/pkg/healthz" +package healthz // import "k8s.io/apiserver/pkg/server/healthz" diff --git a/staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go b/staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go index ade3e974f1..caa6572c76 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package httplog contains a helper object and functions to maintain a log // along with an http response. -package httplog // import "k8s.io/apiserver/pkg/httplog" +package httplog // import "k8s.io/apiserver/pkg/server/httplog" diff --git a/test/e2e/BUILD b/test/e2e/BUILD index dbc1005951..a74e8fe3fe 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -132,6 +132,7 @@ go_library( "//pkg/controller/replication:go_default_library", "//pkg/controller/statefulset:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubelet/api/v1alpha1/stats:go_default_library", @@ -139,7 +140,6 @@ go_library( "//pkg/master/ports:go_default_library", "//pkg/metrics:go_default_library", "//pkg/quota/evaluator/core:go_default_library", - "//pkg/registry/generic/registry:go_default_library", "//pkg/security/apparmor:go_default_library", "//pkg/util:go_default_library", "//pkg/util/exec:go_default_library", diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 858a852104..25bb502b4b 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -55,8 +55,8 @@ import ( rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" + genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/kubectl/cmd/util" - genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" uexec "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/uuid" utilversion "k8s.io/kubernetes/pkg/util/version" diff --git a/test/integration/auth/rbac_test.go b/test/integration/auth/rbac_test.go index 7df1736a69..5a883fbc80 100644 --- a/test/integration/auth/rbac_test.go +++ b/test/integration/auth/rbac_test.go @@ -42,8 +42,8 @@ import ( rbacapi "k8s.io/kubernetes/pkg/apis/rbac" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" + "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/master" - "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage" "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding" diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index fbe923f1d6..07cf27a8cf 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -36,9 +36,9 @@ go_library( "//pkg/controller:go_default_library", "//pkg/controller/replication:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver:go_default_library", "//pkg/genericapiserver/authenticator:go_default_library", "//pkg/genericapiserver/authorizer:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master:go_default_library", diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index f6264057c7..9997b1afd0 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -56,9 +56,9 @@ import ( "k8s.io/kubernetes/pkg/controller" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/pkg/generated/openapi" - "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/genericapiserver/authenticator" "k8s.io/kubernetes/pkg/genericapiserver/authorizer" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/kubectl" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master" diff --git a/test/integration/openshift/BUILD b/test/integration/openshift/BUILD index f8d4a8100c..3580c54528 100644 --- a/test/integration/openshift/BUILD +++ b/test/integration/openshift/BUILD @@ -12,7 +12,7 @@ go_test( srcs = ["openshift_test.go"], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver:go_default_library", + "//pkg/genericapiserver/server:go_default_library", "//pkg/master:go_default_library", ], ) diff --git a/test/integration/openshift/openshift_test.go b/test/integration/openshift/openshift_test.go index 1f1137ad35..0502889baa 100644 --- a/test/integration/openshift/openshift_test.go +++ b/test/integration/openshift/openshift_test.go @@ -19,7 +19,7 @@ package openshift import ( "testing" - "k8s.io/kubernetes/pkg/genericapiserver" + genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/master" ) diff --git a/test/test_owners.csv b/test/test_owners.csv index f4432444e5..9b010a7bbf 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -672,17 +672,17 @@ k8s.io/kubernetes/pkg/credentialprovider/azure,brendandburns,0 k8s.io/kubernetes/pkg/credentialprovider/gcp,mml,1 k8s.io/kubernetes/pkg/fieldpath,childsb,1 k8s.io/kubernetes/pkg/fields,jsafrane,1 -k8s.io/kubernetes/pkg/genericapiserver,nikhiljindal,0 -k8s.io/kubernetes/pkg/genericapiserver/api,nikhiljindal,0 -k8s.io/kubernetes/pkg/genericapiserver/api/filters,dchen1107,1 -k8s.io/kubernetes/pkg/genericapiserver/api/handlers,rkouj,0 -k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation,rkouj,0 -k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters,rkouj,0 -k8s.io/kubernetes/pkg/genericapiserver/api/request,lavalamp,1 +k8s.io/kubernetes/pkg/genericapiserver/servernikhiljindal,0 +k8s.io/kubernetes/pkg/genericapiserver/endpoints,nikhiljindal,0 +k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters,dchen1107,1 +k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers,rkouj,0 +k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/negotiation,rkouj,0 +k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters,rkouj,0 +k8s.io/kubernetes/pkg/genericapiserver/endpoints/request,lavalamp,1 k8s.io/kubernetes/pkg/genericapiserver/authorizer,lavalamp,1 -k8s.io/kubernetes/pkg/genericapiserver/filters,dchen1107,1 -k8s.io/kubernetes/pkg/genericapiserver/mux,spxtr,1 -k8s.io/kubernetes/pkg/genericapiserver/openapi,davidopp,1 +k8s.io/kubernetes/pkg/genericapiserver/server/filters,dchen1107,1 +k8s.io/kubernetes/pkg/genericapiserver/server/mux,spxtr,1 +k8s.io/kubernetes/pkg/genericapiserver/server/openapi,davidopp,1 k8s.io/kubernetes/pkg/httplog,mtaufen,1 k8s.io/kubernetes/pkg/kubeapiserver/admission,rkouj,0 k8s.io/kubernetes/pkg/kubeapiserver/authorizer,rkouj,0 diff --git a/vendor/BUILD b/vendor/BUILD index 2b1145d422..0750184e8f 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -8946,9 +8946,9 @@ go_library( ) go_test( - name = "k8s.io/apiserver/pkg/handlers/negotiation_test", - srcs = ["k8s.io/apiserver/pkg/handlers/negotiation/negotiate_test.go"], - library = ":k8s.io/apiserver/pkg/handlers/negotiation", + name = "k8s.io/apiserver/pkg/endpoints/handlers/negotiation_test", + srcs = ["k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate_test.go"], + library = ":k8s.io/apiserver/pkg/endpoints/handlers/negotiation", tags = ["automanaged"], deps = [ "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -8957,11 +8957,11 @@ go_test( ) go_library( - name = "k8s.io/apiserver/pkg/handlers/negotiation", + name = "k8s.io/apiserver/pkg/endpoints/handlers/negotiation", srcs = [ - "k8s.io/apiserver/pkg/handlers/negotiation/doc.go", - "k8s.io/apiserver/pkg/handlers/negotiation/errors.go", - "k8s.io/apiserver/pkg/handlers/negotiation/negotiate.go", + "k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go", + "k8s.io/apiserver/pkg/endpoints/handlers/negotiation/errors.go", + "k8s.io/apiserver/pkg/endpoints/handlers/negotiation/negotiate.go", ], tags = ["automanaged"], deps = [ @@ -8972,42 +8972,9 @@ go_library( ], ) -go_test( - name = "k8s.io/apiserver/pkg/healthz_test", - srcs = ["k8s.io/apiserver/pkg/healthz/healthz_test.go"], - library = ":k8s.io/apiserver/pkg/healthz", - tags = ["automanaged"], -) - go_library( - name = "k8s.io/apiserver/pkg/healthz", - srcs = [ - "k8s.io/apiserver/pkg/healthz/doc.go", - "k8s.io/apiserver/pkg/healthz/healthz.go", - ], - tags = ["automanaged"], -) - -go_test( - name = "k8s.io/apiserver/pkg/httplog_test", - srcs = ["k8s.io/apiserver/pkg/httplog/log_test.go"], - library = ":k8s.io/apiserver/pkg/httplog", - tags = ["automanaged"], -) - -go_library( - name = "k8s.io/apiserver/pkg/httplog", - srcs = [ - "k8s.io/apiserver/pkg/httplog/doc.go", - "k8s.io/apiserver/pkg/httplog/log.go", - ], - tags = ["automanaged"], - deps = ["//vendor:github.com/golang/glog"], -) - -go_library( - name = "k8s.io/apiserver/pkg/metrics", - srcs = ["k8s.io/apiserver/pkg/metrics/metrics.go"], + name = "k8s.io/apiserver/pkg/endpoints/metrics", + srcs = ["k8s.io/apiserver/pkg/endpoints/metrics/metrics.go"], tags = ["automanaged"], deps = [ "//vendor:github.com/emicklei/go-restful", @@ -9017,20 +8984,20 @@ go_library( ) go_test( - name = "k8s.io/apiserver/pkg/request_test", - srcs = ["k8s.io/apiserver/pkg/request/requestinfo_test.go"], - library = ":k8s.io/apiserver/pkg/request", + name = "k8s.io/apiserver/pkg/endpoints/request_test", + srcs = ["k8s.io/apiserver/pkg/endpoints/request/requestinfo_test.go"], + library = ":k8s.io/apiserver/pkg/endpoints/request", tags = ["automanaged"], deps = ["//vendor:k8s.io/apimachinery/pkg/util/sets"], ) go_library( - name = "k8s.io/apiserver/pkg/request", + name = "k8s.io/apiserver/pkg/endpoints/request", srcs = [ - "k8s.io/apiserver/pkg/request/context.go", - "k8s.io/apiserver/pkg/request/doc.go", - "k8s.io/apiserver/pkg/request/requestcontext.go", - "k8s.io/apiserver/pkg/request/requestinfo.go", + "k8s.io/apiserver/pkg/endpoints/request/context.go", + "k8s.io/apiserver/pkg/endpoints/request/doc.go", + "k8s.io/apiserver/pkg/endpoints/request/requestcontext.go", + "k8s.io/apiserver/pkg/endpoints/request/requestinfo.go", ], tags = ["automanaged"], deps = [ @@ -9043,17 +9010,56 @@ go_library( ) go_test( - name = "k8s.io/apiserver/pkg/request_xtest", - srcs = ["k8s.io/apiserver/pkg/request/context_test.go"], + name = "k8s.io/apiserver/pkg/endpoints/request_xtest", + srcs = ["k8s.io/apiserver/pkg/endpoints/request/context_test.go"], tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) +go_library( + name = "k8s.io/apiserver/pkg/server", + srcs = ["k8s.io/apiserver/pkg/server/doc.go"], + tags = ["automanaged"], +) + +go_test( + name = "k8s.io/apiserver/pkg/server/healthz_test", + srcs = ["k8s.io/apiserver/pkg/server/healthz/healthz_test.go"], + library = ":k8s.io/apiserver/pkg/server/healthz", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apiserver/pkg/server/healthz", + srcs = [ + "k8s.io/apiserver/pkg/server/healthz/doc.go", + "k8s.io/apiserver/pkg/server/healthz/healthz.go", + ], + tags = ["automanaged"], +) + +go_test( + name = "k8s.io/apiserver/pkg/server/httplog_test", + srcs = ["k8s.io/apiserver/pkg/server/httplog/log_test.go"], + library = ":k8s.io/apiserver/pkg/server/httplog", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apiserver/pkg/server/httplog", + srcs = [ + "k8s.io/apiserver/pkg/server/httplog/doc.go", + "k8s.io/apiserver/pkg/server/httplog/log.go", + ], + tags = ["automanaged"], + deps = ["//vendor:github.com/golang/glog"], +) + go_library( name = "k8s.io/apiserver/pkg/storage/etcd/metrics", srcs = ["k8s.io/apiserver/pkg/storage/etcd/metrics/metrics.go"], @@ -9115,6 +9121,23 @@ go_library( tags = ["automanaged"], ) +go_library( + name = "k8s.io/apiserver/pkg/util/webhook", + srcs = ["k8s.io/apiserver/pkg/util/webhook/webhook.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/client-go/pkg/api", + "//vendor:k8s.io/client-go/pkg/apis/authorization/install", + "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/tools/clientcmd", + ], +) + go_test( name = "k8s.io/apiserver/pkg/util/wsstream_test", srcs = [ @@ -9141,23 +9164,6 @@ go_library( ], ) -go_library( - name = "k8s.io/apiserver/pkg/webhook", - srcs = ["k8s.io/apiserver/pkg/webhook/webhook.go"], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/apis/authorization/install", - "//vendor:k8s.io/client-go/rest", - "//vendor:k8s.io/client-go/tools/clientcmd", - ], -) - go_library( name = "k8s.io/client-go/_vendor/cloud.google.com/go/compute/metadata", srcs = ["k8s.io/client-go/_vendor/cloud.google.com/go/compute/metadata/metadata.go"], @@ -10284,10 +10290,7 @@ go_library( go_library( name = "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi", - srcs = [ - "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi/common.go", - "k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi/doc.go", - ], + srcs = ["k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/openapi/common.go"], tags = ["automanaged"], deps = [ "//vendor:github.com/emicklei/go-restful",