diff --git a/cmd/kube-aggregator/pkg/apiserver/apiserver.go b/cmd/kube-aggregator/pkg/apiserver/apiserver.go index debe48d43c4..7ebc5c3dfba 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiserver.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiserver.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/util/wait" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" authhandlers "k8s.io/kubernetes/pkg/auth/handlers" 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" "k8s.io/kubernetes/pkg/version" diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go index 13401a11355..c0de9d7b7a0 100644 --- a/examples/apiserver/apiserver.go +++ b/examples/apiserver/apiserver.go @@ -24,8 +24,8 @@ 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/api/rest" "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" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" diff --git a/federation/cmd/federation-apiserver/app/batch.go b/federation/cmd/federation-apiserver/app/batch.go index c3fbd51018b..f86134ff49b 100644 --- a/federation/cmd/federation-apiserver/app/batch.go +++ b/federation/cmd/federation-apiserver/app/batch.go @@ -19,10 +19,10 @@ package app import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" jobstorage "k8s.io/kubernetes/pkg/registry/batch/job/storage" "k8s.io/kubernetes/pkg/registry/generic" ) diff --git a/federation/cmd/federation-apiserver/app/core.go b/federation/cmd/federation-apiserver/app/core.go index 953ea84cd2f..225d2c8faa5 100644 --- a/federation/cmd/federation-apiserver/app/core.go +++ b/federation/cmd/federation-apiserver/app/core.go @@ -31,8 +31,8 @@ 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/api/rest" "k8s.io/kubernetes/pkg/genericapiserver" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" 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" diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index 53100993c9a..d36c93564d6 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -19,10 +19,10 @@ package app import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" 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" diff --git a/federation/cmd/federation-apiserver/app/federation.go b/federation/cmd/federation-apiserver/app/federation.go index 527dc12dc59..41fa96ae112 100644 --- a/federation/cmd/federation-apiserver/app/federation.go +++ b/federation/cmd/federation-apiserver/app/federation.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/genericapiserver" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/generic" _ "k8s.io/kubernetes/federation/apis/federation/install" diff --git a/federation/registry/cluster/etcd/etcd.go b/federation/registry/cluster/etcd/etcd.go index 0ae05f7351d..f2e66b5b2b7 100644 --- a/federation/registry/cluster/etcd/etcd.go +++ b/federation/registry/cluster/etcd/etcd.go @@ -21,7 +21,7 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/registry/cluster" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) diff --git a/federation/registry/cluster/registry.go b/federation/registry/cluster/registry.go index 6808f57e2e0..bad6e6d5d9b 100644 --- a/federation/registry/cluster/registry.go +++ b/federation/registry/cluster/registry.go @@ -22,7 +22,7 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface implemented by things that know how to store Cluster objects. diff --git a/pkg/genericapiserver/api/apiserver_test.go b/pkg/genericapiserver/api/apiserver_test.go index 3f179bc6e11..05821a38311 100644 --- a/pkg/genericapiserver/api/apiserver_test.go +++ b/pkg/genericapiserver/api/apiserver_test.go @@ -46,13 +46,13 @@ import ( "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/api/v1" apiv1 "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" "k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/admission/deny" diff --git a/pkg/genericapiserver/api/groupversion.go b/pkg/genericapiserver/api/groupversion.go index d734cd7bc5e..ee02f9dd927 100644 --- a/pkg/genericapiserver/api/groupversion.go +++ b/pkg/genericapiserver/api/groupversion.go @@ -31,8 +31,8 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/admission" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // APIGroupVersion is a helper for exposing rest.Storage objects as http.Handlers via go-restful diff --git a/pkg/genericapiserver/api/handlers/proxy.go b/pkg/genericapiserver/api/handlers/proxy.go index 989df268d21..731d911428f 100644 --- a/pkg/genericapiserver/api/handlers/proxy.go +++ b/pkg/genericapiserver/api/handlers/proxy.go @@ -35,8 +35,8 @@ import ( "k8s.io/apiserver/pkg/metrics" "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/util/httpstream" proxyutil "k8s.io/kubernetes/pkg/util/proxy" diff --git a/pkg/genericapiserver/api/handlers/responsewriters/writers.go b/pkg/genericapiserver/api/handlers/responsewriters/writers.go index bc470642749..bfdadfa7bc2 100644 --- a/pkg/genericapiserver/api/handlers/responsewriters/writers.go +++ b/pkg/genericapiserver/api/handlers/responsewriters/writers.go @@ -29,7 +29,7 @@ import ( "k8s.io/apiserver/pkg/handlers/negotiation" "k8s.io/apiserver/pkg/util/flushwriter" "k8s.io/apiserver/pkg/util/wsstream" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/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/api/handlers/rest.go b/pkg/genericapiserver/api/handlers/rest.go index 2656e0a1f56..cd94669e11e 100644 --- a/pkg/genericapiserver/api/handlers/rest.go +++ b/pkg/genericapiserver/api/handlers/rest.go @@ -37,9 +37,9 @@ import ( "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/strategicpatch" diff --git a/pkg/genericapiserver/api/handlers/rest_test.go b/pkg/genericapiserver/api/handlers/rest_test.go index 2831fe71a40..3ba69646cff 100644 --- a/pkg/genericapiserver/api/handlers/rest_test.go +++ b/pkg/genericapiserver/api/handlers/rest_test.go @@ -34,9 +34,9 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/util/strategicpatch" ) diff --git a/pkg/genericapiserver/api/installer.go b/pkg/genericapiserver/api/installer.go index c4c58cdee74..7731f29cc38 100644 --- a/pkg/genericapiserver/api/installer.go +++ b/pkg/genericapiserver/api/installer.go @@ -38,9 +38,9 @@ import ( "k8s.io/apiserver/pkg/metrics" "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "github.com/emicklei/go-restful" ) diff --git a/pkg/genericapiserver/api/proxy_test.go b/pkg/genericapiserver/api/proxy_test.go index 397a5a27a32..dd9b87323c9 100644 --- a/pkg/genericapiserver/api/proxy_test.go +++ b/pkg/genericapiserver/api/proxy_test.go @@ -36,7 +36,7 @@ import ( "golang.org/x/net/websocket" utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) { diff --git a/pkg/genericapiserver/api/rest/doc.go b/pkg/genericapiserver/api/rest/doc.go index 97d4b9a0acc..ac4e1b736c8 100644 --- a/pkg/genericapiserver/api/rest/doc.go +++ b/pkg/genericapiserver/api/rest/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package rest defines common logic around changes to Kubernetes resources. -package rest // import "k8s.io/kubernetes/pkg/api/rest" +package rest // import "k8s.io/kubernetes/pkg/genericapiserver/api/rest" diff --git a/pkg/genericapiserver/api/rest/resttest/resttest.go b/pkg/genericapiserver/api/rest/resttest/resttest.go index 12e7742814a..1565cf3cb51 100644 --- a/pkg/genericapiserver/api/rest/resttest/resttest.go +++ b/pkg/genericapiserver/api/rest/resttest/resttest.go @@ -32,9 +32,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) type Tester struct { diff --git a/pkg/genericapiserver/api/watch_test.go b/pkg/genericapiserver/api/watch_test.go index 8e0aa943443..4b634094629 100644 --- a/pkg/genericapiserver/api/watch_test.go +++ b/pkg/genericapiserver/api/watch_test.go @@ -38,10 +38,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" apiv1 "k8s.io/kubernetes/pkg/api/v1" "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" ) diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index fe2f728a37f..b0ed5ec66f6 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -41,9 +41,9 @@ import ( apirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" ) diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go index 913cc652c39..1046653b7e6 100644 --- a/pkg/genericapiserver/genericapiserver_test.go +++ b/pkg/genericapiserver/genericapiserver_test.go @@ -38,11 +38,11 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/version" diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 598c63cdc0c..746c14f5ef9 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -29,11 +29,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" thirdpartyresourcedatastore "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/storage" diff --git a/pkg/registry/apps/petset/storage/storage.go b/pkg/registry/apps/petset/storage/storage.go index d1711e98c9f..b35fb45cc2e 100644 --- a/pkg/registry/apps/petset/storage/storage.go +++ b/pkg/registry/apps/petset/storage/storage.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" appsapi "k8s.io/kubernetes/pkg/apis/apps" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/apps/petset" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/apps/petset/storage/storage_test.go b/pkg/registry/apps/petset/storage/storage_test.go index de7a3ef0b91..d79f4475143 100644 --- a/pkg/registry/apps/petset/storage/storage_test.go +++ b/pkg/registry/apps/petset/storage/storage_test.go @@ -23,9 +23,9 @@ import ( "k8s.io/apimachinery/pkg/labels" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/apps/rest/storage_apps.go b/pkg/registry/apps/rest/storage_apps.go index c51eeaf6f83..016eb096a65 100644 --- a/pkg/registry/apps/rest/storage_apps.go +++ b/pkg/registry/apps/rest/storage_apps.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( - "k8s.io/kubernetes/pkg/api/rest" "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" statefulsetstore "k8s.io/kubernetes/pkg/registry/apps/petset/storage" "k8s.io/kubernetes/pkg/registry/generic" ) diff --git a/pkg/registry/authentication/rest/storage_authentication.go b/pkg/registry/authentication/rest/storage_authentication.go index 797ca4ee9f6..58537f9886e 100644 --- a/pkg/registry/authentication/rest/storage_authentication.go +++ b/pkg/registry/authentication/rest/storage_authentication.go @@ -18,10 +18,10 @@ package rest import ( "k8s.io/apiserver/pkg/authentication/authenticator" - "k8s.io/kubernetes/pkg/api/rest" "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/registry/authentication/tokenreview" "k8s.io/kubernetes/pkg/registry/generic" ) diff --git a/pkg/registry/authorization/rest/storage_authorization.go b/pkg/registry/authorization/rest/storage_authorization.go index 9f70691fff9..20cd2648a0d 100644 --- a/pkg/registry/authorization/rest/storage_authorization.go +++ b/pkg/registry/authorization/rest/storage_authorization.go @@ -18,10 +18,10 @@ package rest import ( "k8s.io/apiserver/pkg/authorization/authorizer" - "k8s.io/kubernetes/pkg/api/rest" "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/registry/authorization/localsubjectaccessreview" "k8s.io/kubernetes/pkg/registry/authorization/selfsubjectaccessreview" "k8s.io/kubernetes/pkg/registry/authorization/subjectaccessreview" diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go index 1457c87db27..d9e14f4f0a5 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/autoscaling/rest/storage_autoscaling.go b/pkg/registry/autoscaling/rest/storage_autoscaling.go index 4f7864c5282..7d1cbc940ca 100644 --- a/pkg/registry/autoscaling/rest/storage_autoscaling.go +++ b/pkg/registry/autoscaling/rest/storage_autoscaling.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( - "k8s.io/kubernetes/pkg/api/rest" "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" horizontalpodautoscalerstore "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" "k8s.io/kubernetes/pkg/registry/generic" ) diff --git a/pkg/registry/batch/cronjob/storage/storage.go b/pkg/registry/batch/cronjob/storage/storage.go index 447abe105a1..be34c6a637b 100644 --- a/pkg/registry/batch/cronjob/storage/storage.go +++ b/pkg/registry/batch/cronjob/storage/storage.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/batch/cronjob" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/batch/job/storage/storage.go b/pkg/registry/batch/job/storage/storage.go index 9d28f40b707..01649b0240f 100644 --- a/pkg/registry/batch/job/storage/storage.go +++ b/pkg/registry/batch/job/storage/storage.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/batch/job" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/batch/rest/storage_batch.go b/pkg/registry/batch/rest/storage_batch.go index fccfeb947c8..88cee3066aa 100644 --- a/pkg/registry/batch/rest/storage_batch.go +++ b/pkg/registry/batch/rest/storage_batch.go @@ -18,11 +18,11 @@ package rest import ( "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/api/rest" "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" cronjobstore "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage" jobstore "k8s.io/kubernetes/pkg/registry/batch/job/storage" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/certificates/certificates/registry.go b/pkg/registry/certificates/certificates/registry.go index 112ab4cc984..94f9f9db4b0 100644 --- a/pkg/registry/certificates/certificates/registry.go +++ b/pkg/registry/certificates/certificates/registry.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/certificates" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store CSRs. diff --git a/pkg/registry/certificates/certificates/storage/storage.go b/pkg/registry/certificates/certificates/storage/storage.go index f1471d9fe21..ad70d459388 100644 --- a/pkg/registry/certificates/certificates/storage/storage.go +++ b/pkg/registry/certificates/certificates/storage/storage.go @@ -19,8 +19,8 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/certificates" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" csrregistry "k8s.io/kubernetes/pkg/registry/certificates/certificates" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/certificates/rest/storage_certificates.go b/pkg/registry/certificates/rest/storage_certificates.go index 6aad86af290..1cfee647f3a 100644 --- a/pkg/registry/certificates/rest/storage_certificates.go +++ b/pkg/registry/certificates/rest/storage_certificates.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( - "k8s.io/kubernetes/pkg/api/rest" "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" certificatestore "k8s.io/kubernetes/pkg/registry/certificates/certificates/storage" "k8s.io/kubernetes/pkg/registry/generic" ) diff --git a/pkg/registry/core/configmap/registry.go b/pkg/registry/core/configmap/registry.go index 365c93063ee..0367dbb2921 100644 --- a/pkg/registry/core/configmap/registry.go +++ b/pkg/registry/core/configmap/registry.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store ConfigMaps. diff --git a/pkg/registry/core/configmap/strategy.go b/pkg/registry/core/configmap/strategy.go index 35081da255c..2c9bf186e94 100644 --- a/pkg/registry/core/configmap/strategy.go +++ b/pkg/registry/core/configmap/strategy.go @@ -25,9 +25,9 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/controller/registry.go b/pkg/registry/core/controller/registry.go index 7fe7ccb03f4..f928b13c872 100644 --- a/pkg/registry/core/controller/registry.go +++ b/pkg/registry/core/controller/registry.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store ReplicationControllers. diff --git a/pkg/registry/core/controller/storage/storage.go b/pkg/registry/core/controller/storage/storage.go index 411b6b03dbf..6a429231466 100644 --- a/pkg/registry/core/controller/storage/storage.go +++ b/pkg/registry/core/controller/storage/storage.go @@ -27,9 +27,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling/validation" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/core/controller" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/controller/storage/storage_test.go b/pkg/registry/core/controller/storage/storage_test.go index ae15f600fc0..ddc4d31fd9e 100644 --- a/pkg/registry/core/controller/storage/storage_test.go +++ b/pkg/registry/core/controller/storage/storage_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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/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 00dc9ea9899..1a4fc39ede0 100644 --- a/pkg/registry/core/controller/strategy.go +++ b/pkg/registry/core/controller/strategy.go @@ -29,9 +29,9 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/endpoint/registry.go b/pkg/registry/core/endpoint/registry.go index 67400fc8442..845ded3cf6a 100644 --- a/pkg/registry/core/endpoint/registry.go +++ b/pkg/registry/core/endpoint/registry.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store endpoints. diff --git a/pkg/registry/core/namespace/registry.go b/pkg/registry/core/namespace/registry.go index cda161e4147..a0b1bd28198 100644 --- a/pkg/registry/core/namespace/registry.go +++ b/pkg/registry/core/namespace/registry.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface implemented by things that know how to store Namespace objects. diff --git a/pkg/registry/core/namespace/storage/storage.go b/pkg/registry/core/namespace/storage/storage.go index e2119d293d1..ab05b0d8ffe 100644 --- a/pkg/registry/core/namespace/storage/storage.go +++ b/pkg/registry/core/namespace/storage/storage.go @@ -25,7 +25,7 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" storageerr "k8s.io/kubernetes/pkg/api/errors/storage" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/core/namespace" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/node/registry.go b/pkg/registry/core/node/registry.go index a316ccf2e77..d2a1be1142f 100644 --- a/pkg/registry/core/node/registry.go +++ b/pkg/registry/core/node/registry.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store node. diff --git a/pkg/registry/core/node/rest/proxy.go b/pkg/registry/core/node/rest/proxy.go index 139612572e8..8e1e7786939 100644 --- a/pkg/registry/core/node/rest/proxy.go +++ b/pkg/registry/core/node/rest/proxy.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/node" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/node/storage/storage.go b/pkg/registry/core/node/storage/storage.go index 237915c876a..c6882c3374d 100644 --- a/pkg/registry/core/node/storage/storage.go +++ b/pkg/registry/core/node/storage/storage.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/node" noderest "k8s.io/kubernetes/pkg/registry/core/node/rest" diff --git a/pkg/registry/core/persistentvolume/storage/storage.go b/pkg/registry/core/persistentvolume/storage/storage.go index de9603229ed..693072b8761 100644 --- a/pkg/registry/core/persistentvolume/storage/storage.go +++ b/pkg/registry/core/persistentvolume/storage/storage.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/core/persistentvolume" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/persistentvolume/storage/storage_test.go b/pkg/registry/core/persistentvolume/storage/storage_test.go index fb2736b9287..44d5b23388d 100644 --- a/pkg/registry/core/persistentvolume/storage/storage_test.go +++ b/pkg/registry/core/persistentvolume/storage/storage_test.go @@ -26,8 +26,8 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "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/persistentvolumeclaim/storage/storage.go b/pkg/registry/core/persistentvolumeclaim/storage/storage.go index b0996a45818..775416b68fc 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go index 15f71e03786..4091542f5c3 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go @@ -26,8 +26,8 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "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/pod/rest/log.go b/pkg/registry/core/pod/rest/log.go index e7c803395d5..87911e097cb 100644 --- a/pkg/registry/core/pod/rest/log.go +++ b/pkg/registry/core/pod/rest/log.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/pod/rest/subresources.go b/pkg/registry/core/pod/rest/subresources.go index a85df709a60..47b2cdbb6e6 100644 --- a/pkg/registry/core/pod/rest/subresources.go +++ b/pkg/registry/core/pod/rest/subresources.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/pod/storage/eviction.go b/pkg/registry/core/pod/storage/eviction.go index 3681baa05cb..60a63b9db72 100644 --- a/pkg/registry/core/pod/storage/eviction.go +++ b/pkg/registry/core/pod/storage/eviction.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" ) diff --git a/pkg/registry/core/pod/storage/storage.go b/pkg/registry/core/pod/storage/storage.go index b5ce3cbc4fb..48d56ea077e 100644 --- a/pkg/registry/core/pod/storage/storage.go +++ b/pkg/registry/core/pod/storage/storage.go @@ -27,9 +27,9 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" - "k8s.io/kubernetes/pkg/api/rest" "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/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" podrest "k8s.io/kubernetes/pkg/registry/core/pod/rest" diff --git a/pkg/registry/core/pod/storage/storage_test.go b/pkg/registry/core/pod/storage/storage_test.go index 44754a64e85..0700a0bfeae 100644 --- a/pkg/registry/core/pod/storage/storage_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -29,8 +29,8 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/securitycontext" diff --git a/pkg/registry/core/resourcequota/storage/storage.go b/pkg/registry/core/resourcequota/storage/storage.go index c03aca30702..1a9baf273e8 100644 --- a/pkg/registry/core/resourcequota/storage/storage.go +++ b/pkg/registry/core/resourcequota/storage/storage.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/core/resourcequota" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/resourcequota/storage/storage_test.go b/pkg/registry/core/resourcequota/storage/storage_test.go index 8f088fc055e..b444685dcb5 100644 --- a/pkg/registry/core/resourcequota/storage/storage_test.go +++ b/pkg/registry/core/resourcequota/storage/storage_test.go @@ -25,8 +25,8 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "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/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go index ba679f34846..d2f856dd72b 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -30,10 +30,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" 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" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/registry/core/componentstatus" diff --git a/pkg/registry/core/secret/registry.go b/pkg/registry/core/secret/registry.go index 0120b118725..770eafe5217 100644 --- a/pkg/registry/core/secret/registry.go +++ b/pkg/registry/core/secret/registry.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface implemented by things that know how to store Secret objects. diff --git a/pkg/registry/core/secret/strategy.go b/pkg/registry/core/secret/strategy.go index 359b1a0a0fa..8a1136e53ff 100644 --- a/pkg/registry/core/secret/strategy.go +++ b/pkg/registry/core/secret/strategy.go @@ -26,9 +26,9 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/service/proxy.go b/pkg/registry/core/service/proxy.go index 5d62bf6e42f..1d741bc4c50 100644 --- a/pkg/registry/core/service/proxy.go +++ b/pkg/registry/core/service/proxy.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" genericrest "k8s.io/kubernetes/pkg/registry/generic/rest" ) diff --git a/pkg/registry/core/service/registry.go b/pkg/registry/core/service/registry.go index 2af5c6db2fe..665f77619fb 100644 --- a/pkg/registry/core/service/registry.go +++ b/pkg/registry/core/service/registry.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/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 650480a1d89..22b2990ffd1 100644 --- a/pkg/registry/core/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -34,9 +34,9 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" apiservice "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/genericapiserver/api/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 36c4b8b0935..271404b427f 100644 --- a/pkg/registry/core/service/rest_test.go +++ b/pkg/registry/core/service/rest_test.go @@ -27,8 +27,8 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/service" + "k8s.io/kubernetes/pkg/genericapiserver/api/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/storage.go b/pkg/registry/core/service/storage/storage.go index 695e333ae93..bf5f115d611 100644 --- a/pkg/registry/core/service/storage/storage.go +++ b/pkg/registry/core/service/storage/storage.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/core/service" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go index 2c857f52153..d89cdb69e3c 100644 --- a/pkg/registry/core/service/strategy_test.go +++ b/pkg/registry/core/service/strategy_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" apitesting "k8s.io/kubernetes/pkg/api/testing" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/registry/core/serviceaccount/registry.go b/pkg/registry/core/serviceaccount/registry.go index ab3d5777d31..097c5c0dfde 100644 --- a/pkg/registry/core/serviceaccount/registry.go +++ b/pkg/registry/core/serviceaccount/registry.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface implemented by things that know how to store ServiceAccount objects. diff --git a/pkg/registry/extensions/controller/storage/storage.go b/pkg/registry/extensions/controller/storage/storage.go index dfb40106127..98da62a78b5 100644 --- a/pkg/registry/extensions/controller/storage/storage.go +++ b/pkg/registry/extensions/controller/storage/storage.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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/registry/core/controller" controllerstore "k8s.io/kubernetes/pkg/registry/core/controller/storage" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/controller/storage/storage_test.go b/pkg/registry/extensions/controller/storage/storage_test.go index 1e46d491e35..71a1a2b8d7a 100644 --- a/pkg/registry/extensions/controller/storage/storage_test.go +++ b/pkg/registry/extensions/controller/storage/storage_test.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/extensions/daemonset/storage/storage.go b/pkg/registry/extensions/daemonset/storage/storage.go index 34cd47ed768..5f1e832195e 100644 --- a/pkg/registry/extensions/daemonset/storage/storage.go +++ b/pkg/registry/extensions/daemonset/storage/storage.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/extensions/daemonset" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/extensions/deployment/registry.go b/pkg/registry/extensions/deployment/registry.go index 4e9b40ec20b..f87d406fb4d 100644 --- a/pkg/registry/extensions/deployment/registry.go +++ b/pkg/registry/extensions/deployment/registry.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store Deployments. diff --git a/pkg/registry/extensions/deployment/storage/storage.go b/pkg/registry/extensions/deployment/storage/storage.go index c8be4ab2493..847f243c3ef 100644 --- a/pkg/registry/extensions/deployment/storage/storage.go +++ b/pkg/registry/extensions/deployment/storage/storage.go @@ -26,9 +26,9 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" - "k8s.io/kubernetes/pkg/api/rest" "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/registry/extensions/deployment" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/extensions/deployment/storage/storage_test.go b/pkg/registry/extensions/deployment/storage/storage_test.go index 2d344ac0d2d..7eb72b00b13 100644 --- a/pkg/registry/extensions/deployment/storage/storage_test.go +++ b/pkg/registry/extensions/deployment/storage/storage_test.go @@ -28,9 +28,9 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" - "k8s.io/kubernetes/pkg/api/rest" "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/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/extensions/deployment/strategy.go b/pkg/registry/extensions/deployment/strategy.go index af5274a87d7..0145b85e8d5 100644 --- a/pkg/registry/extensions/deployment/strategy.go +++ b/pkg/registry/extensions/deployment/strategy.go @@ -28,11 +28,11 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/ingress/storage/storage.go b/pkg/registry/extensions/ingress/storage/storage.go index 1ebec1d3e2a..23629552c16 100644 --- a/pkg/registry/extensions/ingress/storage/storage.go +++ b/pkg/registry/extensions/ingress/storage/storage.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/extensions/ingress" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/extensions/podsecuritypolicy/strategy.go b/pkg/registry/extensions/podsecuritypolicy/strategy.go index 0a135222b6c..216b88c0aef 100644 --- a/pkg/registry/extensions/podsecuritypolicy/strategy.go +++ b/pkg/registry/extensions/podsecuritypolicy/strategy.go @@ -25,10 +25,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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/storage" ) diff --git a/pkg/registry/extensions/replicaset/registry.go b/pkg/registry/extensions/replicaset/registry.go index 1d202b82e31..e217a25e93e 100644 --- a/pkg/registry/extensions/replicaset/registry.go +++ b/pkg/registry/extensions/replicaset/registry.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store ReplicaSets. diff --git a/pkg/registry/extensions/replicaset/storage/storage.go b/pkg/registry/extensions/replicaset/storage/storage.go index 8fe2e3e75b3..67474a298bc 100644 --- a/pkg/registry/extensions/replicaset/storage/storage.go +++ b/pkg/registry/extensions/replicaset/storage/storage.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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/registry/extensions/replicaset" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/extensions/replicaset/storage/storage_test.go b/pkg/registry/extensions/replicaset/storage/storage_test.go index 9570a1edc61..8f82b227e9f 100644 --- a/pkg/registry/extensions/replicaset/storage/storage_test.go +++ b/pkg/registry/extensions/replicaset/storage/storage_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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/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 146c043f4c3..c9acce1f8be 100644 --- a/pkg/registry/extensions/replicaset/strategy.go +++ b/pkg/registry/extensions/replicaset/strategy.go @@ -29,10 +29,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/rest/storage_extensions.go b/pkg/registry/extensions/rest/storage_extensions.go index 9e8f7812852..fb91da295ca 100644 --- a/pkg/registry/extensions/rest/storage_extensions.go +++ b/pkg/registry/extensions/rest/storage_extensions.go @@ -24,11 +24,11 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/pkg/api/rest" "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" 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" diff --git a/pkg/registry/extensions/thirdpartyresource/strategy.go b/pkg/registry/extensions/thirdpartyresource/strategy.go index c6fb6e63c62..7da966caaa1 100644 --- a/pkg/registry/extensions/thirdpartyresource/strategy.go +++ b/pkg/registry/extensions/thirdpartyresource/strategy.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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/storage" ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/registry.go b/pkg/registry/extensions/thirdpartyresourcedata/registry.go index 90e3bf022c2..1c8decba60e 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/registry.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/registry.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface implemented by things that know how to store ThirdPartyResourceData objects. diff --git a/pkg/registry/extensions/thirdpartyresourcedata/strategy.go b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go index 9876a386016..7546bc431e7 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/strategy.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go @@ -25,10 +25,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/generic/registry/decorated_watcher.go b/pkg/registry/generic/registry/decorated_watcher.go index c20995c6b09..ba4a64847da 100644 --- a/pkg/registry/generic/registry/decorated_watcher.go +++ b/pkg/registry/generic/registry/decorated_watcher.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) type decoratedWatcher struct { diff --git a/pkg/registry/generic/registry/store.go b/pkg/registry/generic/registry/store.go index b12a941e3ff..2f028e1c082 100644 --- a/pkg/registry/generic/registry/store.go +++ b/pkg/registry/generic/registry/store.go @@ -35,9 +35,9 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/registry/generic/registry/store_test.go index fd0e8642376..3f06297b71c 100644 --- a/pkg/registry/generic/registry/store_test.go +++ b/pkg/registry/generic/registry/store_test.go @@ -37,9 +37,9 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" "k8s.io/kubernetes/pkg/registry/core/pod" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/generic/rest/streamer.go b/pkg/registry/generic/rest/streamer.go index a6e7f46e0c8..247b7c52c74 100644 --- a/pkg/registry/generic/rest/streamer.go +++ b/pkg/registry/generic/rest/streamer.go @@ -23,7 +23,7 @@ import ( "strings" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // LocationStreamer is a resource that streams the contents of a particular diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage.go b/pkg/registry/policy/poddisruptionbudget/storage/storage.go index 80108eb31b9..f4764e7ae7e 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" 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/registry/policy/poddisruptionbudget" diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go index 520041b0c4d..3c96f865670 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -23,9 +23,9 @@ import ( "k8s.io/apimachinery/pkg/labels" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/policy/rest/storage_policy.go b/pkg/registry/policy/rest/storage_policy.go index 0bf7ab1e554..073ea343f00 100644 --- a/pkg/registry/policy/rest/storage_policy.go +++ b/pkg/registry/policy/rest/storage_policy.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( - "k8s.io/kubernetes/pkg/api/rest" "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" poddisruptionbudgetstore "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage" ) diff --git a/pkg/registry/rbac/clusterrole/policybased/storage.go b/pkg/registry/rbac/clusterrole/policybased/storage.go index 0092062207f..4cb234f2f51 100644 --- a/pkg/registry/rbac/clusterrole/policybased/storage.go +++ b/pkg/registry/rbac/clusterrole/policybased/storage.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" + "k8s.io/kubernetes/pkg/genericapiserver/api/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 c6893d8558e..984fc1624ac 100644 --- a/pkg/registry/rbac/clusterrole/registry.go +++ b/pkg/registry/rbac/clusterrole/registry.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store ClusterRoles. diff --git a/pkg/registry/rbac/clusterrole/strategy.go b/pkg/registry/rbac/clusterrole/strategy.go index 33ac76ccfb9..79729ee5ff9 100644 --- a/pkg/registry/rbac/clusterrole/strategy.go +++ b/pkg/registry/rbac/clusterrole/strategy.go @@ -25,10 +25,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/storage.go b/pkg/registry/rbac/clusterrolebinding/policybased/storage.go index 74820b9c8ec..11d7f2dc4a7 100644 --- a/pkg/registry/rbac/clusterrolebinding/policybased/storage.go +++ b/pkg/registry/rbac/clusterrolebinding/policybased/storage.go @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" + "k8s.io/kubernetes/pkg/genericapiserver/api/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 93cd58c4bd8..9b338357850 100644 --- a/pkg/registry/rbac/clusterrolebinding/registry.go +++ b/pkg/registry/rbac/clusterrolebinding/registry.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store ClusterRoleBindings. diff --git a/pkg/registry/rbac/clusterrolebinding/strategy.go b/pkg/registry/rbac/clusterrolebinding/strategy.go index b059ef59f65..bae25f67e9e 100644 --- a/pkg/registry/rbac/clusterrolebinding/strategy.go +++ b/pkg/registry/rbac/clusterrolebinding/strategy.go @@ -25,10 +25,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/rest/storage_rbac.go b/pkg/registry/rbac/rest/storage_rbac.go index bf9d1173763..5cfc90aab2e 100644 --- a/pkg/registry/rbac/rest/storage_rbac.go +++ b/pkg/registry/rbac/rest/storage_rbac.go @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" rbacapiv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" 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/registry/rbac/clusterrole" clusterrolepolicybased "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/policybased" diff --git a/pkg/registry/rbac/role/policybased/storage.go b/pkg/registry/rbac/role/policybased/storage.go index cf6c85d36f4..40d4a2ddafc 100644 --- a/pkg/registry/rbac/role/policybased/storage.go +++ b/pkg/registry/rbac/role/policybased/storage.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" + "k8s.io/kubernetes/pkg/genericapiserver/api/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 0857033e4b9..4c734c180f4 100644 --- a/pkg/registry/rbac/role/registry.go +++ b/pkg/registry/rbac/role/registry.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store Roles. diff --git a/pkg/registry/rbac/role/strategy.go b/pkg/registry/rbac/role/strategy.go index 733f3cc3f39..86544f30cfc 100644 --- a/pkg/registry/rbac/role/strategy.go +++ b/pkg/registry/rbac/role/strategy.go @@ -25,10 +25,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/rolebinding/policybased/storage.go b/pkg/registry/rbac/rolebinding/policybased/storage.go index 2a567fe3e31..8d1c94e9c78 100644 --- a/pkg/registry/rbac/rolebinding/policybased/storage.go +++ b/pkg/registry/rbac/rolebinding/policybased/storage.go @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" genericapirequest "k8s.io/apiserver/pkg/request" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" + "k8s.io/kubernetes/pkg/genericapiserver/api/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 c84cfb7ba1a..27c1d64236e 100644 --- a/pkg/registry/rbac/rolebinding/registry.go +++ b/pkg/registry/rbac/rolebinding/registry.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) // Registry is an interface for things that know how to store RoleBindings. diff --git a/pkg/registry/rbac/rolebinding/strategy.go b/pkg/registry/rbac/rolebinding/strategy.go index 18aee07bd65..b0359cd2395 100644 --- a/pkg/registry/rbac/rolebinding/strategy.go +++ b/pkg/registry/rbac/rolebinding/strategy.go @@ -25,10 +25,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "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" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index 20291f9a292..c0311b3d071 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -27,9 +27,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest/resttest" "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" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/storage/rest/storage_storage.go b/pkg/registry/storage/rest/storage_storage.go index 9b5682a71c6..e88fba0aa22 100644 --- a/pkg/registry/storage/rest/storage_storage.go +++ b/pkg/registry/storage/rest/storage_storage.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( - "k8s.io/kubernetes/pkg/api/rest" 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" storageclassstore "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage" ) diff --git a/plugin/pkg/admission/exec/admission.go b/plugin/pkg/admission/exec/admission.go index 2fc114e35da..06035366a81 100644 --- a/plugin/pkg/admission/exec/admission.go +++ b/plugin/pkg/admission/exec/admission.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" + "k8s.io/kubernetes/pkg/genericapiserver/api/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 733f4067d77..1094d576971 100644 --- a/plugin/pkg/admission/exec/admission_test.go +++ b/plugin/pkg/admission/exec/admission_test.go @@ -22,9 +22,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/testing/core" + "k8s.io/kubernetes/pkg/genericapiserver/api/rest" ) func TestAdmission(t *testing.T) {