diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD index 07bd1e60aef..7a95b81dd13 100644 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -56,12 +56,6 @@ go_library( "//pkg/client/informers/informers_generated:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/controller:go_default_library", - "//pkg/genericapiserver/endpoints/filters:go_default_library", - "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/rest:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -71,7 +65,13 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/httpstream/spdy", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/endpoints/filters", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/rest", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/filters", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/cache", diff --git a/cmd/kube-aggregator/pkg/apiserver/apiserver.go b/cmd/kube-aggregator/pkg/apiserver/apiserver.go index 342340a691f..5ae36bc9ba2 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiserver.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiserver.go @@ -22,16 +22,16 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" + genericapifilters "k8s.io/apiserver/pkg/endpoints/filters" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" genericfilters "k8s.io/apiserver/pkg/server/filters" "k8s.io/kubernetes/pkg/api" 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" - genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go index 8671e21c6f6..b6f25682b7b 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go @@ -24,9 +24,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/kubernetes/pkg/api" v1listers "k8s.io/kubernetes/pkg/client/listers/core/v1" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" apiregistrationv1alpha1api "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go index fad8a2c612e..09c44fb2768 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/httpstream/spdy" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericrest "k8s.io/apiserver/pkg/registry/generic/rest" restclient "k8s.io/client-go/rest" "k8s.io/client-go/transport" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" - genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" ) diff --git a/cmd/kube-aggregator/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD index fbc820e95df..4e3ff628a1a 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/BUILD +++ b/cmd/kube-aggregator/pkg/cmd/server/BUILD @@ -17,15 +17,15 @@ go_library( "//cmd/kube-aggregator/pkg/legacy:go_default_library", "//pkg/api:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//vendor:github.com/pborman/uuid", "//vendor:github.com/spf13/cobra", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/filters", "//vendor:k8s.io/apiserver/pkg/server/options", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", diff --git a/cmd/kube-aggregator/pkg/cmd/server/start.go b/cmd/kube-aggregator/pkg/cmd/server/start.go index a08db29a1e5..3d823a2d7b6 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/start.go +++ b/cmd/kube-aggregator/pkg/cmd/server/start.go @@ -27,6 +27,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/generic/registry" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/filters" genericoptions "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/storage/storagebackend" @@ -35,9 +38,6 @@ import ( "k8s.io/kubernetes/cmd/kube-aggregator/pkg/legacy" "k8s.io/kubernetes/pkg/api" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD index 788fcd76485..3189950bab2 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD +++ b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD @@ -15,12 +15,12 @@ go_library( "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library", "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD index 25ddb731bc0..b013e8ab5b3 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD +++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD @@ -15,10 +15,10 @@ go_library( "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/registry/apiservice:go_default_library", "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go index 4a8bf413483..7680856fa94 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go +++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go @@ -18,11 +18,11 @@ package etcd import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" ) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go index 02dded1edd3..937d6b2a8b9 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go +++ b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" kapi "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/validation" diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index 344091d4db3..2d8def4fe0f 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -25,7 +25,6 @@ go_library( "//pkg/controller/informers:go_default_library", "//pkg/controller/serviceaccount:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/kubeapiserver:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//pkg/kubeapiserver/authenticator:go_default_library", @@ -64,6 +63,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/filters", ], ) diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index c0ebda3a940..fef70d85a2d 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -43,6 +43,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/filters" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/api" @@ -53,7 +54,6 @@ import ( "k8s.io/kubernetes/pkg/controller/informers" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/kubeapiserver" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" kubeauthenticator "k8s.io/kubernetes/pkg/kubeapiserver/authenticator" diff --git a/examples/apiserver/BUILD b/examples/apiserver/BUILD index c705c82b706..cab1c03161e 100644 --- a/examples/apiserver/BUILD +++ b/examples/apiserver/BUILD @@ -16,14 +16,14 @@ go_library( "//cmd/libs/go2idl/client-gen/test_apis/testgroup/v1:go_default_library", "//examples/apiserver/rest:go_default_library", "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/options", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go index 05acb76c245..bb73900acfa 100644 --- a/examples/apiserver/apiserver.go +++ b/examples/apiserver/apiserver.go @@ -22,14 +22,14 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/authorization/authorizerfactory" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" genericoptions "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1" testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" // Install the testgroup API diff --git a/examples/apiserver/rest/BUILD b/examples/apiserver/rest/BUILD index dd6ad5b7234..b1c8969c60d 100644 --- a/examples/apiserver/rest/BUILD +++ b/examples/apiserver/rest/BUILD @@ -14,13 +14,13 @@ go_library( deps = [ "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/examples/apiserver/rest/reststorage.go b/examples/apiserver/rest/reststorage.go index 96f3c466f2f..a3ee8f22e47 100644 --- a/examples/apiserver/rest/reststorage.go +++ b/examples/apiserver/rest/reststorage.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" ) type REST struct { diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index 83f8db55fe9..b6037f76f03 100644 --- a/federation/cmd/federation-apiserver/app/BUILD +++ b/federation/cmd/federation-apiserver/app/BUILD @@ -39,10 +39,6 @@ go_library( "//pkg/cloudprovider/providers:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/kubeapiserver:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", @@ -74,6 +70,10 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/filters", ], ) diff --git a/federation/cmd/federation-apiserver/app/autoscaling.go b/federation/cmd/federation-apiserver/app/autoscaling.go index ac7655caedf..6d91fd8ff50 100644 --- a/federation/cmd/federation-apiserver/app/autoscaling.go +++ b/federation/cmd/federation-apiserver/app/autoscaling.go @@ -18,12 +18,12 @@ package app import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" _ "k8s.io/kubernetes/pkg/apis/autoscaling/install" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" hpastorage "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" ) diff --git a/federation/cmd/federation-apiserver/app/batch.go b/federation/cmd/federation-apiserver/app/batch.go index d085b3299de..e9d1f6acc56 100644 --- a/federation/cmd/federation-apiserver/app/batch.go +++ b/federation/cmd/federation-apiserver/app/batch.go @@ -18,12 +18,12 @@ package app import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" _ "k8s.io/kubernetes/pkg/apis/batch/install" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" jobstorage "k8s.io/kubernetes/pkg/registry/batch/job/storage" ) diff --git a/federation/cmd/federation-apiserver/app/core.go b/federation/cmd/federation-apiserver/app/core.go index 27ba016b60f..9fa60baf67f 100644 --- a/federation/cmd/federation-apiserver/app/core.go +++ b/federation/cmd/federation-apiserver/app/core.go @@ -26,14 +26,14 @@ import ( // TODO(nikhiljindal): Fix this by ensuring that pkg/api/install and federation/apis/core/install do not conflict with each other. _ "k8s.io/kubernetes/pkg/api/install" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/federation/apis/core" _ "k8s.io/kubernetes/federation/apis/core/install" "k8s.io/kubernetes/federation/apis/core/v1" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage" eventstore "k8s.io/kubernetes/pkg/registry/core/event/storage" namespacestore "k8s.io/kubernetes/pkg/registry/core/namespace/storage" diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index 21705fd8248..876c8f6b800 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -18,12 +18,12 @@ package app import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" _ "k8s.io/kubernetes/pkg/apis/extensions/install" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" daemonsetstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage" deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage" ingressstore "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage" diff --git a/federation/cmd/federation-apiserver/app/federation.go b/federation/cmd/federation-apiserver/app/federation.go index 1ba1932b88d..38ed7ead593 100644 --- a/federation/cmd/federation-apiserver/app/federation.go +++ b/federation/cmd/federation-apiserver/app/federation.go @@ -19,11 +19,11 @@ package app import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" _ "k8s.io/kubernetes/federation/apis/federation/install" clusteretcd "k8s.io/kubernetes/federation/registry/cluster/etcd" diff --git a/federation/cmd/federation-apiserver/app/server.go b/federation/cmd/federation-apiserver/app/server.go index 5836283da88..93018d8febf 100644 --- a/federation/cmd/federation-apiserver/app/server.go +++ b/federation/cmd/federation-apiserver/app/server.go @@ -36,15 +36,15 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/filters" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/generated/openapi" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/kubeapiserver" kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" "k8s.io/kubernetes/pkg/registry/cachesize" diff --git a/federation/registry/cluster/BUILD b/federation/registry/cluster/BUILD index 5eaffb2f21a..2594f7264f9 100644 --- a/federation/registry/cluster/BUILD +++ b/federation/registry/cluster/BUILD @@ -19,8 +19,6 @@ go_library( "//federation/apis/federation:go_default_library", "//federation/apis/federation/validation:go_default_library", "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -29,6 +27,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/federation/registry/cluster/etcd/BUILD b/federation/registry/cluster/etcd/BUILD index 5aeda7b1e09..844bbcabce0 100644 --- a/federation/registry/cluster/etcd/BUILD +++ b/federation/registry/cluster/etcd/BUILD @@ -16,12 +16,12 @@ go_library( "//federation/apis/federation:go_default_library", "//federation/registry/cluster:go_default_library", "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) @@ -33,13 +33,13 @@ go_test( deps = [ "//federation/apis/federation:go_default_library", "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) diff --git a/federation/registry/cluster/etcd/etcd.go b/federation/registry/cluster/etcd/etcd.go index 69647fdece7..16e7d07c641 100644 --- a/federation/registry/cluster/etcd/etcd.go +++ b/federation/registry/cluster/etcd/etcd.go @@ -19,12 +19,12 @@ package etcd import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/registry/cluster" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" ) diff --git a/federation/registry/cluster/etcd/etcd_test.go b/federation/registry/cluster/etcd/etcd_test.go index 62b72224e4d..f263f3f9c3d 100644 --- a/federation/registry/cluster/etcd/etcd_test.go +++ b/federation/registry/cluster/etcd/etcd_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/federation/registry/cluster/registry.go b/federation/registry/cluster/registry.go index b321375993c..ee1e972db5d 100644 --- a/federation/registry/cluster/registry.go +++ b/federation/registry/cluster/registry.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store Cluster objects. diff --git a/federation/registry/cluster/strategy.go b/federation/registry/cluster/strategy.go index dd573bc02d1..4688bc7ecbf 100644 --- a/federation/registry/cluster/strategy.go +++ b/federation/registry/cluster/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/apis/federation/validation" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) type clusterStrategy struct { diff --git a/hack/.linted_packages b/hack/.linted_packages index 9b1f162f8ad..b2dc72d6653 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -157,12 +157,6 @@ pkg/conversion pkg/conversion/queryparams pkg/credentialprovider/aws pkg/fields -pkg/genericapiserver -pkg/genericapiserver/endpoints/handlers/responsewriters -pkg/genericapiserver/endpoints/openapi -pkg/genericapiserver/registry -pkg/genericapiserver/server/mux -pkg/genericapiserver/server/routes pkg/hyperkube pkg/kubelet/api pkg/kubelet/container @@ -209,8 +203,6 @@ pkg/security/podsecuritypolicy/apparmor pkg/security/podsecuritypolicy/capabilities pkg/security/podsecuritypolicy/sysctl pkg/serviceaccount -pkg/storage/etcd3 -pkg/storage/storagebackend/factory pkg/types pkg/util/async pkg/util/errors @@ -282,10 +274,18 @@ staging/src/k8s.io/apiserver/pkg/authentication/authenticator staging/src/k8s.io/apiserver/pkg/authentication/request/union staging/src/k8s.io/apiserver/pkg/authentication/request/x509 staging/src/k8s.io/apiserver/pkg/authorization/union +staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters +staging/src/k8s.io/apiserver/pkg/endpoints/openapi staging/src/k8s.io/apiserver/pkg/endpoints/request -staging/src/k8s.io/apiserver/pkg/server +staging/src/k8s.io/apiserver/pkg/registry staging/src/k8s.io/apiserver/pkg/server/filters +staging/src/k8s.io/apiserver/pkg/server/mux +staging/src/k8s.io/apiserver/pkg/server/routes +staging/src/k8s.io/apiserver/pkg/storage/etcd3 +staging/src/k8s.io/apiserver/pkg/storage/etcd3 staging/src/k8s.io/apiserver/pkg/storage/names +staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory +staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory staging/src/k8s.io/apiserver/pkg/util/flushwriter staging/src/k8s.io/apiserver/plugin/pkg/authenticator staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password diff --git a/pkg/BUILD b/pkg/BUILD index 4e250349593..7a8335f4468 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -79,7 +79,6 @@ filegroup( "//pkg/fieldpath:all-srcs", "//pkg/fields:all-srcs", "//pkg/generated:all-srcs", - "//pkg/genericapiserver:all-srcs", "//pkg/hyperkube:all-srcs", "//pkg/kubeapiserver:all-srcs", "//pkg/kubectl:all-srcs", @@ -98,12 +97,6 @@ filegroup( "//pkg/securitycontext:all-srcs", "//pkg/serviceaccount:all-srcs", "//pkg/ssh:all-srcs", - "//pkg/storage/errors:all-srcs", - "//pkg/storage/etcd:all-srcs", - "//pkg/storage/etcd3:all-srcs", - "//pkg/storage/storagebackend/factory:all-srcs", - "//pkg/storage/testing:all-srcs", - "//pkg/storage/tests:all-srcs", "//pkg/types:all-srcs", "//pkg/util:all-srcs", "//pkg/version:all-srcs", diff --git a/pkg/controller/serviceaccount/BUILD b/pkg/controller/serviceaccount/BUILD index 1bed35c3f22..d91ca1f1e3d 100644 --- a/pkg/controller/serviceaccount/BUILD +++ b/pkg/controller/serviceaccount/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/client/legacylisters:go_default_library", "//pkg/client/retry:go_default_library", "//pkg/controller/informers:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/core/secret:go_default_library", "//pkg/registry/core/secret/storage:go_default_library", "//pkg/registry/core/serviceaccount:go_default_library", @@ -44,6 +43,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/workqueue", diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index b42ed29f363..36da904fb2e 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -19,10 +19,10 @@ package serviceaccount import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/core/secret" secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage" serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount" diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD deleted file mode 100644 index d799748af3a..00000000000 --- a/pkg/genericapiserver/BUILD +++ /dev/null @@ -1,32 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["doc.go"], - tags = ["automanaged"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/genericapiserver/endpoints:all-srcs", - "//pkg/genericapiserver/registry:all-srcs", - "//pkg/genericapiserver/server:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/doc.go b/pkg/genericapiserver/doc.go deleted file mode 100644 index c8b72f4e7d3..00000000000 --- a/pkg/genericapiserver/doc.go +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package genericapiserver contains code to setup a generic kubernetes-like API server. -// This does not contain any Kubernetes specific API types. -// Note that this is a work in progress. We are pulling out generic code (specifically from -// pkg/master) here. -// We plan to move this package into a separate repo on github once it is done. -// For more details: https://github.com/kubernetes/kubernetes/issues/2742 -package genericapiserver // import "k8s.io/kubernetes/pkg/genericapiserver" diff --git a/pkg/genericapiserver/endpoints/BUILD b/pkg/genericapiserver/endpoints/BUILD deleted file mode 100644 index e959874f5f8..00000000000 --- a/pkg/genericapiserver/endpoints/BUILD +++ /dev/null @@ -1,104 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = [ - "apiserver_test.go", - "installer_test.go", - "proxy_test.go", - "watch_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/genericapiserver/endpoints/filters:go_default_library", - "//pkg/genericapiserver/endpoints/handlers:go_default_library", - "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/endpoints/testing:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//plugin/pkg/admission/admit:go_default_library", - "//plugin/pkg/admission/deny:go_default_library", - "//vendor:github.com/emicklei/go-restful", - "//vendor:golang.org/x/net/websocket", - "//vendor:k8s.io/apimachinery/pkg/api/equality", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/fuzzer", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - ], -) - -go_library( - name = "go_default_library", - srcs = [ - "apiserver.go", - "discovery.go", - "doc.go", - "groupversion.go", - "installer.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/endpoints/handlers:go_default_library", - "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//vendor:github.com/emicklei/go-restful", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apimachinery/pkg/util/errors", - "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", - "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/genericapiserver/endpoints/filters:all-srcs", - "//pkg/genericapiserver/endpoints/handlers:all-srcs", - "//pkg/genericapiserver/endpoints/openapi:all-srcs", - "//pkg/genericapiserver/endpoints/testing:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/endpoints/filters/BUILD b/pkg/genericapiserver/endpoints/filters/BUILD deleted file mode 100644 index 2200b1145c9..00000000000 --- a/pkg/genericapiserver/endpoints/filters/BUILD +++ /dev/null @@ -1,73 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = [ - "audit_test.go", - "authentication_test.go", - "authorization_test.go", - "impersonation_test.go", - "requestinfo_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", - "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/client-go/pkg/apis/authentication", - ], -) - -go_library( - name = "go_default_library", - srcs = [ - "audit.go", - "authentication.go", - "authorization.go", - "doc.go", - "impersonation.go", - "requestinfo.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", - "//vendor:github.com/golang/glog", - "//vendor:github.com/pborman/uuid", - "//vendor:github.com/prometheus/client_golang/prometheus", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", - "//vendor:k8s.io/apiserver/pkg/authentication/serviceaccount", - "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/apiserver/pkg/server/httplog", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/apis/authentication", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/endpoints/handlers/BUILD b/pkg/genericapiserver/endpoints/handlers/BUILD deleted file mode 100644 index 090bab5c22c..00000000000 --- a/pkg/genericapiserver/endpoints/handlers/BUILD +++ /dev/null @@ -1,92 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = ["rest_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/testapi:go_default_library", - "//pkg/api/v1:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/evanphx/json-patch", - "//vendor:k8s.io/apimachinery/pkg/api/equality", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apimachinery/pkg/util/diff", - "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - ], -) - -go_library( - name = "go_default_library", - srcs = [ - "discovery.go", - "doc.go", - "patch.go", - "proxy.go", - "rest.go", - "watch.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/evanphx/json-patch", - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/websocket", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apimachinery/pkg/util/httpstream", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", - "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/apiserver/pkg/server/httplog", - "//vendor:k8s.io/apiserver/pkg/util/proxy", - "//vendor:k8s.io/apiserver/pkg/util/trace", - "//vendor:k8s.io/apiserver/pkg/util/wsstream", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/genericapiserver/endpoints/handlers/responsewriters:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD b/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD deleted file mode 100644 index effbfbc51f1..00000000000 --- a/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD +++ /dev/null @@ -1,57 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = ["status_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - ], -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "errors.go", - "status.go", - "writers.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/registry/rest:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/util/flushwriter", - "//vendor:k8s.io/apiserver/pkg/util/wsstream", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/endpoints/openapi/BUILD b/pkg/genericapiserver/endpoints/openapi/BUILD deleted file mode 100644 index 076eab64240..00000000000 --- a/pkg/genericapiserver/endpoints/openapi/BUILD +++ /dev/null @@ -1,49 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = ["openapi.go"], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/go-openapi/spec", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apiserver/pkg/util/trie", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) - -go_test( - name = "go_default_test", - srcs = ["openapi_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:github.com/go-openapi/spec", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - ], -) diff --git a/pkg/genericapiserver/endpoints/testing/BUILD b/pkg/genericapiserver/endpoints/testing/BUILD deleted file mode 100644 index d2dfc5ddd4a..00000000000 --- a/pkg/genericapiserver/endpoints/testing/BUILD +++ /dev/null @@ -1,36 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "types.generated.go", - "types.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/registry/BUILD b/pkg/genericapiserver/registry/BUILD deleted file mode 100644 index b67b7c1eab7..00000000000 --- a/pkg/genericapiserver/registry/BUILD +++ /dev/null @@ -1,31 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["doc.go"], - tags = ["automanaged"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/genericapiserver/registry/generic:all-srcs", - "//pkg/genericapiserver/registry/rest:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/registry/generic/BUILD b/pkg/genericapiserver/registry/generic/BUILD deleted file mode 100644 index 16e39610c74..00000000000 --- a/pkg/genericapiserver/registry/generic/BUILD +++ /dev/null @@ -1,46 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "matcher.go", - "options.go", - "storage_decorator.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/storage/storagebackend/factory:go_default_library", - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/genericapiserver/registry/generic/registry:all-srcs", - "//pkg/genericapiserver/registry/generic/rest:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/registry/generic/registry/BUILD b/pkg/genericapiserver/registry/generic/registry/BUILD deleted file mode 100644 index 2041d0f6a1b..00000000000 --- a/pkg/genericapiserver/registry/generic/registry/BUILD +++ /dev/null @@ -1,94 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "decorated_watcher.go", - "doc.go", - "storage_factory.go", - "store.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/storage/errors:go_default_library", - "//pkg/storage/etcd:go_default_library", - "//pkg/storage/storagebackend/factory:go_default_library", - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/api/validation/path", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "decorated_watcher_test.go", - "store_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/storage/etcd:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/storagebackend/factory:go_default_library", - "//pkg/storage/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/api/equality", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/selection", - "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/storage/names", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/registry/generic/rest/BUILD b/pkg/genericapiserver/registry/generic/rest/BUILD deleted file mode 100644 index 046827c3069..00000000000 --- a/pkg/genericapiserver/registry/generic/rest/BUILD +++ /dev/null @@ -1,70 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "proxy.go", - "response_checker.go", - "streamer.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/registry/rest:go_default_library", - "//vendor:github.com/golang/glog", - "//vendor:github.com/mxk/go-flowrate/flowrate", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/httpstream", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apiserver/pkg/features", - "//vendor:k8s.io/apiserver/pkg/util/feature", - "//vendor:k8s.io/apiserver/pkg/util/proxy", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "proxy_test.go", - "response_checker_test.go", - "streamer_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//vendor:github.com/stretchr/testify/assert", - "//vendor:github.com/stretchr/testify/require", - "//vendor:golang.org/x/net/websocket", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/httpstream", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apiserver/pkg/features", - "//vendor:k8s.io/apiserver/pkg/util/feature", - "//vendor:k8s.io/apiserver/pkg/util/proxy", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/registry/rest/BUILD b/pkg/genericapiserver/registry/rest/BUILD deleted file mode 100644 index 1ee54f4101b..00000000000 --- a/pkg/genericapiserver/registry/rest/BUILD +++ /dev/null @@ -1,67 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "create.go", - "delete.go", - "doc.go", - "export.go", - "meta.go", - "rest.go", - "update.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/api/validation", - "//vendor:k8s.io/apimachinery/pkg/api/validation/path", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/uuid", - "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/apiserver/pkg/storage/names", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/genericapiserver/registry/rest/resttest:all-srcs", - ], - tags = ["automanaged"], -) - -go_test( - name = "go_default_test", - srcs = ["meta_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/util/uuid", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - ], -) diff --git a/pkg/genericapiserver/registry/rest/resttest/BUILD b/pkg/genericapiserver/registry/rest/resttest/BUILD deleted file mode 100644 index ce3bb974a8c..00000000000 --- a/pkg/genericapiserver/registry/rest/resttest/BUILD +++ /dev/null @@ -1,42 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["resttest.go"], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/registry/rest:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/api/equality", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/validation/path", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/server/BUILD b/pkg/genericapiserver/server/BUILD deleted file mode 100644 index ba96422846b..00000000000 --- a/pkg/genericapiserver/server/BUILD +++ /dev/null @@ -1,131 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = [ - "genericapiserver_test.go", - "resource_config_test.go", - "serve_test.go", - "storage_factory_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//vendor:github.com/go-openapi/spec", - "//vendor:github.com/stretchr/testify/assert", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apimachinery", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apimachinery/pkg/version", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/install", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/apiserver/pkg/server/options", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - "//vendor:k8s.io/apiserver/pkg/util/flag", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/util/cert", - ], -) - -go_library( - name = "go_default_library", - srcs = [ - "config.go", - "config_selfclient.go", - "discovery.go", - "doc.go", - "genericapiserver.go", - "healthz.go", - "hooks.go", - "resource_config.go", - "resource_encoding_config.go", - "serve.go", - "storage_factory.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/endpoints:go_default_library", - "//pkg/genericapiserver/endpoints/filters:go_default_library", - "//pkg/genericapiserver/endpoints/openapi:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server/mux:go_default_library", - "//pkg/genericapiserver/server/routes:go_default_library", - "//vendor:github.com/coreos/go-systemd/daemon", - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/emicklei/go-restful/swagger", - "//vendor:github.com/go-openapi/spec", - "//vendor:github.com/golang/glog", - "//vendor:github.com/pborman/uuid", - "//vendor:github.com/pkg/errors", - "//vendor:gopkg.in/natefinch/lumberjack.v2", - "//vendor:k8s.io/apimachinery/pkg/apimachinery", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/openapi", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apimachinery/pkg/util/validation", - "//vendor:k8s.io/apimachinery/pkg/version", - "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", - "//vendor:k8s.io/apiserver/pkg/authentication/authenticatorfactory", - "//vendor:k8s.io/apiserver/pkg/authentication/request/union", - "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", - "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", - "//vendor:k8s.io/apiserver/pkg/authorization/union", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/apiserver/pkg/server/filters", - "//vendor:k8s.io/apiserver/pkg/server/healthz", - "//vendor:k8s.io/apiserver/pkg/server/options", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - "//vendor:k8s.io/client-go/rest", - "//vendor:k8s.io/client-go/util/cert", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/genericapiserver/server/mux:all-srcs", - "//pkg/genericapiserver/server/openapi:all-srcs", - "//pkg/genericapiserver/server/routes:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/server/doc.go b/pkg/genericapiserver/server/doc.go deleted file mode 100644 index b61ec1f5bba..00000000000 --- a/pkg/genericapiserver/server/doc.go +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package server contains the plumbing to create kubernetes-like API server command. -package server // import "k8s.io/kubernetes/pkg/genericapiserver/server" diff --git a/pkg/genericapiserver/server/mux/BUILD b/pkg/genericapiserver/server/mux/BUILD deleted file mode 100644 index 6010e23125f..00000000000 --- a/pkg/genericapiserver/server/mux/BUILD +++ /dev/null @@ -1,48 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "container.go", - "doc.go", - "pathrecorder.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - ], -) - -go_test( - name = "go_default_test", - srcs = ["container_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = ["//vendor:github.com/stretchr/testify/assert"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/server/openapi/BUILD b/pkg/genericapiserver/server/openapi/BUILD deleted file mode 100644 index f26b599df3e..00000000000 --- a/pkg/genericapiserver/server/openapi/BUILD +++ /dev/null @@ -1,53 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "openapi.go", - "util.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/server/mux:go_default_library", - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/go-openapi/spec", - "//vendor:k8s.io/apimachinery/pkg/openapi", - "//vendor:k8s.io/apimachinery/pkg/util/json", - "//vendor:k8s.io/apiserver/pkg/util/trie", - ], -) - -go_test( - name = "go_default_test", - srcs = ["openapi_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/go-openapi/spec", - "//vendor:github.com/stretchr/testify/assert", - "//vendor:k8s.io/apimachinery/pkg/openapi", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/server/routes/BUILD b/pkg/genericapiserver/server/routes/BUILD deleted file mode 100644 index d597a9dec3d..00000000000 --- a/pkg/genericapiserver/server/routes/BUILD +++ /dev/null @@ -1,52 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "index.go", - "metrics.go", - "openapi.go", - "profiling.go", - "swagger.go", - "swaggerui.go", - "version.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/server/mux:go_default_library", - "//pkg/genericapiserver/server/openapi:go_default_library", - "//vendor:github.com/elazarl/go-bindata-assetfs", - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/emicklei/go-restful/swagger", - "//vendor:github.com/golang/glog", - "//vendor:github.com/prometheus/client_golang/prometheus", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/openapi", - "//vendor:k8s.io/apimachinery/pkg/version", - "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", - "//vendor:k8s.io/apiserver/pkg/server/routes/data/swagger", - "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/kubeapiserver/BUILD b/pkg/kubeapiserver/BUILD index 928de503e90..f2fcd34356d 100644 --- a/pkg/kubeapiserver/BUILD +++ b/pkg/kubeapiserver/BUILD @@ -17,9 +17,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/apiserver/pkg/util/flag", ], @@ -55,7 +55,7 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/install:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index e78536e1c74..64f9089d6dd 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder.go +++ b/pkg/kubeapiserver/default_storage_factory_builder.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/storage/storagebackend" utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/api" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" ) // Builds the DefaultStorageFactory. diff --git a/pkg/kubeapiserver/default_storage_factory_builder_test.go b/pkg/kubeapiserver/default_storage_factory_builder_test.go index cf956bb8639..3a058f61db2 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder_test.go +++ b/pkg/kubeapiserver/default_storage_factory_builder_test.go @@ -21,12 +21,12 @@ import ( "testing" "k8s.io/apimachinery/pkg/runtime/schema" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" _ "k8s.io/kubernetes/pkg/api/install" apiv1 "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apis/extensions/install" extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" ) func TestParseRuntimeConfig(t *testing.T) { diff --git a/pkg/kubeapiserver/options/BUILD b/pkg/kubeapiserver/options/BUILD index 98fc6ee33e7..788ef10785a 100644 --- a/pkg/kubeapiserver/options/BUILD +++ b/pkg/kubeapiserver/options/BUILD @@ -22,12 +22,12 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/controller/informers:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/kubeapiserver/authenticator:go_default_library", "//pkg/kubeapiserver/authorizer:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/spf13/pflag", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/options", ], ) diff --git a/pkg/kubeapiserver/options/authentication.go b/pkg/kubeapiserver/options/authentication.go index 37077dba4a3..1cfb9a86c0c 100644 --- a/pkg/kubeapiserver/options/authentication.go +++ b/pkg/kubeapiserver/options/authentication.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "github.com/spf13/pflag" + genericapiserver "k8s.io/apiserver/pkg/server" genericoptions "k8s.io/apiserver/pkg/server/options" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/kubeapiserver/authenticator" "k8s.io/kubernetes/pkg/kubeapiserver/authorizer" ) diff --git a/pkg/kubelet/secret/BUILD b/pkg/kubelet/secret/BUILD index 04f72a9846b..765498afdc1 100644 --- a/pkg/kubelet/secret/BUILD +++ b/pkg/kubelet/secret/BUILD @@ -36,10 +36,10 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/kubelet/util:go_default_library", - "//pkg/storage/etcd:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apiserver/pkg/storage/etcd", "//vendor:k8s.io/client-go/util/clock", ], ) diff --git a/pkg/kubelet/secret/secret_manager.go b/pkg/kubelet/secret/secret_manager.go index 5a5e0788f76..207fa853c0f 100644 --- a/pkg/kubelet/secret/secret_manager.go +++ b/pkg/kubelet/secret/secret_manager.go @@ -21,10 +21,10 @@ import ( "sync" "time" + storageetcd "k8s.io/apiserver/pkg/storage/etcd" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/kubelet/util" - storageetcd "k8s.io/kubernetes/pkg/storage/etcd" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/master/BUILD b/pkg/master/BUILD index c6aa0caedc2..d23f73954ef 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -49,9 +49,6 @@ go_library( "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master/thirdparty:go_default_library", "//pkg/master/tunneler:go_default_library", @@ -82,6 +79,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/healthz", ], ) @@ -114,9 +114,7 @@ go_test( "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/kubelet/client:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/go-openapi/loads", "//vendor:github.com/go-openapi/spec", @@ -131,6 +129,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/testing", ], diff --git a/pkg/master/controller.go b/pkg/master/controller.go index 716ff898f97..c98adc89b6f 100644 --- a/pkg/master/controller.go +++ b/pkg/master/controller.go @@ -28,10 +28,10 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/endpoints" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" corerest "k8s.io/kubernetes/pkg/registry/core/rest" servicecontroller "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller" diff --git a/pkg/master/master.go b/pkg/master/master.go index 7a7a4bbf97b..fccdfb6d326 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -27,6 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" utilnet "k8s.io/apimachinery/pkg/util/net" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/healthz" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/api" @@ -44,9 +47,6 @@ import ( storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" corev1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/thirdparty" "k8s.io/kubernetes/pkg/master/tunneler" diff --git a/pkg/master/master_openapi_test.go b/pkg/master/master_openapi_test.go index 416573d60d8..d4f96bdf490 100644 --- a/pkg/master/master_openapi_test.go +++ b/pkg/master/master_openapi_test.go @@ -27,9 +27,9 @@ import ( "net/http/httptest" "testing" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" openapigen "k8s.io/kubernetes/pkg/generated/openapi" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "github.com/go-openapi/loads" "github.com/go-openapi/spec" diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index f4289c69970..15312603266 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -33,6 +33,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/version" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericapiserver "k8s.io/apiserver/pkg/server" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" @@ -49,9 +51,7 @@ import ( extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" kubeversion "k8s.io/kubernetes/pkg/version" "github.com/stretchr/testify/assert" diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index 15aca9ba7d8..aa6e84604be 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -14,11 +14,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/endpoints:go_default_library", - "//pkg/genericapiserver/endpoints/handlers:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/extensions/rest:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata/storage:go_default_library", @@ -27,7 +22,12 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/endpoints", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index fa612ab6639..9b116b0ef74 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -27,15 +27,15 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + genericapi "k8s.io/apiserver/pkg/endpoints" + genericapihandlers "k8s.io/apiserver/pkg/endpoints/handlers" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - genericapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints" - genericapihandlers "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" thirdpartyresourcedatastore "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/storage" diff --git a/pkg/registry/apps/petset/BUILD b/pkg/registry/apps/petset/BUILD index 502e0d8b9a1..d6b9ba448ac 100644 --- a/pkg/registry/apps/petset/BUILD +++ b/pkg/registry/apps/petset/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/apps/petset/storage/BUILD b/pkg/registry/apps/petset/storage/BUILD index 57d533e85d1..94ec11c5267 100644 --- a/pkg/registry/apps/petset/storage/BUILD +++ b/pkg/registry/apps/petset/storage/BUILD @@ -16,14 +16,14 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -34,14 +34,14 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/apps/petset:go_default_library", "//pkg/registry/cachesize:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/apps/petset/storage/storage.go b/pkg/registry/apps/petset/storage/storage.go index eded49cc02d..1ada3edd5bb 100644 --- a/pkg/registry/apps/petset/storage/storage.go +++ b/pkg/registry/apps/petset/storage/storage.go @@ -20,11 +20,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" appsapi "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/apps/petset" "k8s.io/kubernetes/pkg/registry/cachesize" ) diff --git a/pkg/registry/apps/petset/storage/storage_test.go b/pkg/registry/apps/petset/storage/storage_test.go index cbeace275c2..1ddc6984f31 100644 --- a/pkg/registry/apps/petset/storage/storage_test.go +++ b/pkg/registry/apps/petset/storage/storage_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) // TODO: allow for global factory override diff --git a/pkg/registry/apps/petset/strategy.go b/pkg/registry/apps/petset/strategy.go index 62b0de01cce..a60f8f7e284 100644 --- a/pkg/registry/apps/petset/strategy.go +++ b/pkg/registry/apps/petset/strategy.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // statefulSetStrategy implements verification logic for Replication StatefulSets. diff --git a/pkg/registry/apps/rest/BUILD b/pkg/registry/apps/rest/BUILD index 995ebecc3ef..60e855bbf04 100644 --- a/pkg/registry/apps/rest/BUILD +++ b/pkg/registry/apps/rest/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/apps/petset/storage:go_default_library", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/apps/rest/storage_apps.go b/pkg/registry/apps/rest/storage_apps.go index aef03c76989..45931c5f2c8 100644 --- a/pkg/registry/apps/rest/storage_apps.go +++ b/pkg/registry/apps/rest/storage_apps.go @@ -17,12 +17,12 @@ limitations under the License. package rest import ( + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" appsapiv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" statefulsetstore "k8s.io/kubernetes/pkg/registry/apps/petset/storage" ) diff --git a/pkg/registry/authentication/rest/BUILD b/pkg/registry/authentication/rest/BUILD index 243cc2a5136..e6e5188706e 100644 --- a/pkg/registry/authentication/rest/BUILD +++ b/pkg/registry/authentication/rest/BUILD @@ -15,11 +15,11 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/authentication:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/authentication/tokenreview:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/authentication/rest/storage_authentication.go b/pkg/registry/authentication/rest/storage_authentication.go index 6ebbd4caadd..c0873fbc6c0 100644 --- a/pkg/registry/authentication/rest/storage_authentication.go +++ b/pkg/registry/authentication/rest/storage_authentication.go @@ -18,12 +18,12 @@ package rest import ( "k8s.io/apiserver/pkg/authentication/authenticator" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/authentication" authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/registry/authentication/tokenreview" ) diff --git a/pkg/registry/authorization/rest/BUILD b/pkg/registry/authorization/rest/BUILD index 947108e6df3..580fa5c6f71 100644 --- a/pkg/registry/authorization/rest/BUILD +++ b/pkg/registry/authorization/rest/BUILD @@ -15,13 +15,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/authorization/localsubjectaccessreview:go_default_library", "//pkg/registry/authorization/selfsubjectaccessreview:go_default_library", "//pkg/registry/authorization/subjectaccessreview:go_default_library", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/authorization/rest/storage_authorization.go b/pkg/registry/authorization/rest/storage_authorization.go index 6a51ee3d984..d0414489113 100644 --- a/pkg/registry/authorization/rest/storage_authorization.go +++ b/pkg/registry/authorization/rest/storage_authorization.go @@ -18,12 +18,12 @@ package rest import ( "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/authorization" authorizationv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/registry/authorization/localsubjectaccessreview" "k8s.io/kubernetes/pkg/registry/authorization/selfsubjectaccessreview" "k8s.io/kubernetes/pkg/registry/authorization/subjectaccessreview" diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD index 95bc2a118a6..2d9da84dfb1 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD @@ -16,13 +16,13 @@ go_test( deps = [ "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -33,14 +33,14 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler:go_default_library", "//pkg/registry/cachesize:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go index bbbeb13c283..5ad8cd6cbad 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go @@ -20,11 +20,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler" "k8s.io/kubernetes/pkg/registry/cachesize" ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go index bc07f0d48ae..f909be31727 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" _ "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/autoscaling/rest/BUILD b/pkg/registry/autoscaling/rest/BUILD index 4b29650a010..488f898e209 100644 --- a/pkg/registry/autoscaling/rest/BUILD +++ b/pkg/registry/autoscaling/rest/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/autoscaling/rest/storage_autoscaling.go b/pkg/registry/autoscaling/rest/storage_autoscaling.go index 081d4c33d0f..e413ca20e5f 100644 --- a/pkg/registry/autoscaling/rest/storage_autoscaling.go +++ b/pkg/registry/autoscaling/rest/storage_autoscaling.go @@ -17,12 +17,12 @@ limitations under the License. package rest import ( + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" autoscalingapiv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" horizontalpodautoscalerstore "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" ) diff --git a/pkg/registry/batch/cronjob/BUILD b/pkg/registry/batch/cronjob/BUILD index a8dd88011e8..7aa23f96a3b 100644 --- a/pkg/registry/batch/cronjob/BUILD +++ b/pkg/registry/batch/cronjob/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/batch/cronjob/storage/BUILD b/pkg/registry/batch/cronjob/storage/BUILD index 52243754cf5..70bd9c55dfe 100644 --- a/pkg/registry/batch/cronjob/storage/BUILD +++ b/pkg/registry/batch/cronjob/storage/BUILD @@ -18,13 +18,13 @@ go_test( "//pkg/api/testapi:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -35,14 +35,14 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/batch/cronjob:go_default_library", "//pkg/registry/cachesize:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/batch/cronjob/storage/storage.go b/pkg/registry/batch/cronjob/storage/storage.go index e6b4dc5d6f5..618f0ffa321 100644 --- a/pkg/registry/batch/cronjob/storage/storage.go +++ b/pkg/registry/batch/cronjob/storage/storage.go @@ -20,11 +20,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/batch/cronjob" "k8s.io/kubernetes/pkg/registry/cachesize" ) diff --git a/pkg/registry/batch/cronjob/storage/storage_test.go b/pkg/registry/batch/cronjob/storage/storage_test.go index 58e77dc771a..bc5bf86cbed 100644 --- a/pkg/registry/batch/cronjob/storage/storage_test.go +++ b/pkg/registry/batch/cronjob/storage/storage_test.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) // TODO: allow for global factory override diff --git a/pkg/registry/batch/cronjob/strategy.go b/pkg/registry/batch/cronjob/strategy.go index fc6f8bf907f..4960a758951 100644 --- a/pkg/registry/batch/cronjob/strategy.go +++ b/pkg/registry/batch/cronjob/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // scheduledJobStrategy implements verification logic for Replication Controllers. diff --git a/pkg/registry/batch/job/BUILD b/pkg/registry/batch/job/BUILD index 43be65582dd..d93fef5a26e 100644 --- a/pkg/registry/batch/job/BUILD +++ b/pkg/registry/batch/job/BUILD @@ -19,13 +19,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/batch/job/storage/BUILD b/pkg/registry/batch/job/storage/BUILD index d6ab1bab6f6..48c5a795cf1 100644 --- a/pkg/registry/batch/job/storage/BUILD +++ b/pkg/registry/batch/job/storage/BUILD @@ -16,13 +16,13 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -33,14 +33,14 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/batch/job:go_default_library", "//pkg/registry/cachesize:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/batch/job/storage/storage.go b/pkg/registry/batch/job/storage/storage.go index 88d497b2fa2..ae4baaf0dd8 100644 --- a/pkg/registry/batch/job/storage/storage.go +++ b/pkg/registry/batch/job/storage/storage.go @@ -20,11 +20,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/batch/job" "k8s.io/kubernetes/pkg/registry/cachesize" ) diff --git a/pkg/registry/batch/job/storage/storage_test.go b/pkg/registry/batch/job/storage/storage_test.go index 467c574bc3b..2e73e8b59be 100644 --- a/pkg/registry/batch/job/storage/storage_test.go +++ b/pkg/registry/batch/job/storage/storage_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*JobStorage, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/batch/job/strategy.go b/pkg/registry/batch/job/strategy.go index 6c3844639c1..4a184a9f69a 100644 --- a/pkg/registry/batch/job/strategy.go +++ b/pkg/registry/batch/job/strategy.go @@ -26,12 +26,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // jobStrategy implements verification logic for Replication Controllers. diff --git a/pkg/registry/batch/rest/BUILD b/pkg/registry/batch/rest/BUILD index b8299ef2e3a..5c361e528e6 100644 --- a/pkg/registry/batch/rest/BUILD +++ b/pkg/registry/batch/rest/BUILD @@ -16,12 +16,12 @@ go_library( "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/batch/cronjob/storage:go_default_library", "//pkg/registry/batch/job/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/batch/rest/storage_batch.go b/pkg/registry/batch/rest/storage_batch.go index aeb7c661293..97abbb8c6eb 100644 --- a/pkg/registry/batch/rest/storage_batch.go +++ b/pkg/registry/batch/rest/storage_batch.go @@ -18,13 +18,13 @@ package rest import ( "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "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/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" cronjobstore "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage" jobstore "k8s.io/kubernetes/pkg/registry/batch/job/storage" ) diff --git a/pkg/registry/cachesize/BUILD b/pkg/registry/cachesize/BUILD index 70807693860..943a3c4ae44 100644 --- a/pkg/registry/cachesize/BUILD +++ b/pkg/registry/cachesize/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["cachesize.go"], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/cachesize/cachesize.go b/pkg/registry/cachesize/cachesize.go index ffd05cf3a3b..e3dee480dd0 100644 --- a/pkg/registry/cachesize/cachesize.go +++ b/pkg/registry/cachesize/cachesize.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/generic/registry" ) type Resource string diff --git a/pkg/registry/certificates/certificates/BUILD b/pkg/registry/certificates/certificates/BUILD index 2d2aa4ea79e..04e605adaa3 100644 --- a/pkg/registry/certificates/certificates/BUILD +++ b/pkg/registry/certificates/certificates/BUILD @@ -20,8 +20,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -30,6 +28,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/certificates/certificates/registry.go b/pkg/registry/certificates/certificates/registry.go index 6bd68b54510..1c78c71b582 100644 --- a/pkg/registry/certificates/certificates/registry.go +++ b/pkg/registry/certificates/certificates/registry.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/certificates" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store CSRs. diff --git a/pkg/registry/certificates/certificates/storage/BUILD b/pkg/registry/certificates/certificates/storage/BUILD index 619d630a94c..dc9ab3b7926 100644 --- a/pkg/registry/certificates/certificates/storage/BUILD +++ b/pkg/registry/certificates/certificates/storage/BUILD @@ -14,13 +14,13 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/certificates:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/certificates/certificates:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/certificates/certificates/storage/storage.go b/pkg/registry/certificates/certificates/storage/storage.go index a24693c7922..3f1ae589cd3 100644 --- a/pkg/registry/certificates/certificates/storage/storage.go +++ b/pkg/registry/certificates/certificates/storage/storage.go @@ -19,11 +19,11 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/certificates" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" csrregistry "k8s.io/kubernetes/pkg/registry/certificates/certificates" ) diff --git a/pkg/registry/certificates/certificates/strategy.go b/pkg/registry/certificates/certificates/strategy.go index a01b8f9f4fa..dde60fa6006 100644 --- a/pkg/registry/certificates/certificates/strategy.go +++ b/pkg/registry/certificates/certificates/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/certificates/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // csrStrategy implements behavior for CSRs diff --git a/pkg/registry/certificates/rest/BUILD b/pkg/registry/certificates/rest/BUILD index b86306ec31f..2b8817e2ead 100644 --- a/pkg/registry/certificates/rest/BUILD +++ b/pkg/registry/certificates/rest/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/v1beta1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/certificates/certificates/storage:go_default_library", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/certificates/rest/storage_certificates.go b/pkg/registry/certificates/rest/storage_certificates.go index 465c49a7756..84b04e448b9 100644 --- a/pkg/registry/certificates/rest/storage_certificates.go +++ b/pkg/registry/certificates/rest/storage_certificates.go @@ -17,12 +17,12 @@ limitations under the License. package rest import ( + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/certificates" certificatesapiv1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" certificatestore "k8s.io/kubernetes/pkg/registry/certificates/certificates/storage" ) diff --git a/pkg/registry/core/configmap/BUILD b/pkg/registry/core/configmap/BUILD index 73cdf75077f..2b5245a9478 100644 --- a/pkg/registry/core/configmap/BUILD +++ b/pkg/registry/core/configmap/BUILD @@ -19,8 +19,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -29,6 +27,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/configmap/registry.go b/pkg/registry/core/configmap/registry.go index d80c79c7153..581d40a9798 100644 --- a/pkg/registry/core/configmap/registry.go +++ b/pkg/registry/core/configmap/registry.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ConfigMaps. diff --git a/pkg/registry/core/configmap/storage/BUILD b/pkg/registry/core/configmap/storage/BUILD index 1bafe282b2c..4666ad18fa0 100644 --- a/pkg/registry/core/configmap/storage/BUILD +++ b/pkg/registry/core/configmap/storage/BUILD @@ -15,13 +15,13 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -31,11 +31,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/configmap:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/core/configmap/storage/storage.go b/pkg/registry/core/configmap/storage/storage.go index b6f534b3b48..c03da4a8064 100644 --- a/pkg/registry/core/configmap/storage/storage.go +++ b/pkg/registry/core/configmap/storage/storage.go @@ -18,9 +18,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/configmap" ) diff --git a/pkg/registry/core/configmap/storage/storage_test.go b/pkg/registry/core/configmap/storage/storage_test.go index d951c103a86..74252844e76 100644 --- a/pkg/registry/core/configmap/storage/storage_test.go +++ b/pkg/registry/core/configmap/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/configmap/strategy.go b/pkg/registry/core/configmap/strategy.go index 2f0ab08181d..2e45c2bb708 100644 --- a/pkg/registry/core/configmap/strategy.go +++ b/pkg/registry/core/configmap/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // strategy implements behavior for ConfigMap objects diff --git a/pkg/registry/core/endpoint/BUILD b/pkg/registry/core/endpoint/BUILD index 6771d58afbc..89bc68ced4f 100644 --- a/pkg/registry/core/endpoint/BUILD +++ b/pkg/registry/core/endpoint/BUILD @@ -20,8 +20,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/endpoints:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -30,6 +28,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/endpoint/registry.go b/pkg/registry/core/endpoint/registry.go index 79487af96f4..86d969e9b0e 100644 --- a/pkg/registry/core/endpoint/registry.go +++ b/pkg/registry/core/endpoint/registry.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store endpoints. diff --git a/pkg/registry/core/endpoint/storage/BUILD b/pkg/registry/core/endpoint/storage/BUILD index 7018523719c..aae777b5d1e 100644 --- a/pkg/registry/core/endpoint/storage/BUILD +++ b/pkg/registry/core/endpoint/storage/BUILD @@ -15,13 +15,13 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -31,11 +31,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/endpoint:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/core/endpoint/storage/storage.go b/pkg/registry/core/endpoint/storage/storage.go index 63a25b6ec6d..bd17aaa6771 100644 --- a/pkg/registry/core/endpoint/storage/storage.go +++ b/pkg/registry/core/endpoint/storage/storage.go @@ -18,9 +18,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/endpoint" ) diff --git a/pkg/registry/core/endpoint/storage/storage_test.go b/pkg/registry/core/endpoint/storage/storage_test.go index 1b89cd052d8..fe5674b0c5f 100644 --- a/pkg/registry/core/endpoint/storage/storage_test.go +++ b/pkg/registry/core/endpoint/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/endpoint/strategy.go b/pkg/registry/core/endpoint/strategy.go index bdf727f4fa1..d095eca276d 100644 --- a/pkg/registry/core/endpoint/strategy.go +++ b/pkg/registry/core/endpoint/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" pkgstorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" endptspkg "k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // endpointsStrategy implements behavior for Endpoints diff --git a/pkg/registry/core/event/BUILD b/pkg/registry/core/event/BUILD index 80daeca1096..6a21ef008f4 100644 --- a/pkg/registry/core/event/BUILD +++ b/pkg/registry/core/event/BUILD @@ -18,12 +18,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/event/storage/BUILD b/pkg/registry/core/event/storage/BUILD index 02cfd85b953..f0e92270adc 100644 --- a/pkg/registry/core/event/storage/BUILD +++ b/pkg/registry/core/event/storage/BUILD @@ -15,11 +15,11 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -29,11 +29,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/event:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/core/event/storage/storage.go b/pkg/registry/core/event/storage/storage.go index 946ee8a2da7..9137ee53395 100644 --- a/pkg/registry/core/event/storage/storage.go +++ b/pkg/registry/core/event/storage/storage.go @@ -18,9 +18,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/event" ) diff --git a/pkg/registry/core/event/storage/storage_test.go b/pkg/registry/core/event/storage/storage_test.go index b804225766c..eacd4abeaca 100644 --- a/pkg/registry/core/event/storage/storage_test.go +++ b/pkg/registry/core/event/storage/storage_test.go @@ -21,10 +21,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) var testTTL uint64 = 60 diff --git a/pkg/registry/core/event/strategy.go b/pkg/registry/core/event/strategy.go index 9cc5c24aac8..924dc795ee6 100644 --- a/pkg/registry/core/event/strategy.go +++ b/pkg/registry/core/event/strategy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) type eventStrategy struct { diff --git a/pkg/registry/core/limitrange/storage/BUILD b/pkg/registry/core/limitrange/storage/BUILD index 20a99459e30..892b60b480c 100644 --- a/pkg/registry/core/limitrange/storage/BUILD +++ b/pkg/registry/core/limitrange/storage/BUILD @@ -15,14 +15,14 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -32,11 +32,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/limitrange:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/core/limitrange/storage/storage.go b/pkg/registry/core/limitrange/storage/storage.go index afb4632860d..65b2a451380 100644 --- a/pkg/registry/core/limitrange/storage/storage.go +++ b/pkg/registry/core/limitrange/storage/storage.go @@ -18,9 +18,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/limitrange" ) diff --git a/pkg/registry/core/limitrange/storage/storage_test.go b/pkg/registry/core/limitrange/storage/storage_test.go index 044d741c95e..32dc13893ae 100644 --- a/pkg/registry/core/limitrange/storage/storage_test.go +++ b/pkg/registry/core/limitrange/storage/storage_test.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/namespace/BUILD b/pkg/registry/core/namespace/BUILD index 839e93e00ed..d405b1334c6 100644 --- a/pkg/registry/core/namespace/BUILD +++ b/pkg/registry/core/namespace/BUILD @@ -19,8 +19,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -29,6 +27,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/namespace/registry.go b/pkg/registry/core/namespace/registry.go index 58cbb0f2d99..5cb6fcdf157 100644 --- a/pkg/registry/core/namespace/registry.go +++ b/pkg/registry/core/namespace/registry.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store Namespace objects. diff --git a/pkg/registry/core/namespace/storage/BUILD b/pkg/registry/core/namespace/storage/BUILD index b05b1b5a165..ac28180f74f 100644 --- a/pkg/registry/core/namespace/storage/BUILD +++ b/pkg/registry/core/namespace/storage/BUILD @@ -15,13 +15,13 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -31,17 +31,17 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/namespace:go_default_library", - "//pkg/storage/errors:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/errors", ], ) diff --git a/pkg/registry/core/namespace/storage/storage.go b/pkg/registry/core/namespace/storage/storage.go index a169b6ad476..ecdcdd26745 100644 --- a/pkg/registry/core/namespace/storage/storage.go +++ b/pkg/registry/core/namespace/storage/storage.go @@ -23,14 +23,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" + storageerr "k8s.io/apiserver/pkg/storage/errors" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/namespace" - storageerr "k8s.io/kubernetes/pkg/storage/errors" ) // rest implements a RESTStorage for namespaces diff --git a/pkg/registry/core/namespace/storage/storage_test.go b/pkg/registry/core/namespace/storage/storage_test.go index 2418c33546f..80f37ab9994 100644 --- a/pkg/registry/core/namespace/storage/storage_test.go +++ b/pkg/registry/core/namespace/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/namespace/strategy.go b/pkg/registry/core/namespace/strategy.go index 69fc38adb9c..6826bdfcc13 100644 --- a/pkg/registry/core/namespace/strategy.go +++ b/pkg/registry/core/namespace/strategy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // namespaceStrategy implements behavior for Namespaces diff --git a/pkg/registry/core/node/BUILD b/pkg/registry/core/node/BUILD index 298a5954937..25efa349eb8 100644 --- a/pkg/registry/core/node/BUILD +++ b/pkg/registry/core/node/BUILD @@ -19,8 +19,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", @@ -33,6 +31,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/node/registry.go b/pkg/registry/core/node/registry.go index 0bd61e58320..a6505f37d4f 100644 --- a/pkg/registry/core/node/registry.go +++ b/pkg/registry/core/node/registry.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store node. diff --git a/pkg/registry/core/node/rest/BUILD b/pkg/registry/core/node/rest/BUILD index 0162d0fcd27..0b01a9731aa 100644 --- a/pkg/registry/core/node/rest/BUILD +++ b/pkg/registry/core/node/rest/BUILD @@ -14,13 +14,13 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/capabilities:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/generic/rest:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/node:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/generic/rest", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/core/node/rest/proxy.go b/pkg/registry/core/node/rest/proxy.go index 5195707e1eb..33167402e60 100644 --- a/pkg/registry/core/node/rest/proxy.go +++ b/pkg/registry/core/node/rest/proxy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + genericrest "k8s.io/apiserver/pkg/registry/generic/rest" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/capabilities" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/node" ) diff --git a/pkg/registry/core/node/storage/BUILD b/pkg/registry/core/node/storage/BUILD index 43940b4e206..5ae102c5e61 100644 --- a/pkg/registry/core/node/storage/BUILD +++ b/pkg/registry/core/node/storage/BUILD @@ -15,15 +15,15 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -34,9 +34,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/node:go_default_library", @@ -44,6 +41,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/core/node/storage/storage.go b/pkg/registry/core/node/storage/storage.go index 06b802549ef..e59bed43729 100644 --- a/pkg/registry/core/node/storage/storage.go +++ b/pkg/registry/core/node/storage/storage.go @@ -24,11 +24,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/node" diff --git a/pkg/registry/core/node/storage/storage_test.go b/pkg/registry/core/node/storage/storage_test.go index 9716688c212..c44eabfaf9c 100644 --- a/pkg/registry/core/node/storage/storage_test.go +++ b/pkg/registry/core/node/storage/storage_test.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/node/strategy.go b/pkg/registry/core/node/strategy.go index dcfe21e1620..e023364d756 100644 --- a/pkg/registry/core/node/strategy.go +++ b/pkg/registry/core/node/strategy.go @@ -31,11 +31,11 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" pkgstorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/kubelet/client" ) diff --git a/pkg/registry/core/persistentvolume/BUILD b/pkg/registry/core/persistentvolume/BUILD index 82e3a155cef..1c73e930825 100644 --- a/pkg/registry/core/persistentvolume/BUILD +++ b/pkg/registry/core/persistentvolume/BUILD @@ -18,12 +18,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/persistentvolume/storage/BUILD b/pkg/registry/core/persistentvolume/storage/BUILD index d3f3eb41855..5bcea34c6c9 100644 --- a/pkg/registry/core/persistentvolume/storage/BUILD +++ b/pkg/registry/core/persistentvolume/storage/BUILD @@ -15,10 +15,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -27,6 +24,9 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -36,14 +36,14 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/persistentvolume:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/core/persistentvolume/storage/storage.go b/pkg/registry/core/persistentvolume/storage/storage.go index f739244c17d..0a8162210f5 100644 --- a/pkg/registry/core/persistentvolume/storage/storage.go +++ b/pkg/registry/core/persistentvolume/storage/storage.go @@ -20,10 +20,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/persistentvolume" ) diff --git a/pkg/registry/core/persistentvolume/storage/storage_test.go b/pkg/registry/core/persistentvolume/storage/storage_test.go index bcd19059a79..857cda5f02c 100644 --- a/pkg/registry/core/persistentvolume/storage/storage_test.go +++ b/pkg/registry/core/persistentvolume/storage/storage_test.go @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/persistentvolume/strategy.go b/pkg/registry/core/persistentvolume/strategy.go index 05ac509083c..7157617cd02 100644 --- a/pkg/registry/core/persistentvolume/strategy.go +++ b/pkg/registry/core/persistentvolume/strategy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // persistentvolumeStrategy implements behavior for PersistentVolume objects diff --git a/pkg/registry/core/persistentvolumeclaim/BUILD b/pkg/registry/core/persistentvolumeclaim/BUILD index 989c4beda18..d0c359c23d1 100644 --- a/pkg/registry/core/persistentvolumeclaim/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/BUILD @@ -18,12 +18,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/persistentvolumeclaim/storage/BUILD b/pkg/registry/core/persistentvolumeclaim/storage/BUILD index c2d7b55823d..3340f6759e2 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/storage/BUILD @@ -15,10 +15,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -27,6 +24,9 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -36,14 +36,14 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/persistentvolumeclaim:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/core/persistentvolumeclaim/storage/storage.go b/pkg/registry/core/persistentvolumeclaim/storage/storage.go index 02e0007fde8..fd58972a66d 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage.go @@ -20,10 +20,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim" ) diff --git a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go index d375344169a..aaa31432cb5 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/persistentvolumeclaim/strategy.go b/pkg/registry/core/persistentvolumeclaim/strategy.go index 48b976eda1a..386ed5c196a 100644 --- a/pkg/registry/core/persistentvolumeclaim/strategy.go +++ b/pkg/registry/core/persistentvolumeclaim/strategy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // persistentvolumeclaimStrategy implements behavior for PersistentVolumeClaim objects diff --git a/pkg/registry/core/pod/BUILD b/pkg/registry/core/pod/BUILD index e914bd64946..b54df9e86a7 100644 --- a/pkg/registry/core/pod/BUILD +++ b/pkg/registry/core/pod/BUILD @@ -18,7 +18,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/kubelet/qos:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -30,6 +29,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/pod/rest/BUILD b/pkg/registry/core/pod/rest/BUILD index b81f667df89..8c756aca9e5 100644 --- a/pkg/registry/core/pod/rest/BUILD +++ b/pkg/registry/core/pod/rest/BUILD @@ -19,14 +19,14 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/capabilities:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/generic/rest:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/pod:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/generic/rest", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) @@ -37,11 +37,11 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/core/pod/rest/log.go b/pkg/registry/core/pod/rest/log.go index ded62e4c095..a7877975cfd 100644 --- a/pkg/registry/core/pod/rest/log.go +++ b/pkg/registry/core/pod/rest/log.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + genericrest "k8s.io/apiserver/pkg/registry/generic/rest" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" ) diff --git a/pkg/registry/core/pod/rest/log_test.go b/pkg/registry/core/pod/rest/log_test.go index 9e2a2d77d90..e81197216b8 100644 --- a/pkg/registry/core/pod/rest/log_test.go +++ b/pkg/registry/core/pod/rest/log_test.go @@ -21,9 +21,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/core/pod/rest/subresources.go b/pkg/registry/core/pod/rest/subresources.go index 0b3e27443b2..2cfc6b7242a 100644 --- a/pkg/registry/core/pod/rest/subresources.go +++ b/pkg/registry/core/pod/rest/subresources.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + genericrest "k8s.io/apiserver/pkg/registry/generic/rest" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/capabilities" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" ) diff --git a/pkg/registry/core/pod/storage/BUILD b/pkg/registry/core/pod/storage/BUILD index 769814c7b77..763ff40f3bf 100644 --- a/pkg/registry/core/pod/storage/BUILD +++ b/pkg/registry/core/pod/storage/BUILD @@ -15,12 +15,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/securitycontext:go_default_library", - "//pkg/storage/errors:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:golang.org/x/net/context", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -30,7 +26,11 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/errors", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -47,21 +47,21 @@ go_library( "//pkg/apis/policy:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/client/retry:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/pod:go_default_library", "//pkg/registry/core/pod/rest:go_default_library", - "//pkg/storage/errors:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/errors", ], ) diff --git a/pkg/registry/core/pod/storage/eviction.go b/pkg/registry/core/pod/storage/eviction.go index 6205f874ad2..52bc1e10a73 100644 --- a/pkg/registry/core/pod/storage/eviction.go +++ b/pkg/registry/core/pod/storage/eviction.go @@ -26,12 +26,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/client/retry" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) const ( diff --git a/pkg/registry/core/pod/storage/storage.go b/pkg/registry/core/pod/storage/storage.go index 1fcad706985..8b2e0b7d4ad 100644 --- a/pkg/registry/core/pod/storage/storage.go +++ b/pkg/registry/core/pod/storage/storage.go @@ -25,18 +25,18 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" + storeerr "k8s.io/apiserver/pkg/storage/errors" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/pod" podrest "k8s.io/kubernetes/pkg/registry/core/pod/rest" - storeerr "k8s.io/kubernetes/pkg/storage/errors" ) // PodStorage includes storage for pods and all sub resources diff --git a/pkg/registry/core/pod/storage/storage_test.go b/pkg/registry/core/pod/storage/storage_test.go index f810af2d2a9..169fc6cc0b4 100644 --- a/pkg/registry/core/pod/storage/storage_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -29,14 +29,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" + storeerr "k8s.io/apiserver/pkg/storage/errors" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/securitycontext" - storeerr "k8s.io/kubernetes/pkg/storage/errors" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *BindingREST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/pod/strategy.go b/pkg/registry/core/pod/strategy.go index 3f5c1f64fe6..58d868f2c8a 100644 --- a/pkg/registry/core/pod/strategy.go +++ b/pkg/registry/core/pod/strategy.go @@ -34,11 +34,11 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/kubelet/qos" ) diff --git a/pkg/registry/core/podtemplate/storage/BUILD b/pkg/registry/core/podtemplate/storage/BUILD index 7263e6dee9e..e13bac05034 100644 --- a/pkg/registry/core/podtemplate/storage/BUILD +++ b/pkg/registry/core/podtemplate/storage/BUILD @@ -15,13 +15,13 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -31,11 +31,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/podtemplate:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/core/podtemplate/storage/storage.go b/pkg/registry/core/podtemplate/storage/storage.go index 407e35a7606..24af236f7b9 100644 --- a/pkg/registry/core/podtemplate/storage/storage.go +++ b/pkg/registry/core/podtemplate/storage/storage.go @@ -18,9 +18,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/podtemplate" ) diff --git a/pkg/registry/core/podtemplate/storage/storage_test.go b/pkg/registry/core/podtemplate/storage/storage_test.go index 662f0b11bf5..432d88e08bf 100644 --- a/pkg/registry/core/podtemplate/storage/storage_test.go +++ b/pkg/registry/core/podtemplate/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/replicationcontroller/BUILD b/pkg/registry/core/replicationcontroller/BUILD index e1f3a1f5e56..c783317f412 100644 --- a/pkg/registry/core/replicationcontroller/BUILD +++ b/pkg/registry/core/replicationcontroller/BUILD @@ -19,8 +19,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -29,6 +27,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/replicationcontroller/registry.go b/pkg/registry/core/replicationcontroller/registry.go index 9a64f1afeb9..dbb07524ece 100644 --- a/pkg/registry/core/replicationcontroller/registry.go +++ b/pkg/registry/core/replicationcontroller/registry.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ReplicationControllers. diff --git a/pkg/registry/core/replicationcontroller/storage/BUILD b/pkg/registry/core/replicationcontroller/storage/BUILD index e1b8d62bb76..a172b211663 100644 --- a/pkg/registry/core/replicationcontroller/storage/BUILD +++ b/pkg/registry/core/replicationcontroller/storage/BUILD @@ -16,10 +16,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -28,6 +25,9 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -39,9 +39,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/replicationcontroller:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -49,6 +46,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/core/replicationcontroller/storage/storage.go b/pkg/registry/core/replicationcontroller/storage/storage.go index 54ac4a2db26..bd5ccb6ee1a 100644 --- a/pkg/registry/core/replicationcontroller/storage/storage.go +++ b/pkg/registry/core/replicationcontroller/storage/storage.go @@ -26,12 +26,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/replicationcontroller" ) diff --git a/pkg/registry/core/replicationcontroller/storage/storage_test.go b/pkg/registry/core/replicationcontroller/storage/storage_test.go index 9354f1fd731..7a6e139f24c 100644 --- a/pkg/registry/core/replicationcontroller/storage/storage_test.go +++ b/pkg/registry/core/replicationcontroller/storage/storage_test.go @@ -27,12 +27,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) const ( diff --git a/pkg/registry/core/replicationcontroller/strategy.go b/pkg/registry/core/replicationcontroller/strategy.go index cf27120975a..7bb3405b796 100644 --- a/pkg/registry/core/replicationcontroller/strategy.go +++ b/pkg/registry/core/replicationcontroller/strategy.go @@ -29,12 +29,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // rcStrategy implements verification logic for Replication Controllers. diff --git a/pkg/registry/core/resourcequota/BUILD b/pkg/registry/core/resourcequota/BUILD index 3cda704ff58..551eeb8ca6f 100644 --- a/pkg/registry/core/resourcequota/BUILD +++ b/pkg/registry/core/resourcequota/BUILD @@ -18,12 +18,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/resourcequota/storage/BUILD b/pkg/registry/core/resourcequota/storage/BUILD index c0d4dd1c677..4f48ec9fd56 100644 --- a/pkg/registry/core/resourcequota/storage/BUILD +++ b/pkg/registry/core/resourcequota/storage/BUILD @@ -15,10 +15,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -26,6 +23,9 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -35,14 +35,14 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/resourcequota:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/core/resourcequota/storage/storage.go b/pkg/registry/core/resourcequota/storage/storage.go index e5bc87006d8..29b1fa340c2 100644 --- a/pkg/registry/core/resourcequota/storage/storage.go +++ b/pkg/registry/core/resourcequota/storage/storage.go @@ -20,10 +20,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/resourcequota" ) diff --git a/pkg/registry/core/resourcequota/storage/storage_test.go b/pkg/registry/core/resourcequota/storage/storage_test.go index debe206407e..d8a12e144e0 100644 --- a/pkg/registry/core/resourcequota/storage/storage_test.go +++ b/pkg/registry/core/resourcequota/storage/storage_test.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/resourcequota/strategy.go b/pkg/registry/core/resourcequota/strategy.go index b61d20eb3c7..252567d625f 100644 --- a/pkg/registry/core/resourcequota/strategy.go +++ b/pkg/registry/core/resourcequota/strategy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // resourcequotaStrategy implements behavior for ResourceQuota objects diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index ef6f19ea33f..86ef57ac91b 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -26,9 +26,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/registry/core/componentstatus:go_default_library", @@ -54,10 +51,13 @@ go_library( "//pkg/registry/core/service/portallocator:go_default_library", "//pkg/registry/core/service/storage:go_default_library", "//pkg/registry/core/serviceaccount/storage:go_default_library", - "//pkg/storage/etcd/util:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/util", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go index bb512547f5b..7a2f5d559b6 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -29,12 +29,13 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilnet "k8s.io/apimachinery/pkg/util/net" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" + etcdutil "k8s.io/apiserver/pkg/storage/etcd/util" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/registry/core/componentstatus" @@ -60,7 +61,6 @@ import ( "k8s.io/kubernetes/pkg/registry/core/service/portallocator" servicestore "k8s.io/kubernetes/pkg/registry/core/service/storage" serviceaccountstore "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage" - etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" ) // LegacyRESTStorageProvider provides information needed to build RESTStorage for core, but diff --git a/pkg/registry/core/secret/BUILD b/pkg/registry/core/secret/BUILD index 84f5d81608e..ad7ca3b7785 100644 --- a/pkg/registry/core/secret/BUILD +++ b/pkg/registry/core/secret/BUILD @@ -19,8 +19,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -30,6 +28,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/secret/registry.go b/pkg/registry/core/secret/registry.go index 12aec0eda27..bdf529a39bd 100644 --- a/pkg/registry/core/secret/registry.go +++ b/pkg/registry/core/secret/registry.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store Secret objects. diff --git a/pkg/registry/core/secret/storage/BUILD b/pkg/registry/core/secret/storage/BUILD index 4c38e2177d5..d76bf0b33e4 100644 --- a/pkg/registry/core/secret/storage/BUILD +++ b/pkg/registry/core/secret/storage/BUILD @@ -15,13 +15,13 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -31,11 +31,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/secret:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/core/secret/storage/storage.go b/pkg/registry/core/secret/storage/storage.go index df295ad34f8..a27ecdc7cdd 100644 --- a/pkg/registry/core/secret/storage/storage.go +++ b/pkg/registry/core/secret/storage/storage.go @@ -18,9 +18,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/secret" ) diff --git a/pkg/registry/core/secret/storage/storage_test.go b/pkg/registry/core/secret/storage/storage_test.go index ea0267715ff..1071ee414a7 100644 --- a/pkg/registry/core/secret/storage/storage_test.go +++ b/pkg/registry/core/secret/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/secret/strategy.go b/pkg/registry/core/secret/strategy.go index 5e90c7f631b..9e0236b3b12 100644 --- a/pkg/registry/core/secret/strategy.go +++ b/pkg/registry/core/secret/strategy.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // strategy implements behavior for Secret objects diff --git a/pkg/registry/core/service/BUILD b/pkg/registry/core/service/BUILD index 1093b1a9316..f41e06bd76b 100644 --- a/pkg/registry/core/service/BUILD +++ b/pkg/registry/core/service/BUILD @@ -24,9 +24,6 @@ go_library( "//pkg/api/validation:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/features:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/rest:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/endpoint:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", @@ -42,6 +39,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/rest", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", "//vendor:k8s.io/apiserver/pkg/util/feature", @@ -61,7 +61,6 @@ go_test( "//pkg/api/service:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/features:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -71,6 +70,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/util/feature", ], ) diff --git a/pkg/registry/core/service/allocator/storage/BUILD b/pkg/registry/core/service/allocator/storage/BUILD index 36a5f631e3b..70fd6574983 100644 --- a/pkg/registry/core/service/allocator/storage/BUILD +++ b/pkg/registry/core/service/allocator/storage/BUILD @@ -17,8 +17,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) @@ -29,15 +29,15 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/core/rangeallocation:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", - "//pkg/storage/errors:go_default_library", "//vendor:golang.org/x/net/context", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/errors", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/pkg/registry/core/service/allocator/storage/storage.go b/pkg/registry/core/service/allocator/storage/storage.go index 43d58a12f39..7c4d539718a 100644 --- a/pkg/registry/core/service/allocator/storage/storage.go +++ b/pkg/registry/core/service/allocator/storage/storage.go @@ -24,13 +24,13 @@ import ( k8serr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" + storeerr "k8s.io/apiserver/pkg/storage/errors" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" "k8s.io/kubernetes/pkg/registry/core/service/allocator" - storeerr "k8s.io/kubernetes/pkg/storage/errors" "golang.org/x/net/context" ) diff --git a/pkg/registry/core/service/allocator/storage/storage_test.go b/pkg/registry/core/service/allocator/storage/storage_test.go index 5661ccd079d..4936b35f4db 100644 --- a/pkg/registry/core/service/allocator/storage/storage_test.go +++ b/pkg/registry/core/service/allocator/storage/storage_test.go @@ -20,11 +20,11 @@ import ( "strings" "testing" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/registry/core/service/allocator" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "golang.org/x/net/context" ) diff --git a/pkg/registry/core/service/ipallocator/storage/BUILD b/pkg/registry/core/service/ipallocator/storage/BUILD index d93915d1162..a2c19bbc175 100644 --- a/pkg/registry/core/service/ipallocator/storage/BUILD +++ b/pkg/registry/core/service/ipallocator/storage/BUILD @@ -15,15 +15,15 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", "//pkg/registry/core/service/allocator/storage:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/storagebackend/factory:go_default_library", "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend/factory", ], ) diff --git a/pkg/registry/core/service/ipallocator/storage/storage_test.go b/pkg/registry/core/service/ipallocator/storage/storage_test.go index d7f53af7c5d..efb1dfa6e01 100644 --- a/pkg/registry/core/service/ipallocator/storage/storage_test.go +++ b/pkg/registry/core/service/ipallocator/storage/storage_test.go @@ -21,15 +21,15 @@ import ( "strings" "testing" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/core/service/allocator" allocatorstore "k8s.io/kubernetes/pkg/registry/core/service/allocator/storage" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" "golang.org/x/net/context" ) diff --git a/pkg/registry/core/service/proxy.go b/pkg/registry/core/service/proxy.go index bb65050db8f..a878576cfd6 100644 --- a/pkg/registry/core/service/proxy.go +++ b/pkg/registry/core/service/proxy.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericrest "k8s.io/apiserver/pkg/registry/generic/rest" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/capabilities" - genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // ProxyREST implements the proxy subresource for a Service diff --git a/pkg/registry/core/service/registry.go b/pkg/registry/core/service/registry.go index 07cf763e51a..6f966c5f035 100644 --- a/pkg/registry/core/service/registry.go +++ b/pkg/registry/core/service/registry.go @@ -23,8 +23,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store services. diff --git a/pkg/registry/core/service/rest.go b/pkg/registry/core/service/rest.go index 82298c022f4..b3bb390d309 100644 --- a/pkg/registry/core/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -34,12 +34,12 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/api" apiservice "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/endpoint" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" diff --git a/pkg/registry/core/service/rest_test.go b/pkg/registry/core/service/rest_test.go index a652f83ddb6..57dba0f1829 100644 --- a/pkg/registry/core/service/rest_test.go +++ b/pkg/registry/core/service/rest_test.go @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" utilnet "k8s.io/apimachinery/pkg/util/net" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/registry/registrytest" diff --git a/pkg/registry/core/service/storage/BUILD b/pkg/registry/core/service/storage/BUILD index 8876ebd3aaf..9f7dd4cc5b1 100644 --- a/pkg/registry/core/service/storage/BUILD +++ b/pkg/registry/core/service/storage/BUILD @@ -15,14 +15,14 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/intstr", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -32,14 +32,14 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/service:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/core/service/storage/storage.go b/pkg/registry/core/service/storage/storage.go index f48c493778e..58e04d92a1f 100644 --- a/pkg/registry/core/service/storage/storage.go +++ b/pkg/registry/core/service/storage/storage.go @@ -20,10 +20,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/service" ) diff --git a/pkg/registry/core/service/storage/storage_test.go b/pkg/registry/core/service/storage/storage_test.go index e1c4d3cd8ec..5fbb11e5367 100644 --- a/pkg/registry/core/service/storage/storage_test.go +++ b/pkg/registry/core/service/storage/storage_test.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/service/strategy.go b/pkg/registry/core/service/strategy.go index b5357e1a58a..e01920ece65 100644 --- a/pkg/registry/core/service/strategy.go +++ b/pkg/registry/core/service/strategy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // svcStrategy implements behavior for Services diff --git a/pkg/registry/core/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go index f0765711edc..7f01450bfda 100644 --- a/pkg/registry/core/service/strategy_test.go +++ b/pkg/registry/core/service/strategy_test.go @@ -25,9 +25,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) func TestExportService(t *testing.T) { diff --git a/pkg/registry/core/serviceaccount/BUILD b/pkg/registry/core/serviceaccount/BUILD index 3d67dc645b9..947d75444a3 100644 --- a/pkg/registry/core/serviceaccount/BUILD +++ b/pkg/registry/core/serviceaccount/BUILD @@ -19,8 +19,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -29,6 +27,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/core/serviceaccount/registry.go b/pkg/registry/core/serviceaccount/registry.go index be90fa82d8c..8246e1d3fa0 100644 --- a/pkg/registry/core/serviceaccount/registry.go +++ b/pkg/registry/core/serviceaccount/registry.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store ServiceAccount objects. diff --git a/pkg/registry/core/serviceaccount/storage/BUILD b/pkg/registry/core/serviceaccount/storage/BUILD index 1ff63824410..5c977c5dccc 100644 --- a/pkg/registry/core/serviceaccount/storage/BUILD +++ b/pkg/registry/core/serviceaccount/storage/BUILD @@ -15,13 +15,13 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -31,11 +31,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/serviceaccount:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/core/serviceaccount/storage/storage.go b/pkg/registry/core/serviceaccount/storage/storage.go index 8a01952cac2..5a8fc16eff0 100644 --- a/pkg/registry/core/serviceaccount/storage/storage.go +++ b/pkg/registry/core/serviceaccount/storage/storage.go @@ -18,9 +18,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/serviceaccount" ) diff --git a/pkg/registry/core/serviceaccount/storage/storage_test.go b/pkg/registry/core/serviceaccount/storage/storage_test.go index 87131b6abcb..0c6be4165ff 100644 --- a/pkg/registry/core/serviceaccount/storage/storage_test.go +++ b/pkg/registry/core/serviceaccount/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/serviceaccount/strategy.go b/pkg/registry/core/serviceaccount/strategy.go index 7830e2add50..40a3f7d94d9 100644 --- a/pkg/registry/core/serviceaccount/strategy.go +++ b/pkg/registry/core/serviceaccount/strategy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // strategy implements behavior for ServiceAccount objects diff --git a/pkg/registry/extensions/controller/storage/BUILD b/pkg/registry/extensions/controller/storage/BUILD index fab75a09c26..eace317db9c 100644 --- a/pkg/registry/extensions/controller/storage/BUILD +++ b/pkg/registry/extensions/controller/storage/BUILD @@ -16,14 +16,14 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/storagebackend/factory:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend/factory", ], ) @@ -35,14 +35,14 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/core/replicationcontroller:go_default_library", "//pkg/registry/core/replicationcontroller/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/extensions/controller/storage/storage.go b/pkg/registry/extensions/controller/storage/storage.go index cd985184f37..a3fa80c464b 100644 --- a/pkg/registry/extensions/controller/storage/storage.go +++ b/pkg/registry/extensions/controller/storage/storage.go @@ -23,11 +23,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/replicationcontroller" controllerstore "k8s.io/kubernetes/pkg/registry/core/replicationcontroller/storage" ) diff --git a/pkg/registry/extensions/controller/storage/storage_test.go b/pkg/registry/extensions/controller/storage/storage_test.go index a38d8b818a2..de37b9dafa5 100644 --- a/pkg/registry/extensions/controller/storage/storage_test.go +++ b/pkg/registry/extensions/controller/storage/storage_test.go @@ -21,14 +21,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" ) func newStorage(t *testing.T) (*ScaleREST, *etcdtesting.EtcdTestServer, storage.Interface, factory.DestroyFunc) { diff --git a/pkg/registry/extensions/daemonset/BUILD b/pkg/registry/extensions/daemonset/BUILD index ddcec20a934..580a1a9fa10 100644 --- a/pkg/registry/extensions/daemonset/BUILD +++ b/pkg/registry/extensions/daemonset/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/extensions/daemonset/storage/BUILD b/pkg/registry/extensions/daemonset/storage/BUILD index dd57154428c..c52344fdfd9 100644 --- a/pkg/registry/extensions/daemonset/storage/BUILD +++ b/pkg/registry/extensions/daemonset/storage/BUILD @@ -16,13 +16,13 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -33,14 +33,14 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/daemonset:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/extensions/daemonset/storage/storage.go b/pkg/registry/extensions/daemonset/storage/storage.go index a3c78a8aca1..075ef0ae46e 100644 --- a/pkg/registry/extensions/daemonset/storage/storage.go +++ b/pkg/registry/extensions/daemonset/storage/storage.go @@ -20,11 +20,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/daemonset" ) diff --git a/pkg/registry/extensions/daemonset/storage/storage_test.go b/pkg/registry/extensions/daemonset/storage/storage_test.go index fe041a9d0e6..5361c99ded2 100644 --- a/pkg/registry/extensions/daemonset/storage/storage_test.go +++ b/pkg/registry/extensions/daemonset/storage/storage_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/daemonset/strategy.go b/pkg/registry/extensions/daemonset/strategy.go index c5e3da2411b..db5797e4cc3 100644 --- a/pkg/registry/extensions/daemonset/strategy.go +++ b/pkg/registry/extensions/daemonset/strategy.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // daemonSetStrategy implements verification logic for daemon sets. diff --git a/pkg/registry/extensions/deployment/BUILD b/pkg/registry/extensions/deployment/BUILD index 0e156396af5..752a9b1e0c7 100644 --- a/pkg/registry/extensions/deployment/BUILD +++ b/pkg/registry/extensions/deployment/BUILD @@ -21,8 +21,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/controller/deployment/util:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -30,6 +28,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/extensions/deployment/registry.go b/pkg/registry/extensions/deployment/registry.go index 616b1f433a3..fb5160c5094 100644 --- a/pkg/registry/extensions/deployment/registry.go +++ b/pkg/registry/extensions/deployment/registry.go @@ -22,9 +22,9 @@ import ( metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store Deployments. diff --git a/pkg/registry/extensions/deployment/storage/BUILD b/pkg/registry/extensions/deployment/storage/BUILD index 3ecc3610c08..8cf1c44ee4f 100644 --- a/pkg/registry/extensions/deployment/storage/BUILD +++ b/pkg/registry/extensions/deployment/storage/BUILD @@ -16,11 +16,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/errors:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -30,6 +26,10 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage/errors", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -41,17 +41,17 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/deployment:go_default_library", - "//pkg/storage/errors:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/errors", ], ) diff --git a/pkg/registry/extensions/deployment/storage/storage.go b/pkg/registry/extensions/deployment/storage/storage.go index 075804e2719..96422e6b7b4 100644 --- a/pkg/registry/extensions/deployment/storage/storage.go +++ b/pkg/registry/extensions/deployment/storage/storage.go @@ -24,16 +24,16 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" + storeerr "k8s.io/apiserver/pkg/storage/errors" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/deployment" - storeerr "k8s.io/kubernetes/pkg/storage/errors" ) // DeploymentStorage includes dummy storage for Deployments and for Scale subresource. diff --git a/pkg/registry/extensions/deployment/storage/storage_test.go b/pkg/registry/extensions/deployment/storage/storage_test.go index e5017b8154f..e8891b61a6e 100644 --- a/pkg/registry/extensions/deployment/storage/storage_test.go +++ b/pkg/registry/extensions/deployment/storage/storage_test.go @@ -29,13 +29,13 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + storeerr "k8s.io/apiserver/pkg/storage/errors" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - storeerr "k8s.io/kubernetes/pkg/storage/errors" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) const defaultReplicas = 100 diff --git a/pkg/registry/extensions/deployment/strategy.go b/pkg/registry/extensions/deployment/strategy.go index 09f5f619761..831082b24ec 100644 --- a/pkg/registry/extensions/deployment/strategy.go +++ b/pkg/registry/extensions/deployment/strategy.go @@ -27,14 +27,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/controller/deployment/util" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // deploymentStrategy implements behavior for Deployments. diff --git a/pkg/registry/extensions/ingress/BUILD b/pkg/registry/extensions/ingress/BUILD index f5b7f1ce4bf..701860919cf 100644 --- a/pkg/registry/extensions/ingress/BUILD +++ b/pkg/registry/extensions/ingress/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/extensions/ingress/storage/BUILD b/pkg/registry/extensions/ingress/storage/BUILD index c264b4f6ef3..56abf5f1f47 100644 --- a/pkg/registry/extensions/ingress/storage/BUILD +++ b/pkg/registry/extensions/ingress/storage/BUILD @@ -16,14 +16,14 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/intstr", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -34,14 +34,14 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/ingress:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/extensions/ingress/storage/storage.go b/pkg/registry/extensions/ingress/storage/storage.go index 9d3e4b06dbd..8d77c2f4c5f 100644 --- a/pkg/registry/extensions/ingress/storage/storage.go +++ b/pkg/registry/extensions/ingress/storage/storage.go @@ -20,11 +20,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/ingress" ) diff --git a/pkg/registry/extensions/ingress/storage/storage_test.go b/pkg/registry/extensions/ingress/storage/storage_test.go index 89d16a59cbc..7a935a52aa4 100644 --- a/pkg/registry/extensions/ingress/storage/storage_test.go +++ b/pkg/registry/extensions/ingress/storage/storage_test.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/ingress/strategy.go b/pkg/registry/extensions/ingress/strategy.go index 06d0a8237e1..e17f58a0a67 100644 --- a/pkg/registry/extensions/ingress/strategy.go +++ b/pkg/registry/extensions/ingress/strategy.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // ingressStrategy implements verification logic for Replication Ingresss. diff --git a/pkg/registry/extensions/networkpolicy/BUILD b/pkg/registry/extensions/networkpolicy/BUILD index 8c0444f2ded..6c1e0e09961 100644 --- a/pkg/registry/extensions/networkpolicy/BUILD +++ b/pkg/registry/extensions/networkpolicy/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/extensions/networkpolicy/storage/BUILD b/pkg/registry/extensions/networkpolicy/storage/BUILD index bb7b72225f4..5b3e3f749ec 100644 --- a/pkg/registry/extensions/networkpolicy/storage/BUILD +++ b/pkg/registry/extensions/networkpolicy/storage/BUILD @@ -15,15 +15,15 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -34,11 +34,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/networkpolicy:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/extensions/networkpolicy/storage/storage.go b/pkg/registry/extensions/networkpolicy/storage/storage.go index 7da15b040f8..3628d452891 100644 --- a/pkg/registry/extensions/networkpolicy/storage/storage.go +++ b/pkg/registry/extensions/networkpolicy/storage/storage.go @@ -18,10 +18,10 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" extensionsapi "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy" ) diff --git a/pkg/registry/extensions/networkpolicy/storage/storage_test.go b/pkg/registry/extensions/networkpolicy/storage/storage_test.go index 73115c28c4b..65e03392ab6 100644 --- a/pkg/registry/extensions/networkpolicy/storage/storage_test.go +++ b/pkg/registry/extensions/networkpolicy/storage/storage_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/networkpolicy/strategy.go b/pkg/registry/extensions/networkpolicy/strategy.go index 7f634e12834..1af7651baf9 100644 --- a/pkg/registry/extensions/networkpolicy/strategy.go +++ b/pkg/registry/extensions/networkpolicy/strategy.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // networkPolicyStrategy implements verification logic for NetworkPolicys. diff --git a/pkg/registry/extensions/podsecuritypolicy/BUILD b/pkg/registry/extensions/podsecuritypolicy/BUILD index 59888aefd04..79769976414 100644 --- a/pkg/registry/extensions/podsecuritypolicy/BUILD +++ b/pkg/registry/extensions/podsecuritypolicy/BUILD @@ -18,13 +18,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/BUILD b/pkg/registry/extensions/podsecuritypolicy/storage/BUILD index 04355b25292..d4a0fe6d825 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/BUILD +++ b/pkg/registry/extensions/podsecuritypolicy/storage/BUILD @@ -16,13 +16,13 @@ go_test( deps = [ "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -33,11 +33,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/podsecuritypolicy:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/storage.go b/pkg/registry/extensions/podsecuritypolicy/storage/storage.go index 78ceac9d3b1..45d0843c0f0 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/storage.go +++ b/pkg/registry/extensions/podsecuritypolicy/storage/storage.go @@ -18,10 +18,10 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy" ) diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go index a2d6956e67c..ce6aa67f49a 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go +++ b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/podsecuritypolicy/strategy.go b/pkg/registry/extensions/podsecuritypolicy/strategy.go index 90be028c451..1f3d3ddb01b 100644 --- a/pkg/registry/extensions/podsecuritypolicy/strategy.go +++ b/pkg/registry/extensions/podsecuritypolicy/strategy.go @@ -24,13 +24,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // strategy implements behavior for PodSecurityPolicy objects diff --git a/pkg/registry/extensions/replicaset/BUILD b/pkg/registry/extensions/replicaset/BUILD index ca856cb8cf6..6806f8b0889 100644 --- a/pkg/registry/extensions/replicaset/BUILD +++ b/pkg/registry/extensions/replicaset/BUILD @@ -20,8 +20,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -30,6 +28,8 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/extensions/replicaset/registry.go b/pkg/registry/extensions/replicaset/registry.go index c0fb90c6da6..781bfcb10df 100644 --- a/pkg/registry/extensions/replicaset/registry.go +++ b/pkg/registry/extensions/replicaset/registry.go @@ -25,9 +25,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ReplicaSets. diff --git a/pkg/registry/extensions/replicaset/storage/BUILD b/pkg/registry/extensions/replicaset/storage/BUILD index 91adfa3316b..4875f8f0fde 100644 --- a/pkg/registry/extensions/replicaset/storage/BUILD +++ b/pkg/registry/extensions/replicaset/storage/BUILD @@ -16,10 +16,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -28,6 +25,9 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -39,15 +39,15 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/replicaset:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/extensions/replicaset/storage/storage.go b/pkg/registry/extensions/replicaset/storage/storage.go index 6b3128a8a86..620d19971f9 100644 --- a/pkg/registry/extensions/replicaset/storage/storage.go +++ b/pkg/registry/extensions/replicaset/storage/storage.go @@ -25,12 +25,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/replicaset" ) diff --git a/pkg/registry/extensions/replicaset/storage/storage_test.go b/pkg/registry/extensions/replicaset/storage/storage_test.go index 54fd56b6fa1..d51ddf7e3e0 100644 --- a/pkg/registry/extensions/replicaset/storage/storage_test.go +++ b/pkg/registry/extensions/replicaset/storage/storage_test.go @@ -27,12 +27,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) const defaultReplicas = 100 diff --git a/pkg/registry/extensions/replicaset/strategy.go b/pkg/registry/extensions/replicaset/strategy.go index 6e3e6fc3c4a..daee90f9f27 100644 --- a/pkg/registry/extensions/replicaset/strategy.go +++ b/pkg/registry/extensions/replicaset/strategy.go @@ -28,13 +28,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // rsStrategy implements verification logic for ReplicaSets. diff --git a/pkg/registry/extensions/rest/BUILD b/pkg/registry/extensions/rest/BUILD index 67680b208c3..7741b04f430 100644 --- a/pkg/registry/extensions/rest/BUILD +++ b/pkg/registry/extensions/rest/BUILD @@ -33,9 +33,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/extensions/controller/storage:go_default_library", "//pkg/registry/extensions/daemonset/storage:go_default_library", "//pkg/registry/extensions/deployment/storage:go_default_library", @@ -51,6 +48,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/extensions/rest/storage_extensions.go b/pkg/registry/extensions/rest/storage_extensions.go index c8b96c0dcc3..e9f17469ff1 100644 --- a/pkg/registry/extensions/rest/storage_extensions.go +++ b/pkg/registry/extensions/rest/storage_extensions.go @@ -24,13 +24,13 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "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/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" expcontrollerstore "k8s.io/kubernetes/pkg/registry/extensions/controller/storage" daemonstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage" deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage" diff --git a/pkg/registry/extensions/thirdpartyresource/BUILD b/pkg/registry/extensions/thirdpartyresource/BUILD index 6e7142fe37e..78c4f1c61ca 100644 --- a/pkg/registry/extensions/thirdpartyresource/BUILD +++ b/pkg/registry/extensions/thirdpartyresource/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", ], ) diff --git a/pkg/registry/extensions/thirdpartyresource/storage/BUILD b/pkg/registry/extensions/thirdpartyresource/storage/BUILD index 1a7b29b6e9b..91d7129fd81 100644 --- a/pkg/registry/extensions/thirdpartyresource/storage/BUILD +++ b/pkg/registry/extensions/thirdpartyresource/storage/BUILD @@ -16,13 +16,13 @@ go_test( deps = [ "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -33,11 +33,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/thirdpartyresource:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/extensions/thirdpartyresource/storage/storage.go b/pkg/registry/extensions/thirdpartyresource/storage/storage.go index 4b6d501001a..67de445431d 100644 --- a/pkg/registry/extensions/thirdpartyresource/storage/storage.go +++ b/pkg/registry/extensions/thirdpartyresource/storage/storage.go @@ -18,10 +18,10 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource" ) diff --git a/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go index c861847bb5c..dd122b061e3 100644 --- a/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go +++ b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/thirdpartyresource/strategy.go b/pkg/registry/extensions/thirdpartyresource/strategy.go index 4ca061fdd33..52a55d1bf44 100644 --- a/pkg/registry/extensions/thirdpartyresource/strategy.go +++ b/pkg/registry/extensions/thirdpartyresource/strategy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // strategy implements behavior for ThirdPartyResource objects diff --git a/pkg/registry/extensions/thirdpartyresourcedata/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/BUILD index 9af0776771a..020b4dd0b0f 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/BUILD @@ -25,7 +25,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -37,6 +36,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/yaml", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/extensions/thirdpartyresourcedata/registry.go b/pkg/registry/extensions/thirdpartyresourcedata/registry.go index 0e94a359181..b2ea5c1b812 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/registry.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/registry.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface implemented by things that know how to store ThirdPartyResourceData objects. diff --git a/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD index c3102d765bc..12fb6068d2b 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD @@ -16,13 +16,13 @@ go_test( deps = [ "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -33,11 +33,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go index 926ce3d500e..97ec1891f49 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go @@ -20,10 +20,10 @@ import ( "strings" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go index 21a88818e80..9e6860dea8c 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/thirdpartyresourcedata/strategy.go b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go index 6dbe9a490a6..287c07d6151 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/strategy.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // strategy implements behavior for ThirdPartyResource objects diff --git a/pkg/registry/policy/poddisruptionbudget/BUILD b/pkg/registry/policy/poddisruptionbudget/BUILD index ceb40dfbca4..27b5939fd1b 100644 --- a/pkg/registry/policy/poddisruptionbudget/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/policy/poddisruptionbudget/storage/BUILD b/pkg/registry/policy/poddisruptionbudget/storage/BUILD index 434b83ea928..36d3b6e7bbb 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/storage/BUILD @@ -16,15 +16,15 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/policy:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/util/intstr", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -35,14 +35,14 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/policy:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/policy/poddisruptionbudget:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage.go b/pkg/registry/policy/poddisruptionbudget/storage/storage.go index 9c2270aea72..5816288b7a3 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage.go @@ -20,11 +20,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" policyapi "k8s.io/kubernetes/pkg/apis/policy" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" "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 f59daa9e0d9..aec19efa0d1 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/policy/poddisruptionbudget/strategy.go b/pkg/registry/policy/poddisruptionbudget/strategy.go index 3e1c5bd96b5..8314f3cbc40 100644 --- a/pkg/registry/policy/poddisruptionbudget/strategy.go +++ b/pkg/registry/policy/poddisruptionbudget/strategy.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/policy/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // podDisruptionBudgetStrategy implements verification logic for PodDisruptionBudgets. diff --git a/pkg/registry/policy/rest/BUILD b/pkg/registry/policy/rest/BUILD index 51817d88a3e..1d9b7939c0d 100644 --- a/pkg/registry/policy/rest/BUILD +++ b/pkg/registry/policy/rest/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/policy/poddisruptionbudget/storage:go_default_library", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/policy/rest/storage_policy.go b/pkg/registry/policy/rest/storage_policy.go index d100fa1ead9..aa35b84d6e2 100644 --- a/pkg/registry/policy/rest/storage_policy.go +++ b/pkg/registry/policy/rest/storage_policy.go @@ -17,12 +17,12 @@ limitations under the License. package rest import ( + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" policyapiv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" poddisruptionbudgetstore "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage" ) diff --git a/pkg/registry/rbac/clusterrole/BUILD b/pkg/registry/rbac/clusterrole/BUILD index 88b973abff1..c8496aada42 100644 --- a/pkg/registry/rbac/clusterrole/BUILD +++ b/pkg/registry/rbac/clusterrole/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -28,6 +27,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/rbac/clusterrole/policybased/BUILD b/pkg/registry/rbac/clusterrole/policybased/BUILD index 283641a4fbb..3a8aee7f903 100644 --- a/pkg/registry/rbac/clusterrole/policybased/BUILD +++ b/pkg/registry/rbac/clusterrole/policybased/BUILD @@ -13,12 +13,12 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/rbac/clusterrole/policybased/storage.go b/pkg/registry/rbac/clusterrole/policybased/storage.go index 40d56c8378e..12ad18b5859 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/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/clusterrole/registry.go b/pkg/registry/rbac/clusterrole/registry.go index 9285553aa06..4c3cf731950 100644 --- a/pkg/registry/rbac/clusterrole/registry.go +++ b/pkg/registry/rbac/clusterrole/registry.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ClusterRoles. diff --git a/pkg/registry/rbac/clusterrole/storage/BUILD b/pkg/registry/rbac/clusterrole/storage/BUILD index f49f9f08608..26e200cd0e2 100644 --- a/pkg/registry/rbac/clusterrole/storage/BUILD +++ b/pkg/registry/rbac/clusterrole/storage/BUILD @@ -14,11 +14,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/rbac/clusterrole:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/rbac/clusterrole/storage/storage.go b/pkg/registry/rbac/clusterrole/storage/storage.go index 30453c0e25c..9cd37b22d83 100644 --- a/pkg/registry/rbac/clusterrole/storage/storage.go +++ b/pkg/registry/rbac/clusterrole/storage/storage.go @@ -18,10 +18,10 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" ) diff --git a/pkg/registry/rbac/clusterrole/strategy.go b/pkg/registry/rbac/clusterrole/strategy.go index e0689dcc8c5..2442ffa4913 100644 --- a/pkg/registry/rbac/clusterrole/strategy.go +++ b/pkg/registry/rbac/clusterrole/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // strategy implements behavior for ClusterRoles diff --git a/pkg/registry/rbac/clusterrolebinding/BUILD b/pkg/registry/rbac/clusterrolebinding/BUILD index 51c671f899e..806d99f6660 100644 --- a/pkg/registry/rbac/clusterrolebinding/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -28,6 +27,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD index 332a2e04556..9033c1170f0 100644 --- a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD @@ -13,13 +13,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/storage.go b/pkg/registry/rbac/clusterrolebinding/policybased/storage.go index 8f2aff1f10d..b45f97db6c2 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/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/clusterrolebinding/registry.go b/pkg/registry/rbac/clusterrolebinding/registry.go index ca6cb288469..c07f384e840 100644 --- a/pkg/registry/rbac/clusterrolebinding/registry.go +++ b/pkg/registry/rbac/clusterrolebinding/registry.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store ClusterRoleBindings. diff --git a/pkg/registry/rbac/clusterrolebinding/storage/BUILD b/pkg/registry/rbac/clusterrolebinding/storage/BUILD index d0933fd52bb..829ed113eed 100644 --- a/pkg/registry/rbac/clusterrolebinding/storage/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/storage/BUILD @@ -14,11 +14,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/rbac/clusterrolebinding:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/rbac/clusterrolebinding/storage/storage.go b/pkg/registry/rbac/clusterrolebinding/storage/storage.go index 3fbbe2fd36d..dd1f2db92f8 100644 --- a/pkg/registry/rbac/clusterrolebinding/storage/storage.go +++ b/pkg/registry/rbac/clusterrolebinding/storage/storage.go @@ -18,10 +18,10 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding" ) diff --git a/pkg/registry/rbac/clusterrolebinding/strategy.go b/pkg/registry/rbac/clusterrolebinding/strategy.go index 850bbb2f759..0b3801f2653 100644 --- a/pkg/registry/rbac/clusterrolebinding/strategy.go +++ b/pkg/registry/rbac/clusterrolebinding/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // strategy implements behavior for ClusterRoleBindings diff --git a/pkg/registry/rbac/rest/BUILD b/pkg/registry/rbac/rest/BUILD index b9a2db036fa..baf005b84da 100644 --- a/pkg/registry/rbac/rest/BUILD +++ b/pkg/registry/rbac/rest/BUILD @@ -17,9 +17,6 @@ go_library( "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/apis/rbac/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/rbac/clusterrole:go_default_library", "//pkg/registry/rbac/clusterrole/policybased:go_default_library", "//pkg/registry/rbac/clusterrole/storage:go_default_library", @@ -40,6 +37,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/rbac/rest/storage_rbac.go b/pkg/registry/rbac/rest/storage_rbac.go index 9a41d3effb2..b9fa6ce9ba0 100644 --- a/pkg/registry/rbac/rest/storage_rbac.go +++ b/pkg/registry/rbac/rest/storage_rbac.go @@ -28,14 +28,14 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" rbacapiv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" rbacapiv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" rbacclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" clusterrolepolicybased "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/policybased" clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage" diff --git a/pkg/registry/rbac/role/BUILD b/pkg/registry/rbac/role/BUILD index ccd93f14809..a0e5ef070be 100644 --- a/pkg/registry/rbac/role/BUILD +++ b/pkg/registry/rbac/role/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -28,6 +27,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/rbac/role/policybased/BUILD b/pkg/registry/rbac/role/policybased/BUILD index 283641a4fbb..3a8aee7f903 100644 --- a/pkg/registry/rbac/role/policybased/BUILD +++ b/pkg/registry/rbac/role/policybased/BUILD @@ -13,12 +13,12 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/rbac/role/policybased/storage.go b/pkg/registry/rbac/role/policybased/storage.go index f121972a740..879b10419f8 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/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/role/registry.go b/pkg/registry/rbac/role/registry.go index 7b4cd8cdcce..4457aa46c95 100644 --- a/pkg/registry/rbac/role/registry.go +++ b/pkg/registry/rbac/role/registry.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store Roles. diff --git a/pkg/registry/rbac/role/storage/BUILD b/pkg/registry/rbac/role/storage/BUILD index c2ede437a88..4fca3c8c365 100644 --- a/pkg/registry/rbac/role/storage/BUILD +++ b/pkg/registry/rbac/role/storage/BUILD @@ -14,11 +14,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/rbac/role:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/rbac/role/storage/storage.go b/pkg/registry/rbac/role/storage/storage.go index dd181a14b94..6bc3b259ec9 100644 --- a/pkg/registry/rbac/role/storage/storage.go +++ b/pkg/registry/rbac/role/storage/storage.go @@ -18,10 +18,10 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/rbac/role" ) diff --git a/pkg/registry/rbac/role/strategy.go b/pkg/registry/rbac/role/strategy.go index 8018b99a5af..9a6ef33e40f 100644 --- a/pkg/registry/rbac/role/strategy.go +++ b/pkg/registry/rbac/role/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // strategy implements behavior for Roles diff --git a/pkg/registry/rbac/rolebinding/BUILD b/pkg/registry/rbac/rolebinding/BUILD index 4130fbfa732..0856698a98b 100644 --- a/pkg/registry/rbac/rolebinding/BUILD +++ b/pkg/registry/rbac/rolebinding/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", @@ -28,6 +27,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/rbac/rolebinding/policybased/BUILD b/pkg/registry/rbac/rolebinding/policybased/BUILD index 332a2e04556..9033c1170f0 100644 --- a/pkg/registry/rbac/rolebinding/policybased/BUILD +++ b/pkg/registry/rbac/rolebinding/policybased/BUILD @@ -13,13 +13,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) diff --git a/pkg/registry/rbac/rolebinding/policybased/storage.go b/pkg/registry/rbac/rolebinding/policybased/storage.go index e9f054e0860..f942bd391c1 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/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/rolebinding/registry.go b/pkg/registry/rbac/rolebinding/registry.go index 8997a2c292f..f826198d37f 100644 --- a/pkg/registry/rbac/rolebinding/registry.go +++ b/pkg/registry/rbac/rolebinding/registry.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // Registry is an interface for things that know how to store RoleBindings. diff --git a/pkg/registry/rbac/rolebinding/storage/BUILD b/pkg/registry/rbac/rolebinding/storage/BUILD index c85b50d7f13..09d804f8114 100644 --- a/pkg/registry/rbac/rolebinding/storage/BUILD +++ b/pkg/registry/rbac/rolebinding/storage/BUILD @@ -14,11 +14,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/rbac/rolebinding:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/rbac/rolebinding/storage/storage.go b/pkg/registry/rbac/rolebinding/storage/storage.go index 20df712c6b4..92f8bdceb8c 100644 --- a/pkg/registry/rbac/rolebinding/storage/storage.go +++ b/pkg/registry/rbac/rolebinding/storage/storage.go @@ -18,10 +18,10 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/rbac/rolebinding" ) diff --git a/pkg/registry/rbac/rolebinding/strategy.go b/pkg/registry/rbac/rolebinding/strategy.go index 024e6142538..0d1d5e9820c 100644 --- a/pkg/registry/rbac/rolebinding/strategy.go +++ b/pkg/registry/rbac/rolebinding/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/rest" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) // strategy implements behavior for RoleBindings diff --git a/pkg/registry/registrytest/BUILD b/pkg/registry/registrytest/BUILD index 362232fb295..85efad6f086 100644 --- a/pkg/registry/registrytest/BUILD +++ b/pkg/registry/registrytest/BUILD @@ -20,11 +20,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", - "//pkg/genericapiserver/registry/rest/resttest:go_default_library", - "//pkg/storage/etcd:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", @@ -34,7 +29,12 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", + "//vendor:k8s.io/apiserver/pkg/registry/rest/resttest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + "//vendor:k8s.io/apiserver/pkg/storage/testing", ], ) diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index 15c5f3f8f2c..f4e31d9ba3c 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -27,14 +27,14 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest/resttest" + etcdstorage "k8s.io/apiserver/pkg/storage/etcd" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/storagebackend" + storagetesting "k8s.io/apiserver/pkg/storage/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest/resttest" - etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - storagetesting "k8s.io/kubernetes/pkg/storage/testing" ) func NewEtcdStorage(t *testing.T, group string) (*storagebackend.Config, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/storage/rest/BUILD b/pkg/registry/storage/rest/BUILD index 174114b4a45..3ee0ba966f1 100644 --- a/pkg/registry/storage/rest/BUILD +++ b/pkg/registry/storage/rest/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/registry/storage/storageclass/storage:go_default_library", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/pkg/registry/storage/rest/storage_storage.go b/pkg/registry/storage/rest/storage_storage.go index 311701bed94..33ab82f026a 100644 --- a/pkg/registry/storage/rest/storage_storage.go +++ b/pkg/registry/storage/rest/storage_storage.go @@ -17,12 +17,12 @@ limitations under the License. package rest import ( + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/api" storageapi "k8s.io/kubernetes/pkg/apis/storage" storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" storageclassstore "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage" ) diff --git a/pkg/registry/storage/storageclass/BUILD b/pkg/registry/storage/storageclass/BUILD index 2cc17b1f640..b3d37809c4f 100644 --- a/pkg/registry/storage/storageclass/BUILD +++ b/pkg/registry/storage/storageclass/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/validation:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/storage", "//vendor:k8s.io/apiserver/pkg/storage/names", ], diff --git a/pkg/registry/storage/storageclass/storage/BUILD b/pkg/registry/storage/storageclass/storage/BUILD index e1248add765..0b96c282473 100644 --- a/pkg/registry/storage/storageclass/storage/BUILD +++ b/pkg/registry/storage/storageclass/storage/BUILD @@ -15,13 +15,13 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/apis/storage:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", ], ) @@ -32,11 +32,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/storage:go_default_library", - "//pkg/genericapiserver/registry/generic:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/storage/storageclass:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", ], ) diff --git a/pkg/registry/storage/storageclass/storage/storage.go b/pkg/registry/storage/storageclass/storage/storage.go index 0c7cf8a8df6..3f2ca48bbdb 100644 --- a/pkg/registry/storage/storageclass/storage/storage.go +++ b/pkg/registry/storage/storageclass/storage/storage.go @@ -18,10 +18,10 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api" storageapi "k8s.io/kubernetes/pkg/apis/storage" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/storage/storageclass" ) diff --git a/pkg/registry/storage/storageclass/storage/storage_test.go b/pkg/registry/storage/storageclass/storage/storage_test.go index 9ddff60b8d3..95bf49fc55b 100644 --- a/pkg/registry/storage/storageclass/storage/storage_test.go +++ b/pkg/registry/storage/storageclass/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" storageapi "k8s.io/kubernetes/pkg/apis/storage" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/storage/storageclass/strategy.go b/pkg/registry/storage/storageclass/strategy.go index 71a4eaed5b6..4c48c3dbc5a 100644 --- a/pkg/registry/storage/storageclass/strategy.go +++ b/pkg/registry/storage/storageclass/strategy.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/registry/generic" apistorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/apis/storage/validation" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" ) // storageClassStrategy implements behavior for StorageClass objects diff --git a/pkg/routes/BUILD b/pkg/routes/BUILD index f74afbe2f7f..9e80fd3c3f6 100644 --- a/pkg/routes/BUILD +++ b/pkg/routes/BUILD @@ -16,8 +16,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/server/mux:go_default_library", "//vendor:github.com/emicklei/go-restful", + "//vendor:k8s.io/apiserver/pkg/server/mux", ], ) diff --git a/pkg/routes/logs.go b/pkg/routes/logs.go index 347c411c125..317d412cecc 100644 --- a/pkg/routes/logs.go +++ b/pkg/routes/logs.go @@ -22,7 +22,7 @@ import ( "github.com/emicklei/go-restful" - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/apiserver/pkg/server/mux" ) // Logs adds handlers for the /logs path serving log files from /var/log. diff --git a/pkg/routes/ui.go b/pkg/routes/ui.go index 96d0ff235e8..0f8e3164c2b 100644 --- a/pkg/routes/ui.go +++ b/pkg/routes/ui.go @@ -19,7 +19,7 @@ package routes import ( "net/http" - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/apiserver/pkg/server/mux" ) const dashboardPath = "/api/v1/proxy/namespaces/kube-system/services/kubernetes-dashboard" diff --git a/pkg/storage/errors/BUILD b/pkg/storage/errors/BUILD deleted file mode 100644 index ce3172c94b2..00000000000 --- a/pkg/storage/errors/BUILD +++ /dev/null @@ -1,35 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "storage.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apiserver/pkg/storage", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/etcd/BUILD b/pkg/storage/etcd/BUILD deleted file mode 100644 index 19f7668a8ae..00000000000 --- a/pkg/storage/etcd/BUILD +++ /dev/null @@ -1,86 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "api_object_versioner.go", - "doc.go", - "etcd_helper.go", - "etcd_watcher.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd/util:go_default_library", - "//vendor:github.com/coreos/etcd/client", - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics", - "//vendor:k8s.io/apiserver/pkg/util/cache", - "//vendor:k8s.io/apiserver/pkg/util/trace", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "api_object_versioner_test.go", - "etcd_helper_test.go", - "etcd_watcher_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd/etcdtest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/testing:go_default_library", - "//pkg/storage/tests:go_default_library", - "//vendor:github.com/coreos/etcd/client", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/equality", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/storage", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/storage/etcd/etcdtest:all-srcs", - "//pkg/storage/etcd/testing:all-srcs", - "//pkg/storage/etcd/util:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/storage/etcd/etcdtest/BUILD b/pkg/storage/etcd/etcdtest/BUILD deleted file mode 100644 index 4a0207e32b0..00000000000 --- a/pkg/storage/etcd/etcdtest/BUILD +++ /dev/null @@ -1,30 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "etcdtest.go", - ], - tags = ["automanaged"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/etcd/testing/BUILD b/pkg/storage/etcd/testing/BUILD deleted file mode 100644 index 030a7b7e2da..00000000000 --- a/pkg/storage/etcd/testing/BUILD +++ /dev/null @@ -1,47 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["utils.go"], - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd/etcdtest:go_default_library", - "//pkg/storage/etcd/testing/testingcert:go_default_library", - "//vendor:github.com/coreos/etcd/client", - "//vendor:github.com/coreos/etcd/clientv3", - "//vendor:github.com/coreos/etcd/etcdserver", - "//vendor:github.com/coreos/etcd/etcdserver/api/v2http", - "//vendor:github.com/coreos/etcd/integration", - "//vendor:github.com/coreos/etcd/pkg/testutil", - "//vendor:github.com/coreos/etcd/pkg/transport", - "//vendor:github.com/coreos/etcd/pkg/types", - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/storage/etcd/testing/testingcert:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/storage/etcd/testing/testingcert/BUILD b/pkg/storage/etcd/testing/testingcert/BUILD deleted file mode 100644 index 74c28551b8b..00000000000 --- a/pkg/storage/etcd/testing/testingcert/BUILD +++ /dev/null @@ -1,27 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["certificates.go"], - tags = ["automanaged"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/etcd/util/BUILD b/pkg/storage/etcd/util/BUILD deleted file mode 100644 index 303a5a4d783..00000000000 --- a/pkg/storage/etcd/util/BUILD +++ /dev/null @@ -1,43 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "etcd_util.go", - ], - tags = ["automanaged"], - deps = ["//vendor:github.com/coreos/etcd/client"], -) - -go_test( - name = "go_default_test", - srcs = ["etcd_util_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:github.com/coreos/etcd/client", - "//vendor:github.com/stretchr/testify/assert", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/etcd3/BUILD b/pkg/storage/etcd3/BUILD deleted file mode 100644 index 82fcd9a15ef..00000000000 --- a/pkg/storage/etcd3/BUILD +++ /dev/null @@ -1,77 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "compact.go", - "event.go", - "store.go", - "watcher.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd:go_default_library", - "//vendor:github.com/coreos/etcd/clientv3", - "//vendor:github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes", - "//vendor:github.com/coreos/etcd/mvcc/mvccpb", - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/util/trace", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "compact_test.go", - "store_test.go", - "watcher_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:github.com/coreos/etcd/clientv3", - "//vendor:github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes", - "//vendor:github.com/coreos/etcd/integration", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/storage", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/storagebackend/factory/BUILD b/pkg/storage/storagebackend/factory/BUILD deleted file mode 100644 index aa335532b0e..00000000000 --- a/pkg/storage/storagebackend/factory/BUILD +++ /dev/null @@ -1,63 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "etcd2.go", - "etcd3.go", - "factory.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd:go_default_library", - "//pkg/storage/etcd3:go_default_library", - "//vendor:github.com/coreos/etcd/client", - "//vendor:github.com/coreos/etcd/clientv3", - "//vendor:github.com/coreos/etcd/pkg/transport", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - ], -) - -go_test( - name = "go_default_test", - srcs = ["tls_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd/testing/testingcert:go_default_library", - "//vendor:github.com/coreos/etcd/integration", - "//vendor:github.com/coreos/etcd/pkg/transport", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/testing/BUILD b/pkg/storage/testing/BUILD deleted file mode 100644 index 89dac7c6c1d..00000000000 --- a/pkg/storage/testing/BUILD +++ /dev/null @@ -1,41 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "types.generated.go", - "types.go", - "utils.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/ugorji/go/codec", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apiserver/pkg/storage", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/tests/BUILD b/pkg/storage/tests/BUILD deleted file mode 100644 index 54951d0e08e..00000000000 --- a/pkg/storage/tests/BUILD +++ /dev/null @@ -1,62 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = ["cacher_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd:go_default_library", - "//pkg/storage/etcd/etcdtest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/etcd3:go_default_library", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/equality", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/client-go/pkg/api/install", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) - -go_library( - name = "go_default_library", - srcs = ["utils.go"], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/client-go/pkg/api/install", - ], -) diff --git a/plugin/pkg/admission/exec/BUILD b/plugin/pkg/admission/exec/BUILD index 93c733ed699..0af248abe6d 100644 --- a/plugin/pkg/admission/exec/BUILD +++ b/plugin/pkg/admission/exec/BUILD @@ -15,11 +15,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/registry/rest", ], ) @@ -31,10 +31,10 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/client-go/testing", ], ) diff --git a/plugin/pkg/admission/exec/admission.go b/plugin/pkg/admission/exec/admission.go index 610b3feb9a9..33b9c04ab8f 100644 --- a/plugin/pkg/admission/exec/admission.go +++ b/plugin/pkg/admission/exec/admission.go @@ -23,9 +23,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" ) diff --git a/plugin/pkg/admission/exec/admission_test.go b/plugin/pkg/admission/exec/admission_test.go index d6dd05c01ee..917de3fe0cc 100644 --- a/plugin/pkg/admission/exec/admission_test.go +++ b/plugin/pkg/admission/exec/admission_test.go @@ -22,10 +22,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/registry/rest" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) func TestAdmission(t *testing.T) { diff --git a/plugin/pkg/admission/resourcequota/BUILD b/plugin/pkg/admission/resourcequota/BUILD index f532bcd83b4..435b4942640 100644 --- a/plugin/pkg/admission/resourcequota/BUILD +++ b/plugin/pkg/admission/resourcequota/BUILD @@ -23,7 +23,6 @@ go_library( "//pkg/kubeapiserver/admission:go_default_library", "//pkg/quota:go_default_library", "//pkg/quota/install:go_default_library", - "//pkg/storage/etcd:go_default_library", "//pkg/util/workqueue/prometheus:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/hashicorp/golang-lru", @@ -35,6 +34,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/storage/etcd", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/workqueue", ], diff --git a/plugin/pkg/admission/resourcequota/resource_access.go b/plugin/pkg/admission/resourcequota/resource_access.go index 043b27ebc3e..a74b2049fca 100644 --- a/plugin/pkg/admission/resourcequota/resource_access.go +++ b/plugin/pkg/admission/resourcequota/resource_access.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" + "k8s.io/apiserver/pkg/storage/etcd" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/storage/etcd" ) // QuotaAccessor abstracts the get/set logic from the rest of the Evaluator. This could be a test stub, a straight passthrough, diff --git a/pkg/genericapiserver/endpoints/OWNERS b/staging/src/k8s.io/apiserver/pkg/endpoints/OWNERS similarity index 100% rename from pkg/genericapiserver/endpoints/OWNERS rename to staging/src/k8s.io/apiserver/pkg/endpoints/OWNERS diff --git a/pkg/genericapiserver/endpoints/apiserver.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver.go similarity index 100% rename from pkg/genericapiserver/endpoints/apiserver.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/apiserver.go diff --git a/pkg/genericapiserver/endpoints/apiserver_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go similarity index 99% rename from pkg/genericapiserver/endpoints/apiserver_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go index 1eefa294f8f..f627fac05c9 100644 --- a/pkg/genericapiserver/endpoints/apiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go @@ -55,10 +55,10 @@ import ( examplefuzzer "k8s.io/apiserver/pkg/apis/example/fuzzer" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/endpoints/request" - genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" - genericapitesting "k8s.io/kubernetes/pkg/genericapiserver/endpoints/testing" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + genericapifilters "k8s.io/apiserver/pkg/endpoints/filters" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" + genericapitesting "k8s.io/apiserver/pkg/endpoints/testing" + "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/admission/deny" ) diff --git a/pkg/genericapiserver/endpoints/discovery.go b/staging/src/k8s.io/apiserver/pkg/endpoints/discovery.go similarity index 97% rename from pkg/genericapiserver/endpoints/discovery.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/discovery.go index 65c16b868ad..3121d5fd85b 100644 --- a/pkg/genericapiserver/endpoints/discovery.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/discovery.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/handlers" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" ) // AddApiWebService adds a service to return the supported api versions at the legacy /api. diff --git a/pkg/genericapiserver/endpoints/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/doc.go similarity index 89% rename from pkg/genericapiserver/endpoints/doc.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/doc.go index d7010712bf7..ef99114b61e 100644 --- a/pkg/genericapiserver/endpoints/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package endpoints contains the generic code that provides a RESTful Kubernetes-style API service. -package endpoints // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints" +package endpoints // import "k8s.io/apiserver/pkg/endpoints" diff --git a/pkg/genericapiserver/endpoints/filters/OWNERS b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/OWNERS similarity index 100% rename from pkg/genericapiserver/endpoints/filters/OWNERS rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/OWNERS diff --git a/pkg/genericapiserver/endpoints/filters/audit.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go similarity index 98% rename from pkg/genericapiserver/endpoints/filters/audit.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go index 0e2e9455b75..35484298395 100644 --- a/pkg/genericapiserver/endpoints/filters/audit.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go @@ -32,7 +32,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/endpoints/request" authenticationapi "k8s.io/client-go/pkg/apis/authentication" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" ) var _ http.ResponseWriter = &auditResponseWriter{} diff --git a/pkg/genericapiserver/endpoints/filters/audit_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit_test.go similarity index 100% rename from pkg/genericapiserver/endpoints/filters/audit_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit_test.go diff --git a/pkg/genericapiserver/endpoints/filters/authentication.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authentication.go similarity index 100% rename from pkg/genericapiserver/endpoints/filters/authentication.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/authentication.go diff --git a/pkg/genericapiserver/endpoints/filters/authentication_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authentication_test.go similarity index 100% rename from pkg/genericapiserver/endpoints/filters/authentication_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/authentication_test.go diff --git a/pkg/genericapiserver/endpoints/filters/authorization.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization.go similarity index 97% rename from pkg/genericapiserver/endpoints/filters/authorization.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization.go index 59e286557db..0d9292cc608 100644 --- a/pkg/genericapiserver/endpoints/filters/authorization.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization.go @@ -24,7 +24,7 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" ) // WithAuthorizationCheck passes all authorized requests on to handler, and returns a forbidden error otherwise. diff --git a/pkg/genericapiserver/endpoints/filters/authorization_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go similarity index 97% rename from pkg/genericapiserver/endpoints/filters/authorization_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go index 8449fc1c61e..b60ba76a034 100644 --- a/pkg/genericapiserver/endpoints/filters/authorization_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" ) func TestGetAuthorizerAttributes(t *testing.T) { diff --git a/pkg/genericapiserver/endpoints/filters/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/doc.go similarity index 90% rename from pkg/genericapiserver/endpoints/filters/doc.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/doc.go index 5563d5e4bc8..a13125a25ac 100644 --- a/pkg/genericapiserver/endpoints/filters/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/doc.go @@ -18,4 +18,4 @@ limitations under the License. // _are_ api related, i.e. which are prerequisite for the API services // to work (in contrast to the filters in the server package which are // not part of the API contract). -package filters // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" +package filters // import "k8s.io/apiserver/pkg/endpoints/filters" diff --git a/pkg/genericapiserver/endpoints/filters/impersonation.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go similarity index 98% rename from pkg/genericapiserver/endpoints/filters/impersonation.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go index ccd0704c0a1..6c6164e0b2a 100644 --- a/pkg/genericapiserver/endpoints/filters/impersonation.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go @@ -31,7 +31,7 @@ import ( "k8s.io/apiserver/pkg/server/httplog" "k8s.io/client-go/pkg/api" authenticationapi "k8s.io/client-go/pkg/apis/authentication" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" ) // WithImpersonation is a filter that will inspect and check requests that attempt to change the user.Info for their requests diff --git a/pkg/genericapiserver/endpoints/filters/impersonation_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go similarity index 100% rename from pkg/genericapiserver/endpoints/filters/impersonation_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go diff --git a/pkg/genericapiserver/endpoints/filters/requestinfo.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/requestinfo.go similarity index 94% rename from pkg/genericapiserver/endpoints/filters/requestinfo.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/requestinfo.go index 75344abf6f8..887fc953498 100644 --- a/pkg/genericapiserver/endpoints/filters/requestinfo.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/requestinfo.go @@ -22,7 +22,7 @@ import ( "net/http" "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" ) // WithRequestInfo attaches a RequestInfo to the context. diff --git a/pkg/genericapiserver/endpoints/filters/requestinfo_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/requestinfo_test.go similarity index 100% rename from pkg/genericapiserver/endpoints/filters/requestinfo_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/filters/requestinfo_test.go diff --git a/pkg/genericapiserver/endpoints/groupversion.go b/staging/src/k8s.io/apiserver/pkg/endpoints/groupversion.go similarity index 97% rename from pkg/genericapiserver/endpoints/groupversion.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/groupversion.go index 81d24cd530d..ca102660fd6 100644 --- a/pkg/genericapiserver/endpoints/groupversion.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/groupversion.go @@ -31,8 +31,8 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/endpoints/handlers" + "k8s.io/apiserver/pkg/registry/rest" ) // APIGroupVersion is a helper for exposing rest.Storage objects as http.Handlers via go-restful diff --git a/pkg/genericapiserver/endpoints/handlers/discovery.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/discovery.go similarity index 96% rename from pkg/genericapiserver/endpoints/handlers/discovery.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/discovery.go index d1ae7fd1ce0..68087e0eb94 100644 --- a/pkg/genericapiserver/endpoints/handlers/discovery.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/discovery.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "github.com/emicklei/go-restful" ) diff --git a/pkg/genericapiserver/endpoints/handlers/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/doc.go similarity index 88% rename from pkg/genericapiserver/endpoints/handlers/doc.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/doc.go index a3658757f68..d39833814e4 100644 --- a/pkg/genericapiserver/endpoints/handlers/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package handlers contains HTTP handlers to implement the apiserver APIs. -package handlers // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" +package handlers // import "k8s.io/apiserver/pkg/endpoints/handlers" diff --git a/pkg/genericapiserver/endpoints/handlers/patch.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go similarity index 100% rename from pkg/genericapiserver/endpoints/handlers/patch.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go diff --git a/pkg/genericapiserver/endpoints/handlers/proxy.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/proxy.go similarity index 98% rename from pkg/genericapiserver/endpoints/handlers/proxy.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/proxy.go index 44bcb28b172..32f8a13f594 100644 --- a/pkg/genericapiserver/endpoints/handlers/proxy.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/proxy.go @@ -36,8 +36,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/server/httplog" proxyutil "k8s.io/apiserver/pkg/util/proxy" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/registry/rest" "github.com/golang/glog" ) diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/doc.go similarity index 85% rename from pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/doc.go index 59bbafc2cb1..b76758b7932 100644 --- a/pkg/genericapiserver/endpoints/handlers/responsewriters/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package responsewriters containers helpers to write responses in HTTP handlers. -package responsewriters // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" +package responsewriters // import "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/errors.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/errors.go similarity index 100% rename from pkg/genericapiserver/endpoints/handlers/responsewriters/errors.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/errors.go diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/status.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/status.go similarity index 100% rename from pkg/genericapiserver/endpoints/handlers/responsewriters/status.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/status.go diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/status_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/status_test.go similarity index 100% rename from pkg/genericapiserver/endpoints/handlers/responsewriters/status_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/status_test.go diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go similarity index 98% rename from pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go index e475c0ee17a..5ec764b0254 100644 --- a/pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go @@ -29,7 +29,7 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" "k8s.io/apiserver/pkg/util/flushwriter" "k8s.io/apiserver/pkg/util/wsstream" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/registry/rest" ) // WriteObject renders a returned runtime.Object to the response as a stream or an encoded object. If the object diff --git a/pkg/genericapiserver/endpoints/handlers/rest.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go similarity index 99% rename from pkg/genericapiserver/endpoints/handlers/rest.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go index 53139dc05ef..a1f36ed7ffe 100644 --- a/pkg/genericapiserver/endpoints/handlers/rest.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go @@ -44,8 +44,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" "k8s.io/apiserver/pkg/endpoints/request" utiltrace "k8s.io/apiserver/pkg/util/trace" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/registry/rest" ) // ContextFunc returns a Context given a request - a context must be returned diff --git a/pkg/genericapiserver/endpoints/handlers/rest_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go similarity index 99% rename from pkg/genericapiserver/endpoints/handlers/rest_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go index 7d6c7f91bdc..619b8bb2f97 100644 --- a/pkg/genericapiserver/endpoints/handlers/rest_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go @@ -38,7 +38,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/registry/rest" ) type testPatchType struct { diff --git a/pkg/genericapiserver/endpoints/handlers/watch.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go similarity index 100% rename from pkg/genericapiserver/endpoints/handlers/watch.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go diff --git a/pkg/genericapiserver/endpoints/installer.go b/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go similarity index 99% rename from pkg/genericapiserver/endpoints/installer.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/installer.go index 181ee656015..40fd51e5c08 100644 --- a/pkg/genericapiserver/endpoints/installer.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go @@ -38,8 +38,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers/negotiation" "k8s.io/apiserver/pkg/endpoints/metrics" "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/endpoints/handlers" + "k8s.io/apiserver/pkg/registry/rest" "github.com/emicklei/go-restful" ) diff --git a/pkg/genericapiserver/endpoints/installer_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/installer_test.go similarity index 100% rename from pkg/genericapiserver/endpoints/installer_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/installer_test.go diff --git a/pkg/genericapiserver/endpoints/openapi/OWNERS b/staging/src/k8s.io/apiserver/pkg/endpoints/openapi/OWNERS similarity index 100% rename from pkg/genericapiserver/endpoints/openapi/OWNERS rename to staging/src/k8s.io/apiserver/pkg/endpoints/openapi/OWNERS diff --git a/pkg/genericapiserver/endpoints/openapi/openapi.go b/staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go similarity index 100% rename from pkg/genericapiserver/endpoints/openapi/openapi.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go diff --git a/pkg/genericapiserver/endpoints/openapi/openapi_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go similarity index 85% rename from pkg/genericapiserver/endpoints/openapi/openapi_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go index 9541eeb5b72..517a280dea1 100644 --- a/pkg/genericapiserver/endpoints/openapi/openapi_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go @@ -60,13 +60,13 @@ func assertEqual(t *testing.T, expected, actual interface{}) { func TestGetDefinitionName(t *testing.T) { testType := TestType{} - typePkgName := "k8s.io/kubernetes/pkg/genericapiserver/endpoints/openapi.TestType" - typeFriendlyName := "io.k8s.kubernetes.pkg.genericapiserver.endpoints.openapi.TestType" + typePkgName := "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/endpoints/openapi.TestType" + typeFriendlyName := "io.k8s.kubernetes.vendor.k8s.io.apiserver.pkg.endpoints.openapi.TestType" if strings.HasSuffix(reflect.TypeOf(testType).PkgPath(), "go_default_test") { // the test is running inside bazel where the package name is changed and // "go_default_test" will add to package path. - typePkgName = "k8s.io/kubernetes/pkg/genericapiserver/endpoints/openapi/go_default_test.TestType" - typeFriendlyName = "io.k8s.kubernetes.pkg.genericapiserver.endpoints.openapi.go_default_test.TestType" + typePkgName = "k8s.io/apiserver/pkg/endpoints/openapi/go_default_test.TestType" + typeFriendlyName = "io.k8s.apiserver.pkg.endpoints.openapi.go_default_test.TestType" } s := runtime.NewScheme() s.AddKnownTypeWithName(testType.GroupVersionKind(), &testType) diff --git a/pkg/genericapiserver/endpoints/proxy_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/proxy_test.go similarity index 99% rename from pkg/genericapiserver/endpoints/proxy_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/proxy_test.go index 829d3115f6b..0f126cf9d07 100644 --- a/pkg/genericapiserver/endpoints/proxy_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/proxy_test.go @@ -36,7 +36,7 @@ import ( "golang.org/x/net/websocket" utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/registry/rest" ) func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) { diff --git a/pkg/genericapiserver/endpoints/testing/OWNERS b/staging/src/k8s.io/apiserver/pkg/endpoints/testing/OWNERS similarity index 100% rename from pkg/genericapiserver/endpoints/testing/OWNERS rename to staging/src/k8s.io/apiserver/pkg/endpoints/testing/OWNERS diff --git a/pkg/genericapiserver/endpoints/testing/types.generated.go b/staging/src/k8s.io/apiserver/pkg/endpoints/testing/types.generated.go similarity index 100% rename from pkg/genericapiserver/endpoints/testing/types.generated.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/testing/types.generated.go diff --git a/pkg/genericapiserver/endpoints/testing/types.go b/staging/src/k8s.io/apiserver/pkg/endpoints/testing/types.go similarity index 100% rename from pkg/genericapiserver/endpoints/testing/types.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/testing/types.go diff --git a/pkg/genericapiserver/endpoints/watch_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go similarity index 99% rename from pkg/genericapiserver/endpoints/watch_test.go rename to staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go index bc6053230b1..7e24198194d 100644 --- a/pkg/genericapiserver/endpoints/watch_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go @@ -40,9 +40,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" example "k8s.io/apiserver/pkg/apis/example" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers" - apitesting "k8s.io/kubernetes/pkg/genericapiserver/endpoints/testing" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/endpoints/handlers" + apitesting "k8s.io/apiserver/pkg/endpoints/testing" + "k8s.io/apiserver/pkg/registry/rest" ) // watchJSON defines the expected JSON wire equivalent of watch.Event diff --git a/pkg/genericapiserver/registry/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/doc.go similarity index 89% rename from pkg/genericapiserver/registry/doc.go rename to staging/src/k8s.io/apiserver/pkg/registry/doc.go index 1714984bc42..f41dc0a2d8a 100644 --- a/pkg/genericapiserver/registry/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package registry contains the generic implementation of the storage and system logic. -package registry // import "k8s.io/kubernetes/pkg/genericapiserver/registry" +package registry // import "k8s.io/apiserver/pkg/registry" diff --git a/pkg/genericapiserver/registry/generic/OWNERS b/staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS similarity index 100% rename from pkg/genericapiserver/registry/generic/OWNERS rename to staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS diff --git a/pkg/genericapiserver/registry/generic/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/doc.go similarity index 88% rename from pkg/genericapiserver/registry/generic/doc.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/doc.go index f743ae13346..ea79d130a79 100644 --- a/pkg/genericapiserver/registry/generic/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package generic provides a generic object store interface and a // generic label/field matching type. -package generic // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" +package generic // import "k8s.io/apiserver/pkg/registry/generic" diff --git a/pkg/genericapiserver/registry/generic/matcher.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/matcher.go similarity index 100% rename from pkg/genericapiserver/registry/generic/matcher.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/matcher.go diff --git a/pkg/genericapiserver/registry/generic/options.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/options.go similarity index 100% rename from pkg/genericapiserver/registry/generic/options.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/options.go diff --git a/pkg/genericapiserver/registry/generic/registry/decorated_watcher.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/decorated_watcher.go similarity index 100% rename from pkg/genericapiserver/registry/generic/registry/decorated_watcher.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/registry/decorated_watcher.go diff --git a/pkg/genericapiserver/registry/generic/registry/decorated_watcher_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/decorated_watcher_test.go similarity index 100% rename from pkg/genericapiserver/registry/generic/registry/decorated_watcher_test.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/registry/decorated_watcher_test.go diff --git a/pkg/genericapiserver/registry/generic/registry/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/doc.go similarity index 87% rename from pkg/genericapiserver/registry/generic/registry/doc.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/registry/doc.go index 95cdb9cc335..bd315ae47bd 100644 --- a/pkg/genericapiserver/registry/generic/registry/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package etcd has a generic implementation of a registry that // stores things in etcd. -package registry // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" +package registry // import "k8s.io/apiserver/pkg/registry/generic/registry" diff --git a/pkg/genericapiserver/registry/generic/registry/storage_factory.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go similarity index 92% rename from pkg/genericapiserver/registry/generic/registry/storage_factory.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go index 77cc3697da1..2e741e12356 100644 --- a/pkg/genericapiserver/registry/generic/registry/storage_factory.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go @@ -19,10 +19,10 @@ package registry import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/storage" + etcdstorage "k8s.io/apiserver/pkg/storage/etcd" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" + "k8s.io/apiserver/pkg/registry/generic" ) var _ generic.StorageDecorator = StorageWithCacher diff --git a/pkg/genericapiserver/registry/generic/registry/store.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go similarity index 99% rename from pkg/genericapiserver/registry/generic/registry/store.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go index 5f95681aeee..ee6aa2992ff 100644 --- a/pkg/genericapiserver/registry/generic/registry/store.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go @@ -37,9 +37,9 @@ import ( "k8s.io/apimachinery/pkg/watch" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - storeerr "k8s.io/kubernetes/pkg/storage/errors" + storeerr "k8s.io/apiserver/pkg/storage/errors" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" "github.com/golang/glog" ) diff --git a/pkg/genericapiserver/registry/generic/registry/store_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go similarity index 99% rename from pkg/genericapiserver/registry/generic/registry/store_test.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go index 6e32bd76bc3..16a799ec966 100644 --- a/pkg/genericapiserver/registry/generic/registry/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go @@ -43,13 +43,13 @@ import ( examplev1 "k8s.io/apiserver/pkg/apis/example/v1" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" + etcdstorage "k8s.io/apiserver/pkg/storage/etcd" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/names" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" - storagetesting "k8s.io/kubernetes/pkg/storage/testing" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" + storagetesting "k8s.io/apiserver/pkg/storage/testing" + "k8s.io/apiserver/pkg/registry/generic" + "k8s.io/apiserver/pkg/registry/rest" ) var scheme = runtime.NewScheme() diff --git a/pkg/genericapiserver/registry/generic/rest/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/doc.go similarity index 88% rename from pkg/genericapiserver/registry/generic/rest/doc.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/rest/doc.go index abe523eb946..3b77b559368 100644 --- a/pkg/genericapiserver/registry/generic/rest/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package rest has generic implementations of resources used for // REST responses -package rest // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" +package rest // import "k8s.io/apiserver/pkg/registry/generic/rest" diff --git a/pkg/genericapiserver/registry/generic/rest/proxy.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/proxy.go similarity index 100% rename from pkg/genericapiserver/registry/generic/rest/proxy.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/rest/proxy.go diff --git a/pkg/genericapiserver/registry/generic/rest/proxy_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/proxy_test.go similarity index 100% rename from pkg/genericapiserver/registry/generic/rest/proxy_test.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/rest/proxy_test.go diff --git a/pkg/genericapiserver/registry/generic/rest/response_checker.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/response_checker.go similarity index 100% rename from pkg/genericapiserver/registry/generic/rest/response_checker.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/rest/response_checker.go diff --git a/pkg/genericapiserver/registry/generic/rest/response_checker_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/response_checker_test.go similarity index 100% rename from pkg/genericapiserver/registry/generic/rest/response_checker_test.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/rest/response_checker_test.go diff --git a/pkg/genericapiserver/registry/generic/rest/streamer.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer.go similarity index 97% rename from pkg/genericapiserver/registry/generic/rest/streamer.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer.go index 24fe7f98674..25477bd910d 100644 --- a/pkg/genericapiserver/registry/generic/rest/streamer.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer.go @@ -23,7 +23,7 @@ import ( "strings" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/registry/rest" ) // LocationStreamer is a resource that streams the contents of a particular diff --git a/pkg/genericapiserver/registry/generic/rest/streamer_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer_test.go similarity index 100% rename from pkg/genericapiserver/registry/generic/rest/streamer_test.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer_test.go diff --git a/pkg/genericapiserver/registry/generic/storage_decorator.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/storage_decorator.go similarity index 97% rename from pkg/genericapiserver/registry/generic/storage_decorator.go rename to staging/src/k8s.io/apiserver/pkg/registry/generic/storage_decorator.go index f7b8f5e1b95..5029503147d 100644 --- a/pkg/genericapiserver/registry/generic/storage_decorator.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/storage_decorator.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" ) // StorageDecorator is a function signature for producing a storage.Interface diff --git a/pkg/genericapiserver/registry/rest/OWNERS b/staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS similarity index 100% rename from pkg/genericapiserver/registry/rest/OWNERS rename to staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS diff --git a/pkg/genericapiserver/registry/rest/create.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/create.go similarity index 100% rename from pkg/genericapiserver/registry/rest/create.go rename to staging/src/k8s.io/apiserver/pkg/registry/rest/create.go diff --git a/pkg/genericapiserver/registry/rest/delete.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/delete.go similarity index 100% rename from pkg/genericapiserver/registry/rest/delete.go rename to staging/src/k8s.io/apiserver/pkg/registry/rest/delete.go diff --git a/pkg/genericapiserver/registry/rest/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/doc.go similarity index 89% rename from pkg/genericapiserver/registry/rest/doc.go rename to staging/src/k8s.io/apiserver/pkg/registry/rest/doc.go index 6f9855077ae..20524d21ff0 100644 --- a/pkg/genericapiserver/registry/rest/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package rest defines common logic around changes to Kubernetes-style resources. -package rest // import "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" +package rest // import "k8s.io/apiserver/pkg/registry/rest" diff --git a/pkg/genericapiserver/registry/rest/export.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/export.go similarity index 100% rename from pkg/genericapiserver/registry/rest/export.go rename to staging/src/k8s.io/apiserver/pkg/registry/rest/export.go diff --git a/pkg/genericapiserver/registry/rest/meta.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/meta.go similarity index 100% rename from pkg/genericapiserver/registry/rest/meta.go rename to staging/src/k8s.io/apiserver/pkg/registry/rest/meta.go diff --git a/pkg/genericapiserver/registry/rest/meta_test.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/meta_test.go similarity index 100% rename from pkg/genericapiserver/registry/rest/meta_test.go rename to staging/src/k8s.io/apiserver/pkg/registry/rest/meta_test.go diff --git a/pkg/genericapiserver/registry/rest/rest.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/rest.go similarity index 100% rename from pkg/genericapiserver/registry/rest/rest.go rename to staging/src/k8s.io/apiserver/pkg/registry/rest/rest.go diff --git a/pkg/genericapiserver/registry/rest/resttest/resttest.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go similarity index 99% rename from pkg/genericapiserver/registry/rest/resttest/resttest.go rename to staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go index fc5d75e7616..8fdb59886c4 100644 --- a/pkg/genericapiserver/registry/rest/resttest/resttest.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" + "k8s.io/apiserver/pkg/registry/rest" ) type Tester struct { diff --git a/pkg/genericapiserver/registry/rest/update.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/update.go similarity index 100% rename from pkg/genericapiserver/registry/rest/update.go rename to staging/src/k8s.io/apiserver/pkg/registry/rest/update.go diff --git a/pkg/genericapiserver/server/OWNERS b/staging/src/k8s.io/apiserver/pkg/server/OWNERS similarity index 100% rename from pkg/genericapiserver/server/OWNERS rename to staging/src/k8s.io/apiserver/pkg/server/OWNERS diff --git a/pkg/genericapiserver/server/config.go b/staging/src/k8s.io/apiserver/pkg/server/config.go similarity index 98% rename from pkg/genericapiserver/server/config.go rename to staging/src/k8s.io/apiserver/pkg/server/config.go index 741288507d5..1fccb4bdcfd 100644 --- a/pkg/genericapiserver/server/config.go +++ b/staging/src/k8s.io/apiserver/pkg/server/config.go @@ -56,10 +56,10 @@ import ( "k8s.io/apiserver/pkg/server/options" restclient "k8s.io/client-go/rest" certutil "k8s.io/client-go/util/cert" - genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" - apiopenapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints/openapi" - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" - "k8s.io/kubernetes/pkg/genericapiserver/server/routes" + genericapifilters "k8s.io/apiserver/pkg/endpoints/filters" + apiopenapi "k8s.io/apiserver/pkg/endpoints/openapi" + "k8s.io/apiserver/pkg/server/mux" + "k8s.io/apiserver/pkg/server/routes" ) const ( diff --git a/pkg/genericapiserver/server/config_selfclient.go b/staging/src/k8s.io/apiserver/pkg/server/config_selfclient.go similarity index 100% rename from pkg/genericapiserver/server/config_selfclient.go rename to staging/src/k8s.io/apiserver/pkg/server/config_selfclient.go diff --git a/pkg/genericapiserver/server/discovery.go b/staging/src/k8s.io/apiserver/pkg/server/discovery.go similarity index 100% rename from pkg/genericapiserver/server/discovery.go rename to staging/src/k8s.io/apiserver/pkg/server/discovery.go diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight_test.go index 872fe074ce6..8793143f92a 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/util/sets" apirequest "k8s.io/apiserver/pkg/endpoints/request" - apifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" + apifilters "k8s.io/apiserver/pkg/endpoints/filters" ) func createMaxInflightServer(callsWg, blockWg *sync.WaitGroup, disableCallsWg *bool, disableCallsWgMutex *sync.Mutex, nonMutating, mutating int) *httptest.Server { diff --git a/pkg/genericapiserver/server/genericapiserver.go b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go similarity index 98% rename from pkg/genericapiserver/server/genericapiserver.go rename to staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go index b2458e2d959..e6f01fab711 100644 --- a/pkg/genericapiserver/server/genericapiserver.go +++ b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go @@ -43,10 +43,10 @@ import ( apirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/server/healthz" restclient "k8s.io/client-go/rest" - genericapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - genericmux "k8s.io/kubernetes/pkg/genericapiserver/server/mux" - "k8s.io/kubernetes/pkg/genericapiserver/server/routes" + genericapi "k8s.io/apiserver/pkg/endpoints" + "k8s.io/apiserver/pkg/registry/rest" + genericmux "k8s.io/apiserver/pkg/server/mux" + "k8s.io/apiserver/pkg/server/routes" ) // Info about an API group. diff --git a/pkg/genericapiserver/server/genericapiserver_test.go b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go similarity index 99% rename from pkg/genericapiserver/server/genericapiserver_test.go rename to staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go index 7a311b49eb2..44fdede40b6 100644 --- a/pkg/genericapiserver/server/genericapiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go @@ -46,10 +46,10 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/client-go/pkg/api" openapigen "k8s.io/kubernetes/pkg/generated/openapi" - "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/registry/rest" ) const ( diff --git a/pkg/genericapiserver/server/healthz.go b/staging/src/k8s.io/apiserver/pkg/server/healthz.go similarity index 100% rename from pkg/genericapiserver/server/healthz.go rename to staging/src/k8s.io/apiserver/pkg/server/healthz.go diff --git a/pkg/genericapiserver/server/hooks.go b/staging/src/k8s.io/apiserver/pkg/server/hooks.go similarity index 100% rename from pkg/genericapiserver/server/hooks.go rename to staging/src/k8s.io/apiserver/pkg/server/hooks.go diff --git a/pkg/genericapiserver/server/mux/OWNERS b/staging/src/k8s.io/apiserver/pkg/server/mux/OWNERS similarity index 100% rename from pkg/genericapiserver/server/mux/OWNERS rename to staging/src/k8s.io/apiserver/pkg/server/mux/OWNERS diff --git a/pkg/genericapiserver/server/mux/container.go b/staging/src/k8s.io/apiserver/pkg/server/mux/container.go similarity index 97% rename from pkg/genericapiserver/server/mux/container.go rename to staging/src/k8s.io/apiserver/pkg/server/mux/container.go index dc6b61b9d54..8c0f4d154c8 100644 --- a/pkg/genericapiserver/server/mux/container.go +++ b/staging/src/k8s.io/apiserver/pkg/server/mux/container.go @@ -28,7 +28,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" ) // APIContainer is a restful container which in addition support registering diff --git a/pkg/genericapiserver/server/mux/container_test.go b/staging/src/k8s.io/apiserver/pkg/server/mux/container_test.go similarity index 100% rename from pkg/genericapiserver/server/mux/container_test.go rename to staging/src/k8s.io/apiserver/pkg/server/mux/container_test.go diff --git a/pkg/genericapiserver/server/mux/doc.go b/staging/src/k8s.io/apiserver/pkg/server/mux/doc.go similarity index 100% rename from pkg/genericapiserver/server/mux/doc.go rename to staging/src/k8s.io/apiserver/pkg/server/mux/doc.go diff --git a/pkg/genericapiserver/server/mux/pathrecorder.go b/staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder.go similarity index 100% rename from pkg/genericapiserver/server/mux/pathrecorder.go rename to staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder.go diff --git a/pkg/genericapiserver/server/openapi/OWNERS b/staging/src/k8s.io/apiserver/pkg/server/openapi/OWNERS similarity index 100% rename from pkg/genericapiserver/server/openapi/OWNERS rename to staging/src/k8s.io/apiserver/pkg/server/openapi/OWNERS diff --git a/pkg/genericapiserver/server/openapi/doc.go b/staging/src/k8s.io/apiserver/pkg/server/openapi/doc.go similarity index 100% rename from pkg/genericapiserver/server/openapi/doc.go rename to staging/src/k8s.io/apiserver/pkg/server/openapi/doc.go diff --git a/pkg/genericapiserver/server/openapi/openapi.go b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go similarity index 99% rename from pkg/genericapiserver/server/openapi/openapi.go rename to staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go index 7ad095bbdfb..d1c487a260c 100644 --- a/pkg/genericapiserver/server/openapi/openapi.go +++ b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/openapi" "k8s.io/apimachinery/pkg/util/json" "k8s.io/apiserver/pkg/util/trie" - genericmux "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + genericmux "k8s.io/apiserver/pkg/server/mux" ) const ( diff --git a/pkg/genericapiserver/server/openapi/openapi_test.go b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi_test.go similarity index 96% rename from pkg/genericapiserver/server/openapi/openapi_test.go rename to staging/src/k8s.io/apiserver/pkg/server/openapi/openapi_test.go index dedf7c4b84f..f0a922a2d60 100644 --- a/pkg/genericapiserver/server/openapi/openapi_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi_test.go @@ -189,12 +189,12 @@ func getConfig(fullMethods bool) (*openapi.Config, *restful.Container) { }, GetDefinitions: func(_ openapi.ReferenceCallback) map[string]openapi.OpenAPIDefinition { return map[string]openapi.OpenAPIDefinition{ - "k8s.io/kubernetes/pkg/genericapiserver/server/openapi.TestInput": *TestInput{}.OpenAPIDefinition(), - "k8s.io/kubernetes/pkg/genericapiserver/server/openapi.TestOutput": *TestOutput{}.OpenAPIDefinition(), + "k8s.io/apiserver/pkg/server/openapi.TestInput": *TestInput{}.OpenAPIDefinition(), + "k8s.io/apiserver/pkg/server/openapi.TestOutput": *TestOutput{}.OpenAPIDefinition(), // Bazel changes the package name, this is ok for testing, but we need to fix it if it happened // in the main code. - "k8s.io/kubernetes/pkg/genericapiserver/server/openapi/go_default_test.TestInput": *TestInput{}.OpenAPIDefinition(), - "k8s.io/kubernetes/pkg/genericapiserver/server/openapi/go_default_test.TestOutput": *TestOutput{}.OpenAPIDefinition(), + "k8s.io/apiserver/pkg/server/openapi/go_default_test.TestInput": *TestInput{}.OpenAPIDefinition(), + "k8s.io/apiserver/pkg/server/openapi/go_default_test.TestOutput": *TestOutput{}.OpenAPIDefinition(), } }, GetDefinitionName: func(_ string, name string) (string, spec.Extensions) { diff --git a/pkg/genericapiserver/server/openapi/util.go b/staging/src/k8s.io/apiserver/pkg/server/openapi/util.go similarity index 100% rename from pkg/genericapiserver/server/openapi/util.go rename to staging/src/k8s.io/apiserver/pkg/server/openapi/util.go diff --git a/pkg/genericapiserver/server/resource_config.go b/staging/src/k8s.io/apiserver/pkg/server/resource_config.go similarity index 100% rename from pkg/genericapiserver/server/resource_config.go rename to staging/src/k8s.io/apiserver/pkg/server/resource_config.go diff --git a/pkg/genericapiserver/server/resource_config_test.go b/staging/src/k8s.io/apiserver/pkg/server/resource_config_test.go similarity index 100% rename from pkg/genericapiserver/server/resource_config_test.go rename to staging/src/k8s.io/apiserver/pkg/server/resource_config_test.go diff --git a/pkg/genericapiserver/server/resource_encoding_config.go b/staging/src/k8s.io/apiserver/pkg/server/resource_encoding_config.go similarity index 100% rename from pkg/genericapiserver/server/resource_encoding_config.go rename to staging/src/k8s.io/apiserver/pkg/server/resource_encoding_config.go diff --git a/pkg/genericapiserver/server/routes/OWNERS b/staging/src/k8s.io/apiserver/pkg/server/routes/OWNERS similarity index 100% rename from pkg/genericapiserver/server/routes/OWNERS rename to staging/src/k8s.io/apiserver/pkg/server/routes/OWNERS diff --git a/pkg/genericapiserver/server/routes/doc.go b/staging/src/k8s.io/apiserver/pkg/server/routes/doc.go similarity index 100% rename from pkg/genericapiserver/server/routes/doc.go rename to staging/src/k8s.io/apiserver/pkg/server/routes/doc.go diff --git a/pkg/genericapiserver/server/routes/index.go b/staging/src/k8s.io/apiserver/pkg/server/routes/index.go similarity index 92% rename from pkg/genericapiserver/server/routes/index.go rename to staging/src/k8s.io/apiserver/pkg/server/routes/index.go index cb4f813e355..d2da396ec7b 100644 --- a/pkg/genericapiserver/server/routes/index.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/index.go @@ -21,8 +21,8 @@ import ( "sort" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/server/mux" ) // Index provides a webservice for the http root / listing all known paths. diff --git a/pkg/genericapiserver/server/routes/metrics.go b/staging/src/k8s.io/apiserver/pkg/server/routes/metrics.go similarity index 96% rename from pkg/genericapiserver/server/routes/metrics.go rename to staging/src/k8s.io/apiserver/pkg/server/routes/metrics.go index 13bba925b73..39aff023220 100644 --- a/pkg/genericapiserver/server/routes/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/metrics.go @@ -22,7 +22,7 @@ import ( apimetrics "k8s.io/apiserver/pkg/endpoints/metrics" etcdmetrics "k8s.io/apiserver/pkg/storage/etcd/metrics" - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/apiserver/pkg/server/mux" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/genericapiserver/server/routes/openapi.go b/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go similarity index 89% rename from pkg/genericapiserver/server/routes/openapi.go rename to staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go index 2561b309473..073866fde2d 100644 --- a/pkg/genericapiserver/server/routes/openapi.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go @@ -18,8 +18,8 @@ package routes import ( "k8s.io/apimachinery/pkg/openapi" - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" - apiserveropenapi "k8s.io/kubernetes/pkg/genericapiserver/server/openapi" + "k8s.io/apiserver/pkg/server/mux" + apiserveropenapi "k8s.io/apiserver/pkg/server/openapi" "github.com/golang/glog" ) diff --git a/pkg/genericapiserver/server/routes/profiling.go b/staging/src/k8s.io/apiserver/pkg/server/routes/profiling.go similarity index 94% rename from pkg/genericapiserver/server/routes/profiling.go rename to staging/src/k8s.io/apiserver/pkg/server/routes/profiling.go index 4d8384a0876..759eba4739c 100644 --- a/pkg/genericapiserver/server/routes/profiling.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/profiling.go @@ -19,7 +19,7 @@ package routes import ( "net/http/pprof" - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/apiserver/pkg/server/mux" ) // Profiling adds handlers for pprof under /debug/pprof. diff --git a/pkg/genericapiserver/server/routes/swagger.go b/staging/src/k8s.io/apiserver/pkg/server/routes/swagger.go similarity index 95% rename from pkg/genericapiserver/server/routes/swagger.go rename to staging/src/k8s.io/apiserver/pkg/server/routes/swagger.go index 352c4f5e983..fb62c65b0fa 100644 --- a/pkg/genericapiserver/server/routes/swagger.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/swagger.go @@ -17,7 +17,7 @@ limitations under the License. package routes import ( - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/apiserver/pkg/server/mux" "github.com/emicklei/go-restful/swagger" ) diff --git a/pkg/genericapiserver/server/routes/swaggerui.go b/staging/src/k8s.io/apiserver/pkg/server/routes/swaggerui.go similarity index 95% rename from pkg/genericapiserver/server/routes/swaggerui.go rename to staging/src/k8s.io/apiserver/pkg/server/routes/swaggerui.go index 8acbc624321..13f3a6166f4 100644 --- a/pkg/genericapiserver/server/routes/swaggerui.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/swaggerui.go @@ -22,7 +22,7 @@ import ( assetfs "github.com/elazarl/go-bindata-assetfs" "k8s.io/apiserver/pkg/server/routes/data/swagger" - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/apiserver/pkg/server/mux" ) // SwaggerUI exposes files in third_party/swagger-ui/ under /swagger-ui. diff --git a/pkg/genericapiserver/server/routes/version.go b/staging/src/k8s.io/apiserver/pkg/server/routes/version.go similarity index 92% rename from pkg/genericapiserver/server/routes/version.go rename to staging/src/k8s.io/apiserver/pkg/server/routes/version.go index fdb1a7343b6..a1c3c6ad73f 100644 --- a/pkg/genericapiserver/server/routes/version.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/version.go @@ -22,8 +22,8 @@ import ( "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/version" - "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/server/mux" + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" + "k8s.io/apiserver/pkg/server/mux" ) // Version provides a webservice with version information. diff --git a/pkg/genericapiserver/server/serve.go b/staging/src/k8s.io/apiserver/pkg/server/serve.go similarity index 100% rename from pkg/genericapiserver/server/serve.go rename to staging/src/k8s.io/apiserver/pkg/server/serve.go diff --git a/pkg/genericapiserver/server/serve_test.go b/staging/src/k8s.io/apiserver/pkg/server/serve_test.go similarity index 100% rename from pkg/genericapiserver/server/serve_test.go rename to staging/src/k8s.io/apiserver/pkg/server/serve_test.go diff --git a/pkg/genericapiserver/server/storage_factory.go b/staging/src/k8s.io/apiserver/pkg/server/storage_factory.go similarity index 100% rename from pkg/genericapiserver/server/storage_factory.go rename to staging/src/k8s.io/apiserver/pkg/server/storage_factory.go diff --git a/pkg/genericapiserver/server/storage_factory_test.go b/staging/src/k8s.io/apiserver/pkg/server/storage_factory_test.go similarity index 100% rename from pkg/genericapiserver/server/storage_factory_test.go rename to staging/src/k8s.io/apiserver/pkg/server/storage_factory_test.go diff --git a/pkg/storage/errors/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go similarity index 90% rename from pkg/storage/errors/doc.go rename to staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go index 012e4b8e008..3d3150c5690 100644 --- a/pkg/storage/errors/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package etcd provides conversion of etcd errors to API errors. -package storage // import "k8s.io/kubernetes/pkg/storage/errors" +package storage // import "k8s.io/apiserver/pkg/storage/errors" diff --git a/pkg/storage/errors/storage.go b/staging/src/k8s.io/apiserver/pkg/storage/errors/storage.go similarity index 100% rename from pkg/storage/errors/storage.go rename to staging/src/k8s.io/apiserver/pkg/storage/errors/storage.go diff --git a/pkg/storage/etcd/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/etcd/OWNERS similarity index 100% rename from pkg/storage/etcd/OWNERS rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/OWNERS diff --git a/pkg/storage/etcd/api_object_versioner.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go similarity index 100% rename from pkg/storage/etcd/api_object_versioner.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go diff --git a/pkg/storage/etcd/api_object_versioner_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go similarity index 97% rename from pkg/storage/etcd/api_object_versioner_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go index acbce6243fb..6ed59dfc3e1 100644 --- a/pkg/storage/etcd/api_object_versioner_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - storagetesting "k8s.io/kubernetes/pkg/storage/testing" + storagetesting "k8s.io/apiserver/pkg/storage/testing" ) func TestObjectVersioner(t *testing.T) { diff --git a/pkg/storage/etcd/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go similarity index 90% rename from pkg/storage/etcd/doc.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go index 22b269d5aec..566f466510e 100644 --- a/pkg/storage/etcd/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd // import "k8s.io/kubernetes/pkg/storage/etcd" +package etcd // import "k8s.io/apiserver/pkg/storage/etcd" diff --git a/pkg/storage/etcd/etcd_helper.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go similarity index 99% rename from pkg/storage/etcd/etcd_helper.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go index 08944b0c0ab..13a54b38b42 100644 --- a/pkg/storage/etcd/etcd_helper.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go @@ -36,7 +36,7 @@ import ( "k8s.io/apiserver/pkg/storage/etcd/metrics" utilcache "k8s.io/apiserver/pkg/util/cache" utiltrace "k8s.io/apiserver/pkg/util/trace" - etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" + etcdutil "k8s.io/apiserver/pkg/storage/etcd/util" ) // Creates a new storage interface from the client diff --git a/pkg/storage/etcd/etcd_helper_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go similarity index 98% rename from pkg/storage/etcd/etcd_helper_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go index e2793f0ab32..1d7f525358f 100644 --- a/pkg/storage/etcd/etcd_helper_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go @@ -36,10 +36,10 @@ import ( "k8s.io/apiserver/pkg/apis/example" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/storage" - "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - storagetesting "k8s.io/kubernetes/pkg/storage/testing" - storagetests "k8s.io/kubernetes/pkg/storage/tests" + "k8s.io/apiserver/pkg/storage/etcd/etcdtest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + storagetesting "k8s.io/apiserver/pkg/storage/testing" + storagetests "k8s.io/apiserver/pkg/storage/tests" ) func testScheme(t *testing.T) (*runtime.Scheme, serializer.CodecFactory) { diff --git a/pkg/storage/etcd/etcd_watcher.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go similarity index 99% rename from pkg/storage/etcd/etcd_watcher.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go index 280ecb657b5..a1fb305275d 100644 --- a/pkg/storage/etcd/etcd_watcher.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go @@ -28,7 +28,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/storage" - etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" + etcdutil "k8s.io/apiserver/pkg/storage/etcd/util" etcd "github.com/coreos/etcd/client" "github.com/golang/glog" diff --git a/pkg/storage/etcd/etcd_watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go similarity index 99% rename from pkg/storage/etcd/etcd_watcher_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go index cfdb5a7abe1..b296c149421 100644 --- a/pkg/storage/etcd/etcd_watcher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apiserver/pkg/apis/example" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/storage" - "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/storage/etcd/etcdtest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcd "github.com/coreos/etcd/client" "golang.org/x/net/context" diff --git a/pkg/storage/etcd/etcdtest/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go similarity index 88% rename from pkg/storage/etcd/etcdtest/doc.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go index 23f749e5ee5..d86e088d299 100644 --- a/pkg/storage/etcd/etcdtest/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcdtest // import "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" +package etcdtest // import "k8s.io/apiserver/pkg/storage/etcd/etcdtest" diff --git a/pkg/storage/etcd/etcdtest/etcdtest.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/etcdtest.go similarity index 100% rename from pkg/storage/etcd/etcdtest/etcdtest.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/etcdtest.go diff --git a/pkg/storage/etcd/testing/testingcert/certificates.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/testingcert/certificates.go similarity index 100% rename from pkg/storage/etcd/testing/testingcert/certificates.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/testingcert/certificates.go diff --git a/pkg/storage/etcd/testing/utils.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go similarity index 98% rename from pkg/storage/etcd/testing/utils.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go index 9e570243db3..832de06d12f 100644 --- a/pkg/storage/etcd/testing/utils.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" - "k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert" + "k8s.io/apiserver/pkg/storage/etcd/etcdtest" + "k8s.io/apiserver/pkg/storage/etcd/testing/testingcert" etcd "github.com/coreos/etcd/client" "github.com/coreos/etcd/clientv3" diff --git a/pkg/storage/etcd/util/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go similarity index 91% rename from pkg/storage/etcd/util/doc.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go index d10b9a9922b..97241a44f19 100644 --- a/pkg/storage/etcd/util/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package util holds generic etcd-related utility functions that any user of ectd might want to // use, without pulling in kubernetes-specific code. -package util // import "k8s.io/kubernetes/pkg/storage/etcd/util" +package util // import "k8s.io/apiserver/pkg/storage/etcd/util" diff --git a/pkg/storage/etcd/util/etcd_util.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/etcd_util.go similarity index 100% rename from pkg/storage/etcd/util/etcd_util.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/util/etcd_util.go diff --git a/pkg/storage/etcd/util/etcd_util_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/etcd_util_test.go similarity index 100% rename from pkg/storage/etcd/util/etcd_util_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/util/etcd_util_test.go diff --git a/pkg/storage/etcd3/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/OWNERS similarity index 100% rename from pkg/storage/etcd3/OWNERS rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/OWNERS diff --git a/pkg/storage/etcd3/compact.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go similarity index 100% rename from pkg/storage/etcd3/compact.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go diff --git a/pkg/storage/etcd3/compact_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go similarity index 100% rename from pkg/storage/etcd3/compact_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go diff --git a/pkg/storage/etcd3/event.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event.go similarity index 100% rename from pkg/storage/etcd3/event.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/event.go diff --git a/pkg/storage/etcd3/store.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go similarity index 99% rename from pkg/storage/etcd3/store.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go index be7a00d468d..e55c646b0b5 100644 --- a/pkg/storage/etcd3/store.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/storage" utiltrace "k8s.io/apiserver/pkg/util/trace" - "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd" ) type store struct { diff --git a/pkg/storage/etcd3/store_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go similarity index 100% rename from pkg/storage/etcd3/store_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go diff --git a/pkg/storage/etcd3/watcher.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go similarity index 100% rename from pkg/storage/etcd3/watcher.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go diff --git a/pkg/storage/etcd3/watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go similarity index 100% rename from pkg/storage/etcd3/watcher_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go diff --git a/pkg/storage/storagebackend/factory/etcd2.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go similarity index 98% rename from pkg/storage/storagebackend/factory/etcd2.go rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go index c6e5f52c43c..78377c49356 100644 --- a/pkg/storage/storagebackend/factory/etcd2.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go @@ -27,7 +27,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd" ) func newETCD2Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) { diff --git a/pkg/storage/storagebackend/factory/etcd3.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go similarity index 97% rename from pkg/storage/storagebackend/factory/etcd3.go rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go index 595474723ac..fa457719ef4 100644 --- a/pkg/storage/storagebackend/factory/etcd3.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go @@ -19,7 +19,7 @@ package factory import ( "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/etcd3" + "k8s.io/apiserver/pkg/storage/etcd3" "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/pkg/transport" diff --git a/pkg/storage/storagebackend/factory/factory.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/factory.go similarity index 100% rename from pkg/storage/storagebackend/factory/factory.go rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/factory.go diff --git a/pkg/storage/storagebackend/factory/tls_test.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go similarity index 98% rename from pkg/storage/storagebackend/factory/tls_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go index b13a944e228..294642eeb3e 100644 --- a/pkg/storage/storagebackend/factory/tls_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apiserver/pkg/apis/example" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert" + "k8s.io/apiserver/pkg/storage/etcd/testing/testingcert" ) var scheme = runtime.NewScheme() diff --git a/pkg/storage/testing/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/testing/OWNERS similarity index 100% rename from pkg/storage/testing/OWNERS rename to staging/src/k8s.io/apiserver/pkg/storage/testing/OWNERS diff --git a/pkg/storage/testing/types.generated.go b/staging/src/k8s.io/apiserver/pkg/storage/testing/types.generated.go similarity index 100% rename from pkg/storage/testing/types.generated.go rename to staging/src/k8s.io/apiserver/pkg/storage/testing/types.generated.go diff --git a/pkg/storage/testing/types.go b/staging/src/k8s.io/apiserver/pkg/storage/testing/types.go similarity index 100% rename from pkg/storage/testing/types.go rename to staging/src/k8s.io/apiserver/pkg/storage/testing/types.go diff --git a/pkg/storage/testing/utils.go b/staging/src/k8s.io/apiserver/pkg/storage/testing/utils.go similarity index 100% rename from pkg/storage/testing/utils.go rename to staging/src/k8s.io/apiserver/pkg/storage/testing/utils.go diff --git a/pkg/storage/tests/cacher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go similarity index 98% rename from pkg/storage/tests/cacher_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go index 7cebc6e070f..d3690c42215 100644 --- a/pkg/storage/tests/cacher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go @@ -38,10 +38,10 @@ import ( "k8s.io/apiserver/pkg/apis/example" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/storage" - etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/storage/etcd3" + etcdstorage "k8s.io/apiserver/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd/etcdtest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/storage/etcd3" "golang.org/x/net/context" diff --git a/pkg/storage/tests/utils.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go similarity index 100% rename from pkg/storage/tests/utils.go rename to staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go diff --git a/test/e2e/BUILD b/test/e2e/BUILD index e23e58c0735..1129120ac4f 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -129,7 +129,6 @@ go_library( "//pkg/controller/replicaset:go_default_library", "//pkg/controller/replication:go_default_library", "//pkg/controller/statefulset:go_default_library", - "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubelet/api/v1alpha1/stats:go_default_library", @@ -191,6 +190,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/yaml", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/authentication/serviceaccount", + "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", "//vendor:k8s.io/client-go/kubernetes", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/extensions/v1beta1", diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 01f2eb4a4ab..d1656789466 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -51,12 +51,12 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/authentication/serviceaccount" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/api/annotations" "k8s.io/kubernetes/pkg/api/v1" rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" - genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/kubectl/cmd/util" uexec "k8s.io/kubernetes/pkg/util/exec" utilversion "k8s.io/kubernetes/pkg/util/version" diff --git a/test/integration/auth/rbac_test.go b/test/integration/auth/rbac_test.go index 89832dc7b32..f50d8669d92 100644 --- a/test/integration/auth/rbac_test.go +++ b/test/integration/auth/rbac_test.go @@ -36,6 +36,7 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/request/bearertoken" "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/plugin/pkg/authenticator/token/anytoken" restclient "k8s.io/client-go/rest" "k8s.io/client-go/transport" @@ -43,7 +44,6 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" rbacapi "k8s.io/kubernetes/pkg/apis/rbac" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage" diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index 42eb0f832ac..02fc610a8b2 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -33,7 +33,6 @@ go_library( "//pkg/controller:go_default_library", "//pkg/controller/replication:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver/server:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master:go_default_library", @@ -59,6 +58,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", "//vendor:k8s.io/apiserver/pkg/authorization/union", + "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/record", diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index e14e1af7e5a..dcb11096f9f 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -39,6 +39,7 @@ import ( authauthorizer "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/authorization/authorizerfactory" authorizerunion "k8s.io/apiserver/pkg/authorization/union" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/storage/storagebackend" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/record" @@ -59,7 +60,6 @@ import ( "k8s.io/kubernetes/pkg/controller" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/pkg/generated/openapi" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/kubectl" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master" diff --git a/test/integration/openshift/BUILD b/test/integration/openshift/BUILD index 3580c54528e..4a3a7c546b2 100644 --- a/test/integration/openshift/BUILD +++ b/test/integration/openshift/BUILD @@ -12,8 +12,8 @@ go_test( srcs = ["openshift_test.go"], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/server:go_default_library", "//pkg/master:go_default_library", + "//vendor:k8s.io/apiserver/pkg/server", ], ) diff --git a/test/integration/openshift/openshift_test.go b/test/integration/openshift/openshift_test.go index 0502889baad..a29b1a55b16 100644 --- a/test/integration/openshift/openshift_test.go +++ b/test/integration/openshift/openshift_test.go @@ -19,7 +19,7 @@ package openshift import ( "testing" - genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" + genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/kubernetes/pkg/master" ) diff --git a/test/test_owners.csv b/test/test_owners.csv index 2450e3ae341..8affa6fe655 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -682,17 +682,17 @@ k8s.io/kubernetes/pkg/credentialprovider/azure,brendandburns,0 k8s.io/kubernetes/pkg/credentialprovider/gcp,mml,1 k8s.io/kubernetes/pkg/fieldpath,childsb,1 k8s.io/kubernetes/pkg/fields,jsafrane,1 -k8s.io/kubernetes/pkg/genericapiserver/server,nikhiljindal,0 -k8s.io/kubernetes/pkg/genericapiserver/endpoints,nikhiljindal,0 -k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters,dchen1107,1 -k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers,rkouj,0 -k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/negotiation,rkouj,0 -k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters,rkouj,0 -k8s.io/kubernetes/pkg/genericapiserver/endpoints/request,lavalamp,1 -k8s.io/kubernetes/pkg/genericapiserver/authorizer,lavalamp,1 -k8s.io/kubernetes/pkg/genericapiserver/server/filters,dchen1107,1 -k8s.io/kubernetes/pkg/genericapiserver/server/mux,spxtr,1 -k8s.io/kubernetes/pkg/genericapiserver/server/openapi,davidopp,1 +k8s.io/apiserver/pkg/server,nikhiljindal,0 +k8s.io/apiserver/pkg/endpoints,nikhiljindal,0 +k8s.io/apiserver/pkg/endpoints/filters,dchen1107,1 +k8s.io/apiserver/pkg/endpoints/handlers,rkouj,0 +k8s.io/apiserver/pkg/endpoints/handlers/negotiation,rkouj,0 +k8s.io/apiserver/pkg/endpoints/handlers/responsewriters,rkouj,0 +k8s.io/apiserver/pkg/endpoints/request,lavalamp,1 +k8s.io/apiserver/pkg/authorizer,lavalamp,1 +k8s.io/apiserver/pkg/server/filters,dchen1107,1 +k8s.io/apiserver/pkg/server/mux,spxtr,1 +k8s.io/apiserver/pkg/server/openapi,davidopp,1 k8s.io/kubernetes/pkg/httplog,mtaufen,1 k8s.io/kubernetes/pkg/kubeapiserver/admission,rkouj,0 k8s.io/kubernetes/pkg/kubeapiserver/authorizer,rkouj,0 @@ -847,11 +847,11 @@ k8s.io/kubernetes/pkg/security/podsecuritypolicy/util,erictune,0 k8s.io/kubernetes/pkg/securitycontext,erictune,1 k8s.io/kubernetes/pkg/serviceaccount,liggitt,0 k8s.io/kubernetes/pkg/ssh,jbeda,1 -k8s.io/kubernetes/pkg/storage,xiang90,0 -k8s.io/kubernetes/pkg/storage/etcd,eparis,1 -k8s.io/kubernetes/pkg/storage/etcd/util,xiang90,0 -k8s.io/kubernetes/pkg/storage/etcd3,xiang90,0 -k8s.io/kubernetes/pkg/storage/storagebackend/factory,maisem,1 +k8s.io/apiserver/pkg/storage,xiang90,0 +k8s.io/apiserver/pkg/storage/etcd,eparis,1 +k8s.io/apiserver/pkg/storage/etcd/util,xiang90,0 +k8s.io/apiserver/pkg/storage/etcd3,xiang90,0 +k8s.io/apiserver/pkg/storage/storagebackend/factory,maisem,1 k8s.io/kubernetes/pkg/util,jbeda,1 k8s.io/kubernetes/pkg/util/async,spxtr,1 k8s.io/kubernetes/pkg/util/bandwidth,thockin,1 diff --git a/vendor/BUILD b/vendor/BUILD index 6bd0232ccf4..8c84fa19ab0 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -9036,8 +9036,64 @@ go_test( go_library( name = "k8s.io/apiserver/pkg/server", - srcs = ["k8s.io/apiserver/pkg/server/doc.go"], + srcs = [ + "k8s.io/apiserver/pkg/server/config.go", + "k8s.io/apiserver/pkg/server/config_selfclient.go", + "k8s.io/apiserver/pkg/server/discovery.go", + "k8s.io/apiserver/pkg/server/doc.go", + "k8s.io/apiserver/pkg/server/genericapiserver.go", + "k8s.io/apiserver/pkg/server/healthz.go", + "k8s.io/apiserver/pkg/server/hooks.go", + "k8s.io/apiserver/pkg/server/resource_config.go", + "k8s.io/apiserver/pkg/server/resource_encoding_config.go", + "k8s.io/apiserver/pkg/server/serve.go", + "k8s.io/apiserver/pkg/server/storage_factory.go", + ], tags = ["automanaged"], + deps = [ + "//vendor:github.com/coreos/go-systemd/daemon", + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/emicklei/go-restful/swagger", + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/golang/glog", + "//vendor:github.com/pborman/uuid", + "//vendor:github.com/pkg/errors", + "//vendor:gopkg.in/natefinch/lumberjack.v2", + "//vendor:k8s.io/apimachinery/pkg/apimachinery", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/openapi", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/recognizer", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/validation", + "//vendor:k8s.io/apimachinery/pkg/version", + "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticatorfactory", + "//vendor:k8s.io/apiserver/pkg/authentication/request/union", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", + "//vendor:k8s.io/apiserver/pkg/authorization/union", + "//vendor:k8s.io/apiserver/pkg/endpoints", + "//vendor:k8s.io/apiserver/pkg/endpoints/filters", + "//vendor:k8s.io/apiserver/pkg/endpoints/openapi", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server/filters", + "//vendor:k8s.io/apiserver/pkg/server/healthz", + "//vendor:k8s.io/apiserver/pkg/server/mux", + "//vendor:k8s.io/apiserver/pkg/server/options", + "//vendor:k8s.io/apiserver/pkg/server/routes", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/util/cert", + ], ) go_test( @@ -13597,10 +13653,10 @@ go_test( library = ":k8s.io/apiserver/pkg/server/filters", tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/endpoints/filters:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apiserver/pkg/endpoints/filters", "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -14216,3 +14272,902 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", ], ) + +go_test( + name = "k8s.io/apiserver/pkg/endpoints_test", + srcs = [ + "k8s.io/apiserver/pkg/endpoints/apiserver_test.go", + "k8s.io/apiserver/pkg/endpoints/installer_test.go", + "k8s.io/apiserver/pkg/endpoints/proxy_test.go", + "k8s.io/apiserver/pkg/endpoints/watch_test.go", + ], + library = ":k8s.io/apiserver/pkg/endpoints", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//plugin/pkg/admission/admit:go_default_library", + "//plugin/pkg/admission/deny:go_default_library", + "//vendor:github.com/emicklei/go-restful", + "//vendor:golang.org/x/net/websocket", + "//vendor:k8s.io/apimachinery/pkg/api/equality", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/api/testing", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming", + "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/apis/example", + "//vendor:k8s.io/apiserver/pkg/apis/example/fuzzer", + "//vendor:k8s.io/apiserver/pkg/apis/example/v1", + "//vendor:k8s.io/apiserver/pkg/endpoints/filters", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/endpoints/testing", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/endpoints", + srcs = [ + "k8s.io/apiserver/pkg/endpoints/apiserver.go", + "k8s.io/apiserver/pkg/endpoints/discovery.go", + "k8s.io/apiserver/pkg/endpoints/doc.go", + "k8s.io/apiserver/pkg/endpoints/groupversion.go", + "k8s.io/apiserver/pkg/endpoints/installer.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/emicklei/go-restful", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/conversion", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/endpoints/filters_test", + srcs = [ + "k8s.io/apiserver/pkg/endpoints/filters/audit_test.go", + "k8s.io/apiserver/pkg/endpoints/filters/authentication_test.go", + "k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go", + "k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go", + "k8s.io/apiserver/pkg/endpoints/filters/requestinfo_test.go", + ], + library = ":k8s.io/apiserver/pkg/endpoints/filters", + tags = ["automanaged"], + deps = [ + "//pkg/apis/batch:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/client-go/pkg/apis/authentication", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/endpoints/filters", + srcs = [ + "k8s.io/apiserver/pkg/endpoints/filters/audit.go", + "k8s.io/apiserver/pkg/endpoints/filters/authentication.go", + "k8s.io/apiserver/pkg/endpoints/filters/authorization.go", + "k8s.io/apiserver/pkg/endpoints/filters/doc.go", + "k8s.io/apiserver/pkg/endpoints/filters/impersonation.go", + "k8s.io/apiserver/pkg/endpoints/filters/requestinfo.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:github.com/pborman/uuid", + "//vendor:github.com/prometheus/client_golang/prometheus", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", + "//vendor:k8s.io/apiserver/pkg/authentication/serviceaccount", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/server/httplog", + "//vendor:k8s.io/client-go/pkg/api", + "//vendor:k8s.io/client-go/pkg/apis/authentication", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/endpoints/handlers_test", + srcs = ["k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go"], + library = ":k8s.io/apiserver/pkg/endpoints/handlers", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/testapi:go_default_library", + "//pkg/api/v1:go_default_library", + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/evanphx/json-patch", + "//vendor:k8s.io/apimachinery/pkg/api/equality", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/endpoints/handlers", + srcs = [ + "k8s.io/apiserver/pkg/endpoints/handlers/discovery.go", + "k8s.io/apiserver/pkg/endpoints/handlers/doc.go", + "k8s.io/apiserver/pkg/endpoints/handlers/patch.go", + "k8s.io/apiserver/pkg/endpoints/handlers/proxy.go", + "k8s.io/apiserver/pkg/endpoints/handlers/rest.go", + "k8s.io/apiserver/pkg/endpoints/handlers/watch.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/evanphx/json-patch", + "//vendor:github.com/golang/glog", + "//vendor:golang.org/x/net/websocket", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server/httplog", + "//vendor:k8s.io/apiserver/pkg/util/proxy", + "//vendor:k8s.io/apiserver/pkg/util/trace", + "//vendor:k8s.io/apiserver/pkg/util/wsstream", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters_test", + srcs = ["k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/status_test.go"], + library = ":k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + srcs = [ + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/doc.go", + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/errors.go", + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/status.go", + "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/util/flushwriter", + "//vendor:k8s.io/apiserver/pkg/util/wsstream", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/endpoints/openapi_test", + srcs = ["k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go"], + library = ":k8s.io/apiserver/pkg/endpoints/openapi", + tags = ["automanaged"], + deps = [ + "//vendor:github.com/go-openapi/spec", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/endpoints/openapi", + srcs = ["k8s.io/apiserver/pkg/endpoints/openapi/openapi.go"], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/go-openapi/spec", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/util/trie", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/endpoints/testing", + srcs = [ + "k8s.io/apiserver/pkg/endpoints/testing/types.generated.go", + "k8s.io/apiserver/pkg/endpoints/testing/types.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/ugorji/go/codec", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/types", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/registry", + srcs = ["k8s.io/apiserver/pkg/registry/doc.go"], + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apiserver/pkg/registry/generic", + srcs = [ + "k8s.io/apiserver/pkg/registry/generic/doc.go", + "k8s.io/apiserver/pkg/registry/generic/matcher.go", + "k8s.io/apiserver/pkg/registry/generic/options.go", + "k8s.io/apiserver/pkg/registry/generic/storage_decorator.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend/factory", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/registry/generic/registry_test", + srcs = [ + "k8s.io/apiserver/pkg/registry/generic/registry/decorated_watcher_test.go", + "k8s.io/apiserver/pkg/registry/generic/registry/store_test.go", + ], + library = ":k8s.io/apiserver/pkg/registry/generic/registry", + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/equality", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/api/testing", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apimachinery/pkg/selection", + "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/apis/example", + "//vendor:k8s.io/apiserver/pkg/apis/example/v1", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/etcd", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", + "//vendor:k8s.io/apiserver/pkg/storage/names", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend/factory", + "//vendor:k8s.io/apiserver/pkg/storage/testing", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/registry/generic/registry", + srcs = [ + "k8s.io/apiserver/pkg/registry/generic/registry/decorated_watcher.go", + "k8s.io/apiserver/pkg/registry/generic/registry/doc.go", + "k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go", + "k8s.io/apiserver/pkg/registry/generic/registry/store.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/generic", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/errors", + "//vendor:k8s.io/apiserver/pkg/storage/etcd", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend/factory", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/registry/generic/rest_test", + srcs = [ + "k8s.io/apiserver/pkg/registry/generic/rest/proxy_test.go", + "k8s.io/apiserver/pkg/registry/generic/rest/response_checker_test.go", + "k8s.io/apiserver/pkg/registry/generic/rest/streamer_test.go", + ], + library = ":k8s.io/apiserver/pkg/registry/generic/rest", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//vendor:github.com/stretchr/testify/assert", + "//vendor:github.com/stretchr/testify/require", + "//vendor:golang.org/x/net/websocket", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apiserver/pkg/features", + "//vendor:k8s.io/apiserver/pkg/util/feature", + "//vendor:k8s.io/apiserver/pkg/util/proxy", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/registry/generic/rest", + srcs = [ + "k8s.io/apiserver/pkg/registry/generic/rest/doc.go", + "k8s.io/apiserver/pkg/registry/generic/rest/proxy.go", + "k8s.io/apiserver/pkg/registry/generic/rest/response_checker.go", + "k8s.io/apiserver/pkg/registry/generic/rest/streamer.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:github.com/mxk/go-flowrate/flowrate", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apiserver/pkg/features", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/util/feature", + "//vendor:k8s.io/apiserver/pkg/util/proxy", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/registry/rest_test", + srcs = ["k8s.io/apiserver/pkg/registry/rest/meta_test.go"], + library = ":k8s.io/apiserver/pkg/registry/rest", + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", + "//vendor:k8s.io/apiserver/pkg/apis/example", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/registry/rest", + srcs = [ + "k8s.io/apiserver/pkg/registry/rest/create.go", + "k8s.io/apiserver/pkg/registry/rest/delete.go", + "k8s.io/apiserver/pkg/registry/rest/doc.go", + "k8s.io/apiserver/pkg/registry/rest/export.go", + "k8s.io/apiserver/pkg/registry/rest/meta.go", + "k8s.io/apiserver/pkg/registry/rest/rest.go", + "k8s.io/apiserver/pkg/registry/rest/update.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/api/validation", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", + "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/storage/names", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/registry/rest/resttest", + srcs = ["k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/equality", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/conversion", + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/server_test", + srcs = [ + "k8s.io/apiserver/pkg/server/genericapiserver_test.go", + "k8s.io/apiserver/pkg/server/resource_config_test.go", + "k8s.io/apiserver/pkg/server/serve_test.go", + "k8s.io/apiserver/pkg/server/storage_factory_test.go", + ], + library = ":k8s.io/apiserver/pkg/server", + tags = ["automanaged"], + deps = [ + "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/generated/openapi:go_default_library", + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/stretchr/testify/assert", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/apimachinery", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/version", + "//vendor:k8s.io/apiserver/pkg/apis/example", + "//vendor:k8s.io/apiserver/pkg/apis/example/install", + "//vendor:k8s.io/apiserver/pkg/apis/example/v1", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/registry/rest", + "//vendor:k8s.io/apiserver/pkg/server/options", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + "//vendor:k8s.io/apiserver/pkg/util/flag", + "//vendor:k8s.io/client-go/pkg/api", + "//vendor:k8s.io/client-go/util/cert", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/server/mux_test", + srcs = ["k8s.io/apiserver/pkg/server/mux/container_test.go"], + library = ":k8s.io/apiserver/pkg/server/mux", + tags = ["automanaged"], + deps = ["//vendor:github.com/stretchr/testify/assert"], +) + +go_library( + name = "k8s.io/apiserver/pkg/server/mux", + srcs = [ + "k8s.io/apiserver/pkg/server/mux/container.go", + "k8s.io/apiserver/pkg/server/mux/doc.go", + "k8s.io/apiserver/pkg/server/mux/pathrecorder.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/server/openapi_test", + srcs = ["k8s.io/apiserver/pkg/server/openapi/openapi_test.go"], + library = ":k8s.io/apiserver/pkg/server/openapi", + tags = ["automanaged"], + deps = [ + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/stretchr/testify/assert", + "//vendor:k8s.io/apimachinery/pkg/openapi", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/server/openapi", + srcs = [ + "k8s.io/apiserver/pkg/server/openapi/doc.go", + "k8s.io/apiserver/pkg/server/openapi/openapi.go", + "k8s.io/apiserver/pkg/server/openapi/util.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/go-openapi/spec", + "//vendor:k8s.io/apimachinery/pkg/openapi", + "//vendor:k8s.io/apimachinery/pkg/util/json", + "//vendor:k8s.io/apiserver/pkg/server/mux", + "//vendor:k8s.io/apiserver/pkg/util/trie", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/server/routes", + srcs = [ + "k8s.io/apiserver/pkg/server/routes/doc.go", + "k8s.io/apiserver/pkg/server/routes/index.go", + "k8s.io/apiserver/pkg/server/routes/metrics.go", + "k8s.io/apiserver/pkg/server/routes/openapi.go", + "k8s.io/apiserver/pkg/server/routes/profiling.go", + "k8s.io/apiserver/pkg/server/routes/swagger.go", + "k8s.io/apiserver/pkg/server/routes/swaggerui.go", + "k8s.io/apiserver/pkg/server/routes/version.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/elazarl/go-bindata-assetfs", + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/emicklei/go-restful/swagger", + "//vendor:github.com/golang/glog", + "//vendor:github.com/prometheus/client_golang/prometheus", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/openapi", + "//vendor:k8s.io/apimachinery/pkg/version", + "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", + "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", + "//vendor:k8s.io/apiserver/pkg/server/mux", + "//vendor:k8s.io/apiserver/pkg/server/openapi", + "//vendor:k8s.io/apiserver/pkg/server/routes/data/swagger", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/errors", + srcs = [ + "k8s.io/apiserver/pkg/storage/errors/doc.go", + "k8s.io/apiserver/pkg/storage/errors/storage.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/storage", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/storage/etcd_test", + srcs = [ + "k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go", + "k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go", + "k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go", + ], + library = ":k8s.io/apiserver/pkg/storage/etcd", + tags = ["automanaged"], + deps = [ + "//vendor:github.com/coreos/etcd/client", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/api/equality", + "//vendor:k8s.io/apimachinery/pkg/api/testing", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/conversion", + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/apis/example", + "//vendor:k8s.io/apiserver/pkg/apis/example/v1", + "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/etcdtest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", + "//vendor:k8s.io/apiserver/pkg/storage/testing", + "//vendor:k8s.io/apiserver/pkg/storage/tests", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/etcd", + srcs = [ + "k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go", + "k8s.io/apiserver/pkg/storage/etcd/doc.go", + "k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go", + "k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/coreos/etcd/client", + "//vendor:github.com/golang/glog", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/conversion", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/util", + "//vendor:k8s.io/apiserver/pkg/util/cache", + "//vendor:k8s.io/apiserver/pkg/util/trace", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/etcd/etcdtest", + srcs = [ + "k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go", + "k8s.io/apiserver/pkg/storage/etcd/etcdtest/etcdtest.go", + ], + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/etcd/testing", + srcs = ["k8s.io/apiserver/pkg/storage/etcd/testing/utils.go"], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/coreos/etcd/client", + "//vendor:github.com/coreos/etcd/clientv3", + "//vendor:github.com/coreos/etcd/etcdserver", + "//vendor:github.com/coreos/etcd/etcdserver/api/v2http", + "//vendor:github.com/coreos/etcd/integration", + "//vendor:github.com/coreos/etcd/pkg/testutil", + "//vendor:github.com/coreos/etcd/pkg/transport", + "//vendor:github.com/coreos/etcd/pkg/types", + "//vendor:github.com/golang/glog", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/etcdtest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing/testingcert", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/etcd/testing/testingcert", + srcs = ["k8s.io/apiserver/pkg/storage/etcd/testing/testingcert/certificates.go"], + tags = ["automanaged"], +) + +go_test( + name = "k8s.io/apiserver/pkg/storage/etcd/util_test", + srcs = ["k8s.io/apiserver/pkg/storage/etcd/util/etcd_util_test.go"], + library = ":k8s.io/apiserver/pkg/storage/etcd/util", + tags = ["automanaged"], + deps = [ + "//vendor:github.com/coreos/etcd/client", + "//vendor:github.com/stretchr/testify/assert", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/etcd/util", + srcs = [ + "k8s.io/apiserver/pkg/storage/etcd/util/doc.go", + "k8s.io/apiserver/pkg/storage/etcd/util/etcd_util.go", + ], + tags = ["automanaged"], + deps = ["//vendor:github.com/coreos/etcd/client"], +) + +go_test( + name = "k8s.io/apiserver/pkg/storage/etcd3_test", + srcs = [ + "k8s.io/apiserver/pkg/storage/etcd3/compact_test.go", + "k8s.io/apiserver/pkg/storage/etcd3/store_test.go", + "k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go", + ], + library = ":k8s.io/apiserver/pkg/storage/etcd3", + tags = ["automanaged"], + deps = [ + "//vendor:github.com/coreos/etcd/clientv3", + "//vendor:github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes", + "//vendor:github.com/coreos/etcd/integration", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/api/testing", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/apis/example", + "//vendor:k8s.io/apiserver/pkg/apis/example/v1", + "//vendor:k8s.io/apiserver/pkg/storage", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/etcd3", + srcs = [ + "k8s.io/apiserver/pkg/storage/etcd3/compact.go", + "k8s.io/apiserver/pkg/storage/etcd3/event.go", + "k8s.io/apiserver/pkg/storage/etcd3/store.go", + "k8s.io/apiserver/pkg/storage/etcd3/watcher.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/coreos/etcd/clientv3", + "//vendor:github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes", + "//vendor:github.com/coreos/etcd/mvcc/mvccpb", + "//vendor:github.com/golang/glog", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/conversion", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/etcd", + "//vendor:k8s.io/apiserver/pkg/util/trace", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/storage/storagebackend/factory_test", + srcs = ["k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go"], + library = ":k8s.io/apiserver/pkg/storage/storagebackend/factory", + tags = ["automanaged"], + deps = [ + "//vendor:github.com/coreos/etcd/integration", + "//vendor:github.com/coreos/etcd/pkg/transport", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/api/testing", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apiserver/pkg/apis/example", + "//vendor:k8s.io/apiserver/pkg/apis/example/v1", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing/testingcert", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/storagebackend/factory", + srcs = [ + "k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go", + "k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go", + "k8s.io/apiserver/pkg/storage/storagebackend/factory/factory.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/coreos/etcd/client", + "//vendor:github.com/coreos/etcd/clientv3", + "//vendor:github.com/coreos/etcd/pkg/transport", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/etcd", + "//vendor:k8s.io/apiserver/pkg/storage/etcd3", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/testing", + srcs = [ + "k8s.io/apiserver/pkg/storage/testing/types.generated.go", + "k8s.io/apiserver/pkg/storage/testing/types.go", + "k8s.io/apiserver/pkg/storage/testing/utils.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/ugorji/go/codec", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apiserver/pkg/storage", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/storage/tests_test", + srcs = ["k8s.io/apiserver/pkg/storage/tests/cacher_test.go"], + library = ":k8s.io/apiserver/pkg/storage/tests", + tags = ["automanaged"], + deps = [ + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/api/equality", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/api/testing", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/fields", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/apis/example", + "//vendor:k8s.io/apiserver/pkg/apis/example/v1", + "//vendor:k8s.io/apiserver/pkg/storage", + "//vendor:k8s.io/apiserver/pkg/storage/etcd", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/etcdtest", + "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", + "//vendor:k8s.io/apiserver/pkg/storage/etcd3", + "//vendor:k8s.io/client-go/pkg/api/install", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/storage/tests", + srcs = ["k8s.io/apiserver/pkg/storage/tests/utils.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apiserver/pkg/apis/example", + "//vendor:k8s.io/client-go/pkg/api/install", + ], +)