diff --git a/cmd/kube-aggregator/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD index 79732b8421..69137f87da 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/BUILD +++ b/cmd/kube-aggregator/pkg/cmd/server/BUILD @@ -22,13 +22,13 @@ go_library( "//pkg/genericapiserver/server:go_default_library", "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/storage/storagebackend: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/server/filters", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/cmd/server/start.go b/cmd/kube-aggregator/pkg/cmd/server/start.go index 7a3ab88aad..6b3211f341 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/start.go +++ b/cmd/kube-aggregator/pkg/cmd/server/start.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/server/filters" + "k8s.io/apiserver/pkg/storage/storagebackend" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/legacy" @@ -38,7 +39,6 @@ import ( genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/storage/storagebackend" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" ) diff --git a/examples/apiserver/BUILD b/examples/apiserver/BUILD index d0a41a91f6..27fb4b7c8e 100644 --- a/examples/apiserver/BUILD +++ b/examples/apiserver/BUILD @@ -21,11 +21,11 @@ go_library( "//pkg/genericapiserver/server:go_default_library", "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubeapiserver/options:go_default_library", - "//pkg/storage/storagebackend: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/storage/storagebackend", ], ) diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go index 7a0fbdf1b8..06c1aa30e4 100644 --- a/examples/apiserver/apiserver.go +++ b/examples/apiserver/apiserver.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/authorization/authorizerfactory" + "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" @@ -30,7 +31,6 @@ import ( genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" - "k8s.io/kubernetes/pkg/storage/storagebackend" // Install the testgroup API _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/install" diff --git a/pkg/controller/serviceaccount/BUILD b/pkg/controller/serviceaccount/BUILD index fab47a95b6..3462b81d2a 100644 --- a/pkg/controller/serviceaccount/BUILD +++ b/pkg/controller/serviceaccount/BUILD @@ -30,7 +30,6 @@ go_library( "//pkg/registry/core/serviceaccount:go_default_library", "//pkg/registry/core/serviceaccount/storage:go_default_library", "//pkg/serviceaccount:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//pkg/util/metrics:go_default_library", "//pkg/util/workqueue:go_default_library", "//vendor:github.com/golang/glog", @@ -46,6 +45,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/storage/storagebackend", "//vendor:k8s.io/client-go/tools/cache", ], ) diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index 4b694e7103..b42ed29f36 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -19,6 +19,7 @@ package serviceaccount import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "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" @@ -27,7 +28,6 @@ import ( serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount" serviceaccountstore "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage" "k8s.io/kubernetes/pkg/serviceaccount" - "k8s.io/kubernetes/pkg/storage/storagebackend" ) // clientGetter implements ServiceAccountTokenGetter using a clientset.Interface diff --git a/pkg/genericapiserver/registry/generic/BUILD b/pkg/genericapiserver/registry/generic/BUILD index e452fa620a..1128b61031 100644 --- a/pkg/genericapiserver/registry/generic/BUILD +++ b/pkg/genericapiserver/registry/generic/BUILD @@ -18,13 +18,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/storage:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//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/storagebackend", ], ) diff --git a/pkg/genericapiserver/registry/generic/options.go b/pkg/genericapiserver/registry/generic/options.go index d3bec0e0d4..7f8e6f6106 100644 --- a/pkg/genericapiserver/registry/generic/options.go +++ b/pkg/genericapiserver/registry/generic/options.go @@ -18,8 +18,8 @@ package generic import ( "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/storage" - "k8s.io/kubernetes/pkg/storage/storagebackend" ) // RESTOptions is set of configuration options to generic registries. diff --git a/pkg/genericapiserver/registry/generic/registry/BUILD b/pkg/genericapiserver/registry/generic/registry/BUILD index 6762727aea..8249668f23 100644 --- a/pkg/genericapiserver/registry/generic/registry/BUILD +++ b/pkg/genericapiserver/registry/generic/registry/BUILD @@ -25,7 +25,6 @@ go_library( "//pkg/registry/cachesize:go_default_library", "//pkg/storage:go_default_library", "//pkg/storage/etcd:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//pkg/storage/storagebackend/factory:go_default_library", "//vendor:github.com/golang/glog", "//vendor:golang.org/x/net/context", @@ -42,6 +41,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/storage/storagebackend", ], ) diff --git a/pkg/genericapiserver/registry/generic/registry/storage_factory.go b/pkg/genericapiserver/registry/generic/registry/storage_factory.go index 5d7a62bff7..ac3e9a6e86 100644 --- a/pkg/genericapiserver/registry/generic/registry/storage_factory.go +++ b/pkg/genericapiserver/registry/generic/registry/storage_factory.go @@ -18,10 +18,10 @@ package registry import ( "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/storage" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - "k8s.io/kubernetes/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/storage/storagebackend/factory" ) diff --git a/pkg/genericapiserver/registry/generic/storage_decorator.go b/pkg/genericapiserver/registry/generic/storage_decorator.go index bf3530c566..f3a3a911bd 100644 --- a/pkg/genericapiserver/registry/generic/storage_decorator.go +++ b/pkg/genericapiserver/registry/generic/storage_decorator.go @@ -19,8 +19,8 @@ package generic import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/storage" - "k8s.io/kubernetes/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/storage/storagebackend/factory" ) diff --git a/pkg/genericapiserver/server/BUILD b/pkg/genericapiserver/server/BUILD index fa3637720e..7e20cd26d0 100644 --- a/pkg/genericapiserver/server/BUILD +++ b/pkg/genericapiserver/server/BUILD @@ -30,7 +30,6 @@ go_test( "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/genericapiserver/server/options:go_default_library", "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/go-openapi/spec", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/api/meta", @@ -44,6 +43,7 @@ go_test( "//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/storage/storagebackend", "//vendor:k8s.io/apiserver/pkg/util/flag", "//vendor:k8s.io/client-go/util/cert", ], @@ -74,7 +74,6 @@ go_library( "//pkg/genericapiserver/server/mux:go_default_library", "//pkg/genericapiserver/server/options:go_default_library", "//pkg/genericapiserver/server/routes:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/coreos/go-systemd/daemon", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/emicklei/go-restful/swagger", @@ -105,6 +104,7 @@ go_library( "//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/storage/storagebackend", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/util/cert", ], diff --git a/pkg/genericapiserver/server/options/BUILD b/pkg/genericapiserver/server/options/BUILD index 0b2cb979d3..91351010d6 100644 --- a/pkg/genericapiserver/server/options/BUILD +++ b/pkg/genericapiserver/server/options/BUILD @@ -20,7 +20,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/spf13/pflag", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -29,6 +28,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/admission", "//vendor:k8s.io/apiserver/pkg/authentication/authenticatorfactory", "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/apiserver/pkg/util/feature", "//vendor:k8s.io/apiserver/pkg/util/flag", "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", diff --git a/pkg/genericapiserver/server/options/etcd.go b/pkg/genericapiserver/server/options/etcd.go index 15414cdf3d..4cbdbece05 100644 --- a/pkg/genericapiserver/server/options/etcd.go +++ b/pkg/genericapiserver/server/options/etcd.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/pflag" - "k8s.io/kubernetes/pkg/storage/storagebackend" + "k8s.io/apiserver/pkg/storage/storagebackend" ) const ( diff --git a/pkg/genericapiserver/server/storage_factory.go b/pkg/genericapiserver/server/storage_factory.go index 5b8332c883..f3a9e319d8 100644 --- a/pkg/genericapiserver/server/storage_factory.go +++ b/pkg/genericapiserver/server/storage_factory.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer/recognizer" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/storage/storagebackend" + "k8s.io/apiserver/pkg/storage/storagebackend" "github.com/golang/glog" ) diff --git a/pkg/genericapiserver/server/storage_factory_test.go b/pkg/genericapiserver/server/storage_factory_test.go index 614425884d..c2a95c1957 100644 --- a/pkg/genericapiserver/server/storage_factory_test.go +++ b/pkg/genericapiserver/server/storage_factory_test.go @@ -21,10 +21,10 @@ import ( "testing" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/server/options" - "k8s.io/kubernetes/pkg/storage/storagebackend" ) func TestUpdateEtcdOverrides(t *testing.T) { diff --git a/pkg/kubeapiserver/BUILD b/pkg/kubeapiserver/BUILD index 4ff856edae..928de503e9 100644 --- a/pkg/kubeapiserver/BUILD +++ b/pkg/kubeapiserver/BUILD @@ -18,9 +18,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/genericapiserver/server:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/apiserver/pkg/util/flag", ], ) diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index df26dba774..e78536e1c7 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" + "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" - "k8s.io/kubernetes/pkg/storage/storagebackend" ) // Builds the DefaultStorageFactory. diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index 6cea76968e..15aca9ba7d 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -22,13 +22,13 @@ go_library( "//pkg/registry/extensions/rest:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata/storage:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 6f8e06e95f..fa612ab663 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" genericapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints" @@ -38,7 +39,6 @@ import ( extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" thirdpartyresourcedatastore "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/storage" - "k8s.io/kubernetes/pkg/storage/storagebackend" ) // dynamicLister is used to list resources for dynamic third party diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index cbd7c9cf03..ef6f19ea33 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -14,8 +14,8 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/storage/storagebackend:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/pkg/registry/core/rest/storage_core_test.go b/pkg/registry/core/rest/storage_core_test.go index 42263c0cdc..348eb093d4 100644 --- a/pkg/registry/core/rest/storage_core_test.go +++ b/pkg/registry/core/rest/storage_core_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/storage/storagebackend" + "k8s.io/apiserver/pkg/storage/storagebackend" ) func TestGetServersToValidate(t *testing.T) { diff --git a/pkg/registry/core/service/allocator/storage/BUILD b/pkg/registry/core/service/allocator/storage/BUILD index 4362a93e00..65142f690c 100644 --- a/pkg/registry/core/service/allocator/storage/BUILD +++ b/pkg/registry/core/service/allocator/storage/BUILD @@ -18,8 +18,8 @@ go_test( "//pkg/registry/core/service/allocator:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) @@ -34,11 +34,11 @@ go_library( "//pkg/registry/core/rangeallocation:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", "//pkg/storage:go_default_library", - "//pkg/storage/storagebackend: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/storage/storagebackend", ], ) diff --git a/pkg/registry/core/service/allocator/storage/storage.go b/pkg/registry/core/service/allocator/storage/storage.go index eb488c07cf..8af50b30bb 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/storage/storagebackend" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" "k8s.io/kubernetes/pkg/registry/core/service/allocator" "k8s.io/kubernetes/pkg/storage" - "k8s.io/kubernetes/pkg/storage/storagebackend" "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 aa2718e9d8..5661ccd079 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" + "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" - "k8s.io/kubernetes/pkg/storage/storagebackend" "golang.org/x/net/context" ) diff --git a/pkg/registry/registrytest/BUILD b/pkg/registry/registrytest/BUILD index d52cd59ec7..362232fb29 100644 --- a/pkg/registry/registrytest/BUILD +++ b/pkg/registry/registrytest/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/genericapiserver/registry/rest/resttest:go_default_library", "//pkg/storage/etcd:go_default_library", "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//pkg/storage/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", @@ -35,6 +34,7 @@ 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/storage/storagebackend", ], ) diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index 50fb7d0303..4fd2f6f2f3 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -27,13 +27,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + "k8s.io/apiserver/pkg/storage/storagebackend" "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" - "k8s.io/kubernetes/pkg/storage/storagebackend" storagetesting "k8s.io/kubernetes/pkg/storage/testing" ) diff --git a/pkg/storage/BUILD b/pkg/storage/BUILD index a39a508689..8d8567ed17 100644 --- a/pkg/storage/BUILD +++ b/pkg/storage/BUILD @@ -111,7 +111,7 @@ filegroup( ":package-srcs", "//pkg/storage/etcd:all-srcs", "//pkg/storage/etcd3:all-srcs", - "//pkg/storage/storagebackend:all-srcs", + "//pkg/storage/storagebackend/factory:all-srcs", "//pkg/storage/testing:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/storage/etcd/testing/BUILD b/pkg/storage/etcd/testing/BUILD index 03c0cc7ab3..a83f943589 100644 --- a/pkg/storage/etcd/testing/BUILD +++ b/pkg/storage/etcd/testing/BUILD @@ -14,7 +14,6 @@ go_library( deps = [ "//pkg/storage/etcd/etcdtest:go_default_library", "//pkg/storage/etcd/testing/testingcert:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/coreos/etcd/client", "//vendor:github.com/coreos/etcd/clientv3", "//vendor:github.com/coreos/etcd/etcdserver", @@ -26,6 +25,7 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:golang.org/x/net/context", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/pkg/storage/etcd/testing/utils.go b/pkg/storage/etcd/testing/utils.go index 387c365062..68facc01e9 100644 --- a/pkg/storage/etcd/testing/utils.go +++ b/pkg/storage/etcd/testing/utils.go @@ -28,9 +28,9 @@ import ( "time" "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/kubernetes/pkg/storage/storagebackend" etcd "github.com/coreos/etcd/client" "github.com/coreos/etcd/clientv3" diff --git a/pkg/storage/storagebackend/BUILD b/pkg/storage/storagebackend/BUILD deleted file mode 100644 index 8da4ddcf4c..0000000000 --- a/pkg/storage/storagebackend/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 = ["config.go"], - tags = ["automanaged"], - deps = ["//vendor:k8s.io/apimachinery/pkg/runtime"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/storage/storagebackend/factory:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/storage/storagebackend/factory/BUILD b/pkg/storage/storagebackend/factory/BUILD index ce4050b686..d422a7e689 100644 --- a/pkg/storage/storagebackend/factory/BUILD +++ b/pkg/storage/storagebackend/factory/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/storage:go_default_library", "//pkg/storage/etcd:go_default_library", "//pkg/storage/etcd3:go_default_library", - "//pkg/storage/storagebackend: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/storagebackend", ], ) @@ -38,10 +38,10 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/storage/etcd/testing/testingcert:go_default_library", - "//pkg/storage/storagebackend: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/apiserver/pkg/storage/storagebackend", ], ) diff --git a/pkg/storage/storagebackend/factory/etcd2.go b/pkg/storage/storagebackend/factory/etcd2.go index e24dfbd192..44007d405b 100644 --- a/pkg/storage/storagebackend/factory/etcd2.go +++ b/pkg/storage/storagebackend/factory/etcd2.go @@ -25,9 +25,9 @@ import ( "github.com/coreos/etcd/pkg/transport" utilnet "k8s.io/apimachinery/pkg/util/net" + "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/storage/etcd" - "k8s.io/kubernetes/pkg/storage/storagebackend" ) func newETCD2Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) { diff --git a/pkg/storage/storagebackend/factory/etcd3.go b/pkg/storage/storagebackend/factory/etcd3.go index 5a69fdc2b1..a6916d1ec4 100644 --- a/pkg/storage/storagebackend/factory/etcd3.go +++ b/pkg/storage/storagebackend/factory/etcd3.go @@ -17,9 +17,9 @@ limitations under the License. package factory import ( + "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/storage/etcd3" - "k8s.io/kubernetes/pkg/storage/storagebackend" "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/pkg/transport" diff --git a/pkg/storage/storagebackend/factory/factory.go b/pkg/storage/storagebackend/factory/factory.go index d9a4911a24..4fc4e92794 100644 --- a/pkg/storage/storagebackend/factory/factory.go +++ b/pkg/storage/storagebackend/factory/factory.go @@ -19,8 +19,8 @@ package factory import ( "fmt" + "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/storage" - "k8s.io/kubernetes/pkg/storage/storagebackend" ) // DestroyFunc is to destroy any resources used by the storage returned in Create() together. diff --git a/pkg/storage/storagebackend/factory/tls_test.go b/pkg/storage/storagebackend/factory/tls_test.go index 23c76346c3..3ff1cd2bed 100644 --- a/pkg/storage/storagebackend/factory/tls_test.go +++ b/pkg/storage/storagebackend/factory/tls_test.go @@ -25,10 +25,10 @@ import ( "golang.org/x/net/context" + "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert" - "k8s.io/kubernetes/pkg/storage/storagebackend" "github.com/coreos/etcd/integration" "github.com/coreos/etcd/pkg/transport" diff --git a/pkg/storage/storagebackend/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/OWNERS similarity index 100% rename from pkg/storage/storagebackend/OWNERS rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/OWNERS diff --git a/pkg/storage/storagebackend/config.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go similarity index 100% rename from pkg/storage/storagebackend/config.go rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index 8053177f7c..1ff14a396a 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -39,7 +39,6 @@ go_library( "//pkg/kubectl:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master:go_default_library", - "//pkg/storage/storagebackend:go_default_library", "//pkg/util/env:go_default_library", "//pkg/version:go_default_library", "//plugin/pkg/admission/admit:go_default_library", @@ -61,6 +60,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/storage/storagebackend", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index ac84f890ec..4c0a1981b6 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" + "k8s.io/apiserver/pkg/storage/storagebackend" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" @@ -62,7 +63,6 @@ import ( "k8s.io/kubernetes/pkg/kubectl" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master" - "k8s.io/kubernetes/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/util/env" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/plugin/pkg/admission/admit" diff --git a/vendor/BUILD b/vendor/BUILD index d6b8190ac4..e91e09132f 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13814,3 +13814,10 @@ go_library( "//vendor:k8s.io/apiserver/pkg/server/httplog", ], ) + +go_library( + name = "k8s.io/apiserver/pkg/storage/storagebackend", + srcs = ["k8s.io/apiserver/pkg/storage/storagebackend/config.go"], + tags = ["automanaged"], + deps = ["//vendor:k8s.io/apimachinery/pkg/runtime"], +)