From e561d5c1c9405c7ef38ba1546537d8ca004915fb Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 16 Jan 2017 13:21:37 +0100 Subject: [PATCH 1/3] Move pkg/api/rest into pkg/genericapiserver/api/rest --- pkg/{ => genericapiserver}/api/rest/BUILD | 0 pkg/{ => genericapiserver}/api/rest/OWNERS | 0 pkg/{ => genericapiserver}/api/rest/create.go | 0 pkg/{ => genericapiserver}/api/rest/delete.go | 0 pkg/{ => genericapiserver}/api/rest/doc.go | 0 pkg/{ => genericapiserver}/api/rest/export.go | 0 pkg/{ => genericapiserver}/api/rest/meta.go | 0 pkg/{ => genericapiserver}/api/rest/meta_test.go | 0 pkg/{ => genericapiserver}/api/rest/rest.go | 0 pkg/{ => genericapiserver}/api/rest/resttest/BUILD | 0 pkg/{ => genericapiserver}/api/rest/resttest/resttest.go | 0 pkg/{ => genericapiserver}/api/rest/types.go | 0 pkg/{ => genericapiserver}/api/rest/update.go | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{ => genericapiserver}/api/rest/BUILD (100%) rename pkg/{ => genericapiserver}/api/rest/OWNERS (100%) rename pkg/{ => genericapiserver}/api/rest/create.go (100%) rename pkg/{ => genericapiserver}/api/rest/delete.go (100%) rename pkg/{ => genericapiserver}/api/rest/doc.go (100%) rename pkg/{ => genericapiserver}/api/rest/export.go (100%) rename pkg/{ => genericapiserver}/api/rest/meta.go (100%) rename pkg/{ => genericapiserver}/api/rest/meta_test.go (100%) rename pkg/{ => genericapiserver}/api/rest/rest.go (100%) rename pkg/{ => genericapiserver}/api/rest/resttest/BUILD (100%) rename pkg/{ => genericapiserver}/api/rest/resttest/resttest.go (100%) rename pkg/{ => genericapiserver}/api/rest/types.go (100%) rename pkg/{ => genericapiserver}/api/rest/update.go (100%) diff --git a/pkg/api/rest/BUILD b/pkg/genericapiserver/api/rest/BUILD similarity index 100% rename from pkg/api/rest/BUILD rename to pkg/genericapiserver/api/rest/BUILD diff --git a/pkg/api/rest/OWNERS b/pkg/genericapiserver/api/rest/OWNERS similarity index 100% rename from pkg/api/rest/OWNERS rename to pkg/genericapiserver/api/rest/OWNERS diff --git a/pkg/api/rest/create.go b/pkg/genericapiserver/api/rest/create.go similarity index 100% rename from pkg/api/rest/create.go rename to pkg/genericapiserver/api/rest/create.go diff --git a/pkg/api/rest/delete.go b/pkg/genericapiserver/api/rest/delete.go similarity index 100% rename from pkg/api/rest/delete.go rename to pkg/genericapiserver/api/rest/delete.go diff --git a/pkg/api/rest/doc.go b/pkg/genericapiserver/api/rest/doc.go similarity index 100% rename from pkg/api/rest/doc.go rename to pkg/genericapiserver/api/rest/doc.go diff --git a/pkg/api/rest/export.go b/pkg/genericapiserver/api/rest/export.go similarity index 100% rename from pkg/api/rest/export.go rename to pkg/genericapiserver/api/rest/export.go diff --git a/pkg/api/rest/meta.go b/pkg/genericapiserver/api/rest/meta.go similarity index 100% rename from pkg/api/rest/meta.go rename to pkg/genericapiserver/api/rest/meta.go diff --git a/pkg/api/rest/meta_test.go b/pkg/genericapiserver/api/rest/meta_test.go similarity index 100% rename from pkg/api/rest/meta_test.go rename to pkg/genericapiserver/api/rest/meta_test.go diff --git a/pkg/api/rest/rest.go b/pkg/genericapiserver/api/rest/rest.go similarity index 100% rename from pkg/api/rest/rest.go rename to pkg/genericapiserver/api/rest/rest.go diff --git a/pkg/api/rest/resttest/BUILD b/pkg/genericapiserver/api/rest/resttest/BUILD similarity index 100% rename from pkg/api/rest/resttest/BUILD rename to pkg/genericapiserver/api/rest/resttest/BUILD diff --git a/pkg/api/rest/resttest/resttest.go b/pkg/genericapiserver/api/rest/resttest/resttest.go similarity index 100% rename from pkg/api/rest/resttest/resttest.go rename to pkg/genericapiserver/api/rest/resttest/resttest.go diff --git a/pkg/api/rest/types.go b/pkg/genericapiserver/api/rest/types.go similarity index 100% rename from pkg/api/rest/types.go rename to pkg/genericapiserver/api/rest/types.go diff --git a/pkg/api/rest/update.go b/pkg/genericapiserver/api/rest/update.go similarity index 100% rename from pkg/api/rest/update.go rename to pkg/genericapiserver/api/rest/update.go From 5c88b7d05aa645e33b7c707dc86c3a2a40919e45 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 17 Jan 2017 09:30:30 +0100 Subject: [PATCH 2/3] Fix imports --- cmd/kube-aggregator/pkg/apiserver/apiserver.go | 2 +- examples/apiserver/apiserver.go | 2 +- federation/cmd/federation-apiserver/app/batch.go | 2 +- federation/cmd/federation-apiserver/app/core.go | 2 +- federation/cmd/federation-apiserver/app/extensions.go | 2 +- federation/cmd/federation-apiserver/app/federation.go | 2 +- federation/registry/cluster/etcd/etcd.go | 2 +- federation/registry/cluster/registry.go | 2 +- pkg/genericapiserver/api/apiserver_test.go | 2 +- pkg/genericapiserver/api/groupversion.go | 2 +- pkg/genericapiserver/api/handlers/proxy.go | 2 +- pkg/genericapiserver/api/handlers/responsewriters/writers.go | 2 +- pkg/genericapiserver/api/handlers/rest.go | 2 +- pkg/genericapiserver/api/handlers/rest_test.go | 2 +- pkg/genericapiserver/api/installer.go | 2 +- pkg/genericapiserver/api/proxy_test.go | 2 +- pkg/genericapiserver/api/rest/doc.go | 2 +- pkg/genericapiserver/api/rest/resttest/resttest.go | 2 +- pkg/genericapiserver/api/watch_test.go | 2 +- pkg/genericapiserver/genericapiserver.go | 2 +- pkg/genericapiserver/genericapiserver_test.go | 2 +- pkg/master/thirdparty/thirdparty.go | 2 +- pkg/registry/apps/petset/storage/storage.go | 2 +- pkg/registry/apps/petset/storage/storage_test.go | 2 +- pkg/registry/apps/rest/storage_apps.go | 2 +- pkg/registry/authentication/rest/storage_authentication.go | 2 +- pkg/registry/authorization/rest/storage_authorization.go | 2 +- .../autoscaling/horizontalpodautoscaler/storage/storage.go | 2 +- pkg/registry/autoscaling/rest/storage_autoscaling.go | 2 +- pkg/registry/batch/cronjob/storage/storage.go | 2 +- pkg/registry/batch/job/storage/storage.go | 2 +- pkg/registry/batch/rest/storage_batch.go | 2 +- pkg/registry/certificates/certificates/registry.go | 2 +- pkg/registry/certificates/certificates/storage/storage.go | 2 +- pkg/registry/certificates/rest/storage_certificates.go | 2 +- pkg/registry/core/configmap/registry.go | 2 +- pkg/registry/core/configmap/strategy.go | 2 +- pkg/registry/core/controller/registry.go | 2 +- pkg/registry/core/controller/storage/storage.go | 2 +- pkg/registry/core/controller/storage/storage_test.go | 2 +- pkg/registry/core/controller/strategy.go | 2 +- pkg/registry/core/endpoint/registry.go | 2 +- pkg/registry/core/namespace/registry.go | 2 +- pkg/registry/core/namespace/storage/storage.go | 2 +- pkg/registry/core/node/registry.go | 2 +- pkg/registry/core/node/rest/proxy.go | 2 +- pkg/registry/core/node/storage/storage.go | 2 +- pkg/registry/core/persistentvolume/storage/storage.go | 2 +- pkg/registry/core/persistentvolume/storage/storage_test.go | 2 +- pkg/registry/core/persistentvolumeclaim/storage/storage.go | 2 +- pkg/registry/core/persistentvolumeclaim/storage/storage_test.go | 2 +- pkg/registry/core/pod/rest/log.go | 2 +- pkg/registry/core/pod/rest/subresources.go | 2 +- pkg/registry/core/pod/storage/eviction.go | 2 +- pkg/registry/core/pod/storage/storage.go | 2 +- pkg/registry/core/pod/storage/storage_test.go | 2 +- pkg/registry/core/resourcequota/storage/storage.go | 2 +- pkg/registry/core/resourcequota/storage/storage_test.go | 2 +- pkg/registry/core/rest/storage_core.go | 2 +- pkg/registry/core/secret/registry.go | 2 +- pkg/registry/core/secret/strategy.go | 2 +- pkg/registry/core/service/proxy.go | 2 +- pkg/registry/core/service/registry.go | 2 +- pkg/registry/core/service/rest.go | 2 +- pkg/registry/core/service/rest_test.go | 2 +- pkg/registry/core/service/storage/storage.go | 2 +- pkg/registry/core/service/strategy_test.go | 2 +- pkg/registry/core/serviceaccount/registry.go | 2 +- pkg/registry/extensions/controller/storage/storage.go | 2 +- pkg/registry/extensions/controller/storage/storage_test.go | 2 +- pkg/registry/extensions/daemonset/storage/storage.go | 2 +- pkg/registry/extensions/deployment/registry.go | 2 +- pkg/registry/extensions/deployment/storage/storage.go | 2 +- pkg/registry/extensions/deployment/storage/storage_test.go | 2 +- pkg/registry/extensions/deployment/strategy.go | 2 +- pkg/registry/extensions/ingress/storage/storage.go | 2 +- pkg/registry/extensions/podsecuritypolicy/strategy.go | 2 +- pkg/registry/extensions/replicaset/registry.go | 2 +- pkg/registry/extensions/replicaset/storage/storage.go | 2 +- pkg/registry/extensions/replicaset/storage/storage_test.go | 2 +- pkg/registry/extensions/replicaset/strategy.go | 2 +- pkg/registry/extensions/rest/storage_extensions.go | 2 +- pkg/registry/extensions/thirdpartyresource/strategy.go | 2 +- pkg/registry/extensions/thirdpartyresourcedata/registry.go | 2 +- pkg/registry/extensions/thirdpartyresourcedata/strategy.go | 2 +- pkg/registry/generic/registry/decorated_watcher.go | 2 +- pkg/registry/generic/registry/store.go | 2 +- pkg/registry/generic/registry/store_test.go | 2 +- pkg/registry/generic/rest/streamer.go | 2 +- pkg/registry/policy/poddisruptionbudget/storage/storage.go | 2 +- pkg/registry/policy/poddisruptionbudget/storage/storage_test.go | 2 +- pkg/registry/policy/rest/storage_policy.go | 2 +- pkg/registry/rbac/clusterrole/policybased/storage.go | 2 +- pkg/registry/rbac/clusterrole/registry.go | 2 +- pkg/registry/rbac/clusterrole/strategy.go | 2 +- pkg/registry/rbac/clusterrolebinding/policybased/storage.go | 2 +- pkg/registry/rbac/clusterrolebinding/registry.go | 2 +- pkg/registry/rbac/clusterrolebinding/strategy.go | 2 +- pkg/registry/rbac/rest/storage_rbac.go | 2 +- pkg/registry/rbac/role/policybased/storage.go | 2 +- pkg/registry/rbac/role/registry.go | 2 +- pkg/registry/rbac/role/strategy.go | 2 +- pkg/registry/rbac/rolebinding/policybased/storage.go | 2 +- pkg/registry/rbac/rolebinding/registry.go | 2 +- pkg/registry/rbac/rolebinding/strategy.go | 2 +- pkg/registry/registrytest/etcd.go | 2 +- pkg/registry/storage/rest/storage_storage.go | 2 +- plugin/pkg/admission/exec/admission.go | 2 +- plugin/pkg/admission/exec/admission_test.go | 2 +- 109 files changed, 109 insertions(+), 109 deletions(-) diff --git a/cmd/kube-aggregator/pkg/apiserver/apiserver.go b/cmd/kube-aggregator/pkg/apiserver/apiserver.go index debe48d43c..7ebc5c3dfb 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 13401a1135..c0de9d7b7a 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 c3fbd51018..f86134ff49 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 953ea84cd2..225d2c8faa 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 53100993c9..d36c93564d 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 527dc12dc5..41fa96ae11 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 0ae05f7351..f2e66b5b2b 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 6808f57e2e..bad6e6d5d9 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 3f179bc6e1..05821a3831 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 d734cd7bc5..ee02f9dd92 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 989df268d2..731d911428 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 bc47064274..bfdadfa7bc 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 2656e0a1f5..cd94669e11 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 2831fe71a4..3ba69646cf 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 c4c58cdee7..7731f29cc3 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 397a5a27a3..dd9b87323c 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 97d4b9a0ac..ac4e1b736c 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 12e7742814..1565cf3cb5 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 8e0aa94344..4b63409462 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 fe2f728a37..b0ed5ec66f 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 913cc652c3..1046653b7e 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 598c63cdc0..746c14f5ef 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 d1711e98c9..b35fb45cc2 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 de7a3ef0b9..d79f447514 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 c51eeaf6f8..016eb096a6 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 797ca4ee9f..58537f9886 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 9f70691fff..20cd2648a0 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 1457c87db2..d9e14f4f0a 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 4f7864c528..7d1cbc940c 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 447abe105a..be34c6a637 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 9d28f40b70..01649b0240 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 fccfeb947c..88cee3066a 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 112ab4cc98..94f9f9db4b 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 f1471d9fe2..ad70d45938 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 6aad86af29..1cfee647f3 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 365c93063e..0367dbb292 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 35081da255..2c9bf186e9 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 7fe7ccb03f..f928b13c87 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 411b6b03db..6a42923146 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 ae15f600fc..ddc4d31fd9 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 00dc9ea989..1a4fc39ede 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 67400fc844..845ded3cf6 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 cda161e414..a0b1bd2819 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 e2119d293d..ab05b0d8ff 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 a316ccf2e7..d2a1be1142 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 139612572e..8e1e778693 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 237915c876..c6882c3374 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 de9603229e..693072b876 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 fb2736b928..44d5b23388 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 b0996a4581..775416b68f 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 15f71e0378..4091542f5c 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 e7c803395d..87911e097c 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 a85df709a6..47b2cdbb6e 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 3681baa05c..60a63b9db7 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 b5ce3cbc4f..48d56ea077 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 44754a64e8..0700a0bfea 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 c03aca3070..1a9baf273e 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 8f088fc055..b444685dcb 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 ba679f3484..d2f856dd72 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 0120b11872..770eafe521 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 359b1a0a0f..8a1136e53f 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 5d62bf6e42..1d741bc4c5 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 2af5c6db2f..665f77619f 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 650480a1d8..22b2990ffd 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 36c4b8b093..271404b427 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 695e333ae9..bf5f115d61 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 2c857f5215..d89cdb69e3 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 ab3d5777d3..097c5c0dfd 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 dfb4010612..98da62a78b 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 1e46d491e3..71a1a2b8d7 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 34cd47ed76..5f1e832195 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 4e9b40ec20..f87d406fb4 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 c8be4ab249..847f243c3e 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 2d344ac0d2..7eb72b00b1 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 af5274a87d..0145b85e8d 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 1ebec1d3e2..23629552c1 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 0a135222b6..216b88c0ae 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 1d202b82e3..e217a25e93 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 8fe2e3e75b..67474a298b 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 9570a1edc6..8f82b227e9 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 146c043f4c..c9acce1f8b 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 9e8f781285..fb91da295c 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 c6fb6e63c6..7da966caaa 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 90e3bf022c..1c8decba60 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 9876a38601..7546bc431e 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 c20995c6b0..ba4a64847d 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 b12a941e3f..2f028e1c08 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 fd0e864237..3f06297b71 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 a6e7f46e0c..247b7c52c7 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 80108eb31b..f4764e7ae7 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 520041b0c4..3c96f86567 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 0bf7ab1e55..073ea343f0 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 0092062207..4cb234f2f5 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 c6893d8558..984fc1624a 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 33ac76ccfb..79729ee5ff 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 74820b9c8e..11d7f2dc4a 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 93cd58c4bd..9b33835785 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 b059ef59f6..bae25f67e9 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 bf9d117376..5cfc90aab2 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 cf6c85d36f..40d4a2ddaf 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 0857033e4b..4c734c180f 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 733f3cc3f3..86544f30cf 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 2a567fe3e3..8d1c94e9c7 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 c84cfb7ba1..27c1d64236 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 18aee07bd6..b0359cd239 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 20291f9a29..c0311b3d07 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 9b5682a71c..e88fba0aa2 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 2fc114e35d..06035366a8 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 733f4067d7..1094d57697 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) { From 8fe0958ba0dba91f4477d88c5e4ecc560614e337 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 17 Jan 2017 09:30:48 +0100 Subject: [PATCH 3/3] Update bazel --- cmd/kube-aggregator/pkg/apiserver/BUILD | 2 +- examples/apiserver/BUILD | 2 +- federation/cmd/federation-apiserver/app/BUILD | 2 +- federation/registry/cluster/BUILD | 2 +- federation/registry/cluster/etcd/BUILD | 2 +- pkg/api/BUILD | 1 - pkg/genericapiserver/BUILD | 4 ++-- pkg/genericapiserver/api/BUILD | 5 +++-- pkg/genericapiserver/api/handlers/BUILD | 4 ++-- pkg/genericapiserver/api/handlers/responsewriters/BUILD | 2 +- pkg/genericapiserver/api/rest/BUILD | 2 +- pkg/genericapiserver/api/rest/resttest/BUILD | 2 +- pkg/master/thirdparty/BUILD | 2 +- pkg/registry/apps/petset/storage/BUILD | 4 ++-- pkg/registry/apps/rest/BUILD | 2 +- pkg/registry/authentication/rest/BUILD | 2 +- pkg/registry/authorization/rest/BUILD | 2 +- .../autoscaling/horizontalpodautoscaler/storage/BUILD | 2 +- pkg/registry/autoscaling/rest/BUILD | 2 +- pkg/registry/batch/cronjob/storage/BUILD | 2 +- pkg/registry/batch/job/storage/BUILD | 2 +- pkg/registry/batch/rest/BUILD | 2 +- pkg/registry/certificates/certificates/BUILD | 2 +- pkg/registry/certificates/certificates/storage/BUILD | 2 +- pkg/registry/certificates/rest/BUILD | 2 +- pkg/registry/core/configmap/BUILD | 2 +- pkg/registry/core/controller/BUILD | 2 +- pkg/registry/core/controller/storage/BUILD | 4 ++-- pkg/registry/core/endpoint/BUILD | 2 +- pkg/registry/core/namespace/BUILD | 2 +- pkg/registry/core/namespace/storage/BUILD | 2 +- pkg/registry/core/node/BUILD | 2 +- pkg/registry/core/node/rest/BUILD | 2 +- pkg/registry/core/node/storage/BUILD | 2 +- pkg/registry/core/persistentvolume/storage/BUILD | 4 ++-- pkg/registry/core/persistentvolumeclaim/storage/BUILD | 4 ++-- pkg/registry/core/pod/rest/BUILD | 2 +- pkg/registry/core/pod/storage/BUILD | 4 ++-- pkg/registry/core/resourcequota/storage/BUILD | 4 ++-- pkg/registry/core/rest/BUILD | 2 +- pkg/registry/core/secret/BUILD | 2 +- pkg/registry/core/service/BUILD | 4 ++-- pkg/registry/core/service/storage/BUILD | 2 +- pkg/registry/core/serviceaccount/BUILD | 2 +- pkg/registry/extensions/controller/storage/BUILD | 4 ++-- pkg/registry/extensions/daemonset/storage/BUILD | 2 +- pkg/registry/extensions/deployment/BUILD | 2 +- pkg/registry/extensions/deployment/storage/BUILD | 4 ++-- pkg/registry/extensions/ingress/storage/BUILD | 2 +- pkg/registry/extensions/podsecuritypolicy/BUILD | 2 +- pkg/registry/extensions/replicaset/BUILD | 2 +- pkg/registry/extensions/replicaset/storage/BUILD | 4 ++-- pkg/registry/extensions/rest/BUILD | 2 +- pkg/registry/extensions/thirdpartyresource/BUILD | 2 +- pkg/registry/extensions/thirdpartyresourcedata/BUILD | 2 +- pkg/registry/generic/registry/BUILD | 4 ++-- pkg/registry/generic/rest/BUILD | 2 +- pkg/registry/policy/poddisruptionbudget/storage/BUILD | 4 ++-- pkg/registry/policy/rest/BUILD | 2 +- pkg/registry/rbac/clusterrole/BUILD | 2 +- pkg/registry/rbac/clusterrole/policybased/BUILD | 2 +- pkg/registry/rbac/clusterrolebinding/BUILD | 2 +- pkg/registry/rbac/clusterrolebinding/policybased/BUILD | 2 +- pkg/registry/rbac/rest/BUILD | 2 +- pkg/registry/rbac/role/BUILD | 2 +- pkg/registry/rbac/role/policybased/BUILD | 2 +- pkg/registry/rbac/rolebinding/BUILD | 2 +- pkg/registry/rbac/rolebinding/policybased/BUILD | 2 +- pkg/registry/registrytest/BUILD | 2 +- pkg/registry/storage/rest/BUILD | 2 +- plugin/pkg/admission/exec/BUILD | 4 ++-- 71 files changed, 87 insertions(+), 87 deletions(-) diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD index 4614ea2490..f10dcc9d00 100644 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -27,7 +27,6 @@ go_library( "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", "//cmd/kube-aggregator/pkg/registry/apiservice/etcd:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/auth/handlers:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", @@ -39,6 +38,7 @@ go_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", diff --git a/examples/apiserver/BUILD b/examples/apiserver/BUILD index 9ee2123276..2761d97265 100644 --- a/examples/apiserver/BUILD +++ b/examples/apiserver/BUILD @@ -16,8 +16,8 @@ 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/api/rest: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/kubeapiserver/options:go_default_library", diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index 7df8e9c540..7dcfaccafc 100644 --- a/federation/cmd/federation-apiserver/app/BUILD +++ b/federation/cmd/federation-apiserver/app/BUILD @@ -29,7 +29,6 @@ go_library( "//pkg/admission:go_default_library", "//pkg/api:go_default_library", "//pkg/api/install:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/install:go_default_library", "//pkg/apis/extensions:go_default_library", @@ -39,6 +38,7 @@ go_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/kubeapiserver:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", diff --git a/federation/registry/cluster/BUILD b/federation/registry/cluster/BUILD index 71b8e954dd..30a6c7d3b2 100644 --- a/federation/registry/cluster/BUILD +++ b/federation/registry/cluster/BUILD @@ -19,8 +19,8 @@ go_library( "//federation/apis/federation:go_default_library", "//federation/apis/federation/validation:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/federation/registry/cluster/etcd/BUILD b/federation/registry/cluster/etcd/BUILD index 6c467e396e..e14acafd91 100644 --- a/federation/registry/cluster/etcd/BUILD +++ b/federation/registry/cluster/etcd/BUILD @@ -15,7 +15,7 @@ go_library( deps = [ "//federation/apis/federation:go_default_library", "//federation/registry/cluster:go_default_library", - "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/rest: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/api/BUILD b/pkg/api/BUILD index dd8ac0c097..85ee59f3f5 100644 --- a/pkg/api/BUILD +++ b/pkg/api/BUILD @@ -123,7 +123,6 @@ filegroup( "//pkg/api/meta:all-srcs", "//pkg/api/pod:all-srcs", "//pkg/api/resource:all-srcs", - "//pkg/api/rest:all-srcs", "//pkg/api/service:all-srcs", "//pkg/api/testapi:all-srcs", "//pkg/api/testing:all-srcs", diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index 6de4498d7f..1bc76baa55 100644 --- a/pkg/genericapiserver/BUILD +++ b/pkg/genericapiserver/BUILD @@ -27,12 +27,12 @@ go_library( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/auth/handlers: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", @@ -83,13 +83,13 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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", diff --git a/pkg/genericapiserver/api/BUILD b/pkg/genericapiserver/api/BUILD index 1e7106b76d..0a8ed33682 100644 --- a/pkg/genericapiserver/api/BUILD +++ b/pkg/genericapiserver/api/BUILD @@ -21,10 +21,10 @@ go_library( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//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", @@ -52,13 +52,13 @@ go_test( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//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", "//plugin/pkg/admission/admit:go_default_library", "//plugin/pkg/admission/deny:go_default_library", @@ -94,6 +94,7 @@ filegroup( "//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", ], tags = ["automanaged"], diff --git a/pkg/genericapiserver/api/handlers/BUILD b/pkg/genericapiserver/api/handlers/BUILD index 6a122c4e4d..eb25a9f251 100644 --- a/pkg/genericapiserver/api/handlers/BUILD +++ b/pkg/genericapiserver/api/handlers/BUILD @@ -15,9 +15,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/evanphx/json-patch", @@ -44,9 +44,9 @@ go_library( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/util:go_default_library", "//pkg/util/httpstream:go_default_library", "//pkg/util/proxy:go_default_library", diff --git a/pkg/genericapiserver/api/handlers/responsewriters/BUILD b/pkg/genericapiserver/api/handlers/responsewriters/BUILD index 79e6e6da81..2c3fcec1f5 100644 --- a/pkg/genericapiserver/api/handlers/responsewriters/BUILD +++ b/pkg/genericapiserver/api/handlers/responsewriters/BUILD @@ -31,7 +31,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/genericapiserver/api/rest/BUILD b/pkg/genericapiserver/api/rest/BUILD index aa924c2786..f38faa64b8 100644 --- a/pkg/genericapiserver/api/rest/BUILD +++ b/pkg/genericapiserver/api/rest/BUILD @@ -49,7 +49,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/api/rest/resttest:all-srcs", + "//pkg/genericapiserver/api/rest/resttest:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/genericapiserver/api/rest/resttest/BUILD b/pkg/genericapiserver/api/rest/resttest/BUILD index 8107deb4bb..c64767ec0b 100644 --- a/pkg/genericapiserver/api/rest/resttest/BUILD +++ b/pkg/genericapiserver/api/rest/resttest/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/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", diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index dc2238edce..61c7c95cd1 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -13,11 +13,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/registry/extensions/rest:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata/storage:go_default_library", diff --git a/pkg/registry/apps/petset/storage/BUILD b/pkg/registry/apps/petset/storage/BUILD index 949392621e..27a4ceb959 100644 --- a/pkg/registry/apps/petset/storage/BUILD +++ b/pkg/registry/apps/petset/storage/BUILD @@ -15,9 +15,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -32,8 +32,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/apps:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/apps/petset:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/apps/rest/BUILD b/pkg/registry/apps/rest/BUILD index dcb42c207a..38e9c29b1d 100644 --- a/pkg/registry/apps/rest/BUILD +++ b/pkg/registry/apps/rest/BUILD @@ -12,10 +12,10 @@ go_library( srcs = ["storage_apps.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//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/registry/apps/petset/storage:go_default_library", "//pkg/registry/generic:go_default_library", ], diff --git a/pkg/registry/authentication/rest/BUILD b/pkg/registry/authentication/rest/BUILD index 9ff6d12462..0922d47750 100644 --- a/pkg/registry/authentication/rest/BUILD +++ b/pkg/registry/authentication/rest/BUILD @@ -12,10 +12,10 @@ go_library( srcs = ["storage_authentication.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//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/registry/authentication/tokenreview:go_default_library", "//pkg/registry/generic:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", diff --git a/pkg/registry/authorization/rest/BUILD b/pkg/registry/authorization/rest/BUILD index 7325d8f0a6..666a15a9b3 100644 --- a/pkg/registry/authorization/rest/BUILD +++ b/pkg/registry/authorization/rest/BUILD @@ -12,10 +12,10 @@ go_library( srcs = ["storage_authorization.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//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/registry/authorization/localsubjectaccessreview:go_default_library", "//pkg/registry/authorization/selfsubjectaccessreview:go_default_library", "//pkg/registry/authorization/subjectaccessreview:go_default_library", diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD index 0515d8a849..a01a89f937 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD @@ -31,8 +31,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/autoscaling:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/autoscaling/rest/BUILD b/pkg/registry/autoscaling/rest/BUILD index 2b049f5263..d6aa964aa5 100644 --- a/pkg/registry/autoscaling/rest/BUILD +++ b/pkg/registry/autoscaling/rest/BUILD @@ -12,10 +12,10 @@ go_library( srcs = ["storage_autoscaling.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//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/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", "//pkg/registry/generic:go_default_library", ], diff --git a/pkg/registry/batch/cronjob/storage/BUILD b/pkg/registry/batch/cronjob/storage/BUILD index 0eb1f8a874..1ca2795ff8 100644 --- a/pkg/registry/batch/cronjob/storage/BUILD +++ b/pkg/registry/batch/cronjob/storage/BUILD @@ -32,8 +32,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/batch/cronjob:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/batch/job/storage/BUILD b/pkg/registry/batch/job/storage/BUILD index 179a7f7972..25f59ab567 100644 --- a/pkg/registry/batch/job/storage/BUILD +++ b/pkg/registry/batch/job/storage/BUILD @@ -31,8 +31,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/batch/job:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/batch/rest/BUILD b/pkg/registry/batch/rest/BUILD index 2dfa78296c..53feeff642 100644 --- a/pkg/registry/batch/rest/BUILD +++ b/pkg/registry/batch/rest/BUILD @@ -12,11 +12,11 @@ go_library( srcs = ["storage_batch.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_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/registry/batch/cronjob/storage:go_default_library", "//pkg/registry/batch/job/storage:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/certificates/certificates/BUILD b/pkg/registry/certificates/certificates/BUILD index a75c60ce29..52cef8aa08 100644 --- a/pkg/registry/certificates/certificates/BUILD +++ b/pkg/registry/certificates/certificates/BUILD @@ -18,10 +18,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/registry/certificates/certificates/storage/BUILD b/pkg/registry/certificates/certificates/storage/BUILD index c58807acfa..699ed0e399 100644 --- a/pkg/registry/certificates/certificates/storage/BUILD +++ b/pkg/registry/certificates/certificates/storage/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/certificates:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/certificates/certificates:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/certificates/rest/BUILD b/pkg/registry/certificates/rest/BUILD index 8405d5287a..6291d07aec 100644 --- a/pkg/registry/certificates/rest/BUILD +++ b/pkg/registry/certificates/rest/BUILD @@ -12,10 +12,10 @@ go_library( srcs = ["storage_certificates.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//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/registry/certificates/certificates/storage:go_default_library", "//pkg/registry/generic:go_default_library", ], diff --git a/pkg/registry/core/configmap/BUILD b/pkg/registry/core/configmap/BUILD index 77532d5fa8..08e33a1ef8 100644 --- a/pkg/registry/core/configmap/BUILD +++ b/pkg/registry/core/configmap/BUILD @@ -18,9 +18,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/registry/core/controller/BUILD b/pkg/registry/core/controller/BUILD index 7db0415835..2a54256e9d 100644 --- a/pkg/registry/core/controller/BUILD +++ b/pkg/registry/core/controller/BUILD @@ -18,9 +18,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/registry/core/controller/storage/BUILD b/pkg/registry/core/controller/storage/BUILD index ac18fe82f2..f9ef8378e2 100644 --- a/pkg/registry/core/controller/storage/BUILD +++ b/pkg/registry/core/controller/storage/BUILD @@ -15,9 +15,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -36,9 +36,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/validation:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/core/controller:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/core/endpoint/BUILD b/pkg/registry/core/endpoint/BUILD index 2eecf26de2..4dbc191594 100644 --- a/pkg/registry/core/endpoint/BUILD +++ b/pkg/registry/core/endpoint/BUILD @@ -19,9 +19,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/endpoints:go_default_library", - "//pkg/api/rest: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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/registry/core/namespace/BUILD b/pkg/registry/core/namespace/BUILD index ef4e0ac64d..5ac9c3eb05 100644 --- a/pkg/registry/core/namespace/BUILD +++ b/pkg/registry/core/namespace/BUILD @@ -18,9 +18,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/registry/core/namespace/storage/BUILD b/pkg/registry/core/namespace/storage/BUILD index 00363e9a5a..2254c15eff 100644 --- a/pkg/registry/core/namespace/storage/BUILD +++ b/pkg/registry/core/namespace/storage/BUILD @@ -32,7 +32,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", - "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/core/namespace:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/core/node/BUILD b/pkg/registry/core/node/BUILD index 9e68fcf9ae..3e7ae6ba5e 100644 --- a/pkg/registry/core/node/BUILD +++ b/pkg/registry/core/node/BUILD @@ -18,9 +18,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", diff --git a/pkg/registry/core/node/rest/BUILD b/pkg/registry/core/node/rest/BUILD index 4b776cc984..e550aed4d5 100644 --- a/pkg/registry/core/node/rest/BUILD +++ b/pkg/registry/core/node/rest/BUILD @@ -13,8 +13,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/capabilities:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/node:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/core/node/storage/BUILD b/pkg/registry/core/node/storage/BUILD index 6980b976dc..f2017f7eaa 100644 --- a/pkg/registry/core/node/storage/BUILD +++ b/pkg/registry/core/node/storage/BUILD @@ -32,8 +32,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/genericapiserver/api/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", diff --git a/pkg/registry/core/persistentvolume/storage/BUILD b/pkg/registry/core/persistentvolume/storage/BUILD index ee97b378d0..9d2bc4506d 100644 --- a/pkg/registry/core/persistentvolume/storage/BUILD +++ b/pkg/registry/core/persistentvolume/storage/BUILD @@ -16,8 +16,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -35,7 +35,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/core/persistentvolume:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/core/persistentvolumeclaim/storage/BUILD b/pkg/registry/core/persistentvolumeclaim/storage/BUILD index 7a956c4a1c..7981c4c1bc 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/storage/BUILD @@ -16,8 +16,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -35,7 +35,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/core/persistentvolumeclaim:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/core/pod/rest/BUILD b/pkg/registry/core/pod/rest/BUILD index 26ed94aca7..3c3208819e 100644 --- a/pkg/registry/core/pod/rest/BUILD +++ b/pkg/registry/core/pod/rest/BUILD @@ -17,9 +17,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/capabilities:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/pod:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/core/pod/storage/BUILD b/pkg/registry/core/pod/storage/BUILD index e34df1c50f..65306dc2c3 100644 --- a/pkg/registry/core/pod/storage/BUILD +++ b/pkg/registry/core/pod/storage/BUILD @@ -16,8 +16,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/securitycontext:go_default_library", @@ -43,11 +43,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_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/kubelet/client:go_default_library", "//pkg/registry/core/pod:go_default_library", "//pkg/registry/core/pod/rest:go_default_library", diff --git a/pkg/registry/core/resourcequota/storage/BUILD b/pkg/registry/core/resourcequota/storage/BUILD index c75aff61b5..8d210a736b 100644 --- a/pkg/registry/core/resourcequota/storage/BUILD +++ b/pkg/registry/core/resourcequota/storage/BUILD @@ -16,8 +16,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -34,7 +34,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/core/resourcequota:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index 996be6288d..58d53aebe0 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -25,10 +25,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/kubelet/client:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/registry/core/componentstatus:go_default_library", diff --git a/pkg/registry/core/secret/BUILD b/pkg/registry/core/secret/BUILD index 574080f528..8c1bbb9ea1 100644 --- a/pkg/registry/core/secret/BUILD +++ b/pkg/registry/core/secret/BUILD @@ -18,9 +18,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", diff --git a/pkg/registry/core/service/BUILD b/pkg/registry/core/service/BUILD index 07bf2c2ad5..f71d17265d 100644 --- a/pkg/registry/core/service/BUILD +++ b/pkg/registry/core/service/BUILD @@ -20,11 +20,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/service:go_default_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/registry/core/endpoint:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", @@ -56,9 +56,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/service:go_default_library", "//pkg/api/testing:go_default_library", + "//pkg/genericapiserver/api/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", diff --git a/pkg/registry/core/service/storage/BUILD b/pkg/registry/core/service/storage/BUILD index b91b2e89d0..12e6970398 100644 --- a/pkg/registry/core/service/storage/BUILD +++ b/pkg/registry/core/service/storage/BUILD @@ -31,7 +31,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/core/service:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/core/serviceaccount/BUILD b/pkg/registry/core/serviceaccount/BUILD index 633bf95b44..2473032021 100644 --- a/pkg/registry/core/serviceaccount/BUILD +++ b/pkg/registry/core/serviceaccount/BUILD @@ -18,9 +18,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/registry/extensions/controller/storage/BUILD b/pkg/registry/extensions/controller/storage/BUILD index 89446ea63a..a2740c0080 100644 --- a/pkg/registry/extensions/controller/storage/BUILD +++ b/pkg/registry/extensions/controller/storage/BUILD @@ -15,8 +15,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage:go_default_library", @@ -33,9 +33,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/genericapiserver/api/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", diff --git a/pkg/registry/extensions/daemonset/storage/BUILD b/pkg/registry/extensions/daemonset/storage/BUILD index b2aab7902a..9cff00d63c 100644 --- a/pkg/registry/extensions/daemonset/storage/BUILD +++ b/pkg/registry/extensions/daemonset/storage/BUILD @@ -31,8 +31,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/extensions/daemonset:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/extensions/deployment/BUILD b/pkg/registry/extensions/deployment/BUILD index 229bb12593..488a8fcee8 100644 --- a/pkg/registry/extensions/deployment/BUILD +++ b/pkg/registry/extensions/deployment/BUILD @@ -18,11 +18,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/registry/extensions/deployment/storage/BUILD b/pkg/registry/extensions/deployment/storage/BUILD index aa74ef55ea..8b188b0e03 100644 --- a/pkg/registry/extensions/deployment/storage/BUILD +++ b/pkg/registry/extensions/deployment/storage/BUILD @@ -16,9 +16,9 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", - "//pkg/api/rest: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/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -39,9 +39,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/extensions/deployment:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/extensions/ingress/storage/BUILD b/pkg/registry/extensions/ingress/storage/BUILD index ada4faab33..917d196e49 100644 --- a/pkg/registry/extensions/ingress/storage/BUILD +++ b/pkg/registry/extensions/ingress/storage/BUILD @@ -31,8 +31,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/extensions/ingress:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/extensions/podsecuritypolicy/BUILD b/pkg/registry/extensions/podsecuritypolicy/BUILD index a651d796df..c75283720e 100644 --- a/pkg/registry/extensions/podsecuritypolicy/BUILD +++ b/pkg/registry/extensions/podsecuritypolicy/BUILD @@ -16,10 +16,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", diff --git a/pkg/registry/extensions/replicaset/BUILD b/pkg/registry/extensions/replicaset/BUILD index bec062ba0b..1cc3e6fbc2 100644 --- a/pkg/registry/extensions/replicaset/BUILD +++ b/pkg/registry/extensions/replicaset/BUILD @@ -18,10 +18,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/registry/extensions/replicaset/storage/BUILD b/pkg/registry/extensions/replicaset/storage/BUILD index 668bc3a0f0..9e67e767f3 100644 --- a/pkg/registry/extensions/replicaset/storage/BUILD +++ b/pkg/registry/extensions/replicaset/storage/BUILD @@ -15,9 +15,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -36,9 +36,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/extensions/replicaset:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/extensions/rest/BUILD b/pkg/registry/extensions/rest/BUILD index 9cdb1a7c22..677c5c3d5a 100644 --- a/pkg/registry/extensions/rest/BUILD +++ b/pkg/registry/extensions/rest/BUILD @@ -17,11 +17,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_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/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", "//pkg/registry/batch/job/storage:go_default_library", "//pkg/registry/extensions/controller/storage:go_default_library", diff --git a/pkg/registry/extensions/thirdpartyresource/BUILD b/pkg/registry/extensions/thirdpartyresource/BUILD index 00f0ccae87..305ce7466f 100644 --- a/pkg/registry/extensions/thirdpartyresource/BUILD +++ b/pkg/registry/extensions/thirdpartyresource/BUILD @@ -17,10 +17,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/registry/extensions/thirdpartyresourcedata/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/BUILD index 4c81de8973..613472e73a 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/BUILD @@ -20,13 +20,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/util:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/registry/generic/registry/BUILD b/pkg/registry/generic/registry/BUILD index f814875fe3..857c1928d1 100644 --- a/pkg/registry/generic/registry/BUILD +++ b/pkg/registry/generic/registry/BUILD @@ -20,9 +20,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", @@ -54,9 +54,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/core/pod:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", diff --git a/pkg/registry/generic/rest/BUILD b/pkg/registry/generic/rest/BUILD index 86c247d1fa..55a8735654 100644 --- a/pkg/registry/generic/rest/BUILD +++ b/pkg/registry/generic/rest/BUILD @@ -18,7 +18,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/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/registry/policy/poddisruptionbudget/storage/BUILD b/pkg/registry/policy/poddisruptionbudget/storage/BUILD index 8c69304949..4196fb51f1 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/storage/BUILD @@ -15,9 +15,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest: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/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -33,8 +33,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//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/registry/policy/poddisruptionbudget:go_default_library", diff --git a/pkg/registry/policy/rest/BUILD b/pkg/registry/policy/rest/BUILD index c5c79270e2..dd6c2eeaa2 100644 --- a/pkg/registry/policy/rest/BUILD +++ b/pkg/registry/policy/rest/BUILD @@ -12,10 +12,10 @@ go_library( srcs = ["storage_policy.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//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/registry/policy/poddisruptionbudget/storage:go_default_library", ], diff --git a/pkg/registry/rbac/clusterrole/BUILD b/pkg/registry/rbac/clusterrole/BUILD index 67f1315d99..e1646e975e 100644 --- a/pkg/registry/rbac/clusterrole/BUILD +++ b/pkg/registry/rbac/clusterrole/BUILD @@ -17,10 +17,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", diff --git a/pkg/registry/rbac/clusterrole/policybased/BUILD b/pkg/registry/rbac/clusterrole/policybased/BUILD index b350dced94..7aac977d76 100644 --- a/pkg/registry/rbac/clusterrole/policybased/BUILD +++ b/pkg/registry/rbac/clusterrole/policybased/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", diff --git a/pkg/registry/rbac/clusterrolebinding/BUILD b/pkg/registry/rbac/clusterrolebinding/BUILD index 95e71bcc1a..5b66fecebb 100644 --- a/pkg/registry/rbac/clusterrolebinding/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/BUILD @@ -17,10 +17,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD index 2c3c07e854..4d16eb8f39 100644 --- a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", diff --git a/pkg/registry/rbac/rest/BUILD b/pkg/registry/rbac/rest/BUILD index 25a4bb845e..cc9f09a2c2 100644 --- a/pkg/registry/rbac/rest/BUILD +++ b/pkg/registry/rbac/rest/BUILD @@ -13,11 +13,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/v1alpha1: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/registry/rbac/clusterrole:go_default_library", "//pkg/registry/rbac/clusterrole/policybased:go_default_library", diff --git a/pkg/registry/rbac/role/BUILD b/pkg/registry/rbac/role/BUILD index 97f09fbe33..97248fcfda 100644 --- a/pkg/registry/rbac/role/BUILD +++ b/pkg/registry/rbac/role/BUILD @@ -17,10 +17,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", diff --git a/pkg/registry/rbac/role/policybased/BUILD b/pkg/registry/rbac/role/policybased/BUILD index b350dced94..7aac977d76 100644 --- a/pkg/registry/rbac/role/policybased/BUILD +++ b/pkg/registry/rbac/role/policybased/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", diff --git a/pkg/registry/rbac/rolebinding/BUILD b/pkg/registry/rbac/rolebinding/BUILD index 1e2410192a..814c0f6dd2 100644 --- a/pkg/registry/rbac/rolebinding/BUILD +++ b/pkg/registry/rbac/rolebinding/BUILD @@ -17,10 +17,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_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/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", diff --git a/pkg/registry/rbac/rolebinding/policybased/BUILD b/pkg/registry/rbac/rolebinding/policybased/BUILD index 2c3c07e854..4d16eb8f39 100644 --- a/pkg/registry/rbac/rolebinding/policybased/BUILD +++ b/pkg/registry/rbac/rolebinding/policybased/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", + "//pkg/genericapiserver/api/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", diff --git a/pkg/registry/registrytest/BUILD b/pkg/registry/registrytest/BUILD index 04c04166ce..af4bb12aa8 100644 --- a/pkg/registry/registrytest/BUILD +++ b/pkg/registry/registrytest/BUILD @@ -19,9 +19,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/rest/resttest: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/storage/etcd:go_default_library", "//pkg/storage/etcd/testing:go_default_library", diff --git a/pkg/registry/storage/rest/BUILD b/pkg/registry/storage/rest/BUILD index b582af9c62..dec64ae3a0 100644 --- a/pkg/registry/storage/rest/BUILD +++ b/pkg/registry/storage/rest/BUILD @@ -12,10 +12,10 @@ go_library( srcs = ["storage_storage.go"], tags = ["automanaged"], deps = [ - "//pkg/api/rest:go_default_library", "//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/registry/storage/storageclass/storage:go_default_library", ], diff --git a/plugin/pkg/admission/exec/BUILD b/plugin/pkg/admission/exec/BUILD index a9f344364f..56aec7a4eb 100644 --- a/plugin/pkg/admission/exec/BUILD +++ b/plugin/pkg/admission/exec/BUILD @@ -15,8 +15,8 @@ go_library( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", + "//pkg/genericapiserver/api/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", @@ -31,9 +31,9 @@ go_test( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/rest: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", "//vendor:k8s.io/apimachinery/pkg/runtime", ], )