From c6fd6941a1052124f886a7e9aa807a0fcf50166f Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 26 Jan 2017 14:38:21 -0500 Subject: [PATCH 1/3] move pkg/api/validation/path to apimachinery --- .../pkg/apis/apiregistration/validation/BUILD | 2 +- .../apiregistration/validation/validation.go | 2 +- pkg/api/validation/BUILD | 1 - pkg/api/validation/path/BUILD | 35 ------------------- pkg/apis/autoscaling/validation/BUILD | 2 +- pkg/apis/autoscaling/validation/validation.go | 2 +- pkg/apis/rbac/validation/BUILD | 2 +- pkg/apis/rbac/validation/validation.go | 2 +- .../registry/generic/registry/BUILD | 2 +- .../registry/generic/registry/store.go | 2 +- pkg/genericapiserver/registry/rest/BUILD | 2 +- pkg/genericapiserver/registry/rest/create.go | 2 +- .../registry/rest/resttest/BUILD | 2 +- .../registry/rest/resttest/resttest.go | 2 +- pkg/storage/BUILD | 2 +- pkg/storage/util.go | 2 +- .../pkg}/api/validation/path/name.go | 0 .../pkg}/api/validation/path/name_test.go | 0 vendor/BUILD | 13 +++++++ 19 files changed, 27 insertions(+), 50 deletions(-) delete mode 100644 pkg/api/validation/path/BUILD rename {pkg => staging/src/k8s.io/apimachinery/pkg}/api/validation/path/name.go (100%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/api/validation/path/name_test.go (100%) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD index ee14ac9e415..b361b08642f 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD @@ -14,7 +14,7 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/api/validation/path:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go index a951eebe3c9..25fb483b575 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go @@ -19,10 +19,10 @@ package validation import ( "fmt" + "k8s.io/apimachinery/pkg/api/validation/path" utilvalidation "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/api/validation/path" discoveryapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" ) diff --git a/pkg/api/validation/BUILD b/pkg/api/validation/BUILD index 605c86fe53b..aefb6171ce5 100644 --- a/pkg/api/validation/BUILD +++ b/pkg/api/validation/BUILD @@ -100,7 +100,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/api/validation/genericvalidation:all-srcs", - "//pkg/api/validation/path:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/api/validation/path/BUILD b/pkg/api/validation/path/BUILD deleted file mode 100644 index bbdf6356fbe..00000000000 --- a/pkg/api/validation/path/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_test", -) - -go_library( - name = "go_default_library", - srcs = ["name.go"], - tags = ["automanaged"], -) - -go_test( - name = "go_default_test", - srcs = ["name_test.go"], - library = ":go_default_library", - 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/apis/autoscaling/validation/BUILD b/pkg/apis/autoscaling/validation/BUILD index ec72afaf8de..aad269da053 100644 --- a/pkg/apis/autoscaling/validation/BUILD +++ b/pkg/apis/autoscaling/validation/BUILD @@ -14,10 +14,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/validation:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/controller/podautoscaler:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) diff --git a/pkg/apis/autoscaling/validation/validation.go b/pkg/apis/autoscaling/validation/validation.go index 141bbddd5b1..526423aba7a 100644 --- a/pkg/apis/autoscaling/validation/validation.go +++ b/pkg/apis/autoscaling/validation/validation.go @@ -19,9 +19,9 @@ package validation import ( "encoding/json" + pathvalidation "k8s.io/apimachinery/pkg/api/validation/path" "k8s.io/apimachinery/pkg/util/validation/field" apivalidation "k8s.io/kubernetes/pkg/api/validation" - pathvalidation "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller/podautoscaler" diff --git a/pkg/apis/rbac/validation/BUILD b/pkg/apis/rbac/validation/BUILD index eeb39a6fc06..f55a59617d3 100644 --- a/pkg/apis/rbac/validation/BUILD +++ b/pkg/apis/rbac/validation/BUILD @@ -14,8 +14,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/validation:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/apis/rbac:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) diff --git a/pkg/apis/rbac/validation/validation.go b/pkg/apis/rbac/validation/validation.go index 948396c21d6..482511c5bb4 100644 --- a/pkg/apis/rbac/validation/validation.go +++ b/pkg/apis/rbac/validation/validation.go @@ -17,9 +17,9 @@ limitations under the License. package validation import ( + "k8s.io/apimachinery/pkg/api/validation/path" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/apis/rbac" ) diff --git a/pkg/genericapiserver/registry/generic/registry/BUILD b/pkg/genericapiserver/registry/generic/registry/BUILD index 7ed3d8a6ff6..6762727aeaf 100644 --- a/pkg/genericapiserver/registry/generic/registry/BUILD +++ b/pkg/genericapiserver/registry/generic/registry/BUILD @@ -20,7 +20,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", @@ -32,6 +31,7 @@ go_library( "//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", diff --git a/pkg/genericapiserver/registry/generic/registry/store.go b/pkg/genericapiserver/registry/generic/registry/store.go index 0e96c3f8401..67a174e3d3a 100644 --- a/pkg/genericapiserver/registry/generic/registry/store.go +++ b/pkg/genericapiserver/registry/generic/registry/store.go @@ -25,6 +25,7 @@ import ( kubeerr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/apimachinery/pkg/api/validation/path" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" @@ -37,7 +38,6 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" - "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" diff --git a/pkg/genericapiserver/registry/rest/BUILD b/pkg/genericapiserver/registry/rest/BUILD index 4626913c2bb..f63eabde2b8 100644 --- a/pkg/genericapiserver/registry/rest/BUILD +++ b/pkg/genericapiserver/registry/rest/BUILD @@ -23,9 +23,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation/genericvalidation:go_default_library", - "//pkg/api/validation/path:go_default_library", "//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/runtime", diff --git a/pkg/genericapiserver/registry/rest/create.go b/pkg/genericapiserver/registry/rest/create.go index f73621bd921..2dc7f20c669 100644 --- a/pkg/genericapiserver/registry/rest/create.go +++ b/pkg/genericapiserver/registry/rest/create.go @@ -18,6 +18,7 @@ package rest import ( "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/validation/path" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -25,7 +26,6 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api/validation/genericvalidation" - "k8s.io/kubernetes/pkg/api/validation/path" ) // RESTCreateStrategy defines the minimum validation, accepted input, and diff --git a/pkg/genericapiserver/registry/rest/resttest/BUILD b/pkg/genericapiserver/registry/rest/resttest/BUILD index bb32202c29c..c462770f832 100644 --- a/pkg/genericapiserver/registry/rest/resttest/BUILD +++ b/pkg/genericapiserver/registry/rest/resttest/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//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", diff --git a/pkg/genericapiserver/registry/rest/resttest/resttest.go b/pkg/genericapiserver/registry/rest/resttest/resttest.go index e99956e8b2f..86cfd0d4eee 100644 --- a/pkg/genericapiserver/registry/rest/resttest/resttest.go +++ b/pkg/genericapiserver/registry/rest/resttest/resttest.go @@ -24,6 +24,7 @@ import ( "time" "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/validation/path" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" @@ -34,7 +35,6 @@ import ( "k8s.io/apimachinery/pkg/util/wait" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) diff --git a/pkg/storage/BUILD b/pkg/storage/BUILD index e253284edd2..a39a5086895 100644 --- a/pkg/storage/BUILD +++ b/pkg/storage/BUILD @@ -23,12 +23,12 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/util: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/v1", "//vendor:k8s.io/apimachinery/pkg/conversion", "//vendor:k8s.io/apimachinery/pkg/fields", diff --git a/pkg/storage/util.go b/pkg/storage/util.go index 70dd1aed1fa..3e0b7211b95 100644 --- a/pkg/storage/util.go +++ b/pkg/storage/util.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/apimachinery/pkg/api/validation/path" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/kubernetes/pkg/api/validation/path" ) type SimpleUpdateFunc func(runtime.Object) (runtime.Object, error) diff --git a/pkg/api/validation/path/name.go b/staging/src/k8s.io/apimachinery/pkg/api/validation/path/name.go similarity index 100% rename from pkg/api/validation/path/name.go rename to staging/src/k8s.io/apimachinery/pkg/api/validation/path/name.go diff --git a/pkg/api/validation/path/name_test.go b/staging/src/k8s.io/apimachinery/pkg/api/validation/path/name_test.go similarity index 100% rename from pkg/api/validation/path/name_test.go rename to staging/src/k8s.io/apimachinery/pkg/api/validation/path/name_test.go diff --git a/vendor/BUILD b/vendor/BUILD index 2d19a2f0915..bcacc0e7f29 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13761,3 +13761,16 @@ go_library( "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", ], ) + +go_test( + name = "k8s.io/apimachinery/pkg/api/validation/path_test", + srcs = ["k8s.io/apimachinery/pkg/api/validation/path/name_test.go"], + library = ":k8s.io/apimachinery/pkg/api/validation/path", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apimachinery/pkg/api/validation/path", + srcs = ["k8s.io/apimachinery/pkg/api/validation/path/name.go"], + tags = ["automanaged"], +) From 9775269fb90ef3648cfe1e85f7d0009e54cb1fb5 Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 26 Jan 2017 14:39:54 -0500 Subject: [PATCH 2/3] move genericapiserver/server/filters to apiserver --- cmd/kube-aggregator/pkg/apiserver/BUILD | 2 +- .../pkg/apiserver/apiserver.go | 2 +- cmd/kube-aggregator/pkg/cmd/server/BUILD | 2 +- cmd/kube-aggregator/pkg/cmd/server/start.go | 2 +- cmd/kube-apiserver/app/BUILD | 2 +- cmd/kube-apiserver/app/server.go | 2 +- federation/cmd/federation-apiserver/app/BUILD | 2 +- .../cmd/federation-apiserver/app/server.go | 2 +- hack/.linted_packages | 2 +- pkg/genericapiserver/server/BUILD | 3 +- pkg/genericapiserver/server/config.go | 2 +- pkg/genericapiserver/server/filters/BUILD | 62 ------------------- .../apiserver/pkg}/server/filters/OWNERS | 0 .../apiserver/pkg}/server/filters/cors.go | 0 .../pkg}/server/filters/cors_test.go | 0 .../apiserver/pkg}/server/filters/doc.go | 2 +- .../pkg}/server/filters/longrunning.go | 0 .../pkg}/server/filters/maxinflight.go | 0 .../pkg}/server/filters/maxinflight_test.go | 0 .../apiserver/pkg}/server/filters/timeout.go | 0 .../pkg}/server/filters/timeout_test.go | 0 .../apiserver/pkg}/server/filters/wrap.go | 0 vendor/BUILD | 40 ++++++++++++ 23 files changed, 52 insertions(+), 75 deletions(-) delete mode 100644 pkg/genericapiserver/server/filters/BUILD rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/OWNERS (100%) rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/cors.go (100%) rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/cors_test.go (100%) rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/doc.go (89%) rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/longrunning.go (100%) rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/maxinflight.go (100%) rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/maxinflight_test.go (100%) rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/timeout.go (100%) rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/timeout_test.go (100%) rename {pkg/genericapiserver => staging/src/k8s.io/apiserver/pkg}/server/filters/wrap.go (100%) diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD index 90cacefa916..4bcb9fd3593 100644 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -61,7 +61,6 @@ go_library( "//pkg/genericapiserver/registry/generic/rest:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/genericapiserver/server:go_default_library", - "//pkg/genericapiserver/server/filters:go_default_library", "//pkg/util/httpstream/spdy:go_default_library", "//pkg/util/workqueue:go_default_library", "//pkg/version:go_default_library", @@ -73,6 +72,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/server/filters", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/transport", diff --git a/cmd/kube-aggregator/pkg/apiserver/apiserver.go b/cmd/kube-aggregator/pkg/apiserver/apiserver.go index c779e83bd23..c0da8ae52ec 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiserver.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiserver.go @@ -23,6 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericfilters "k8s.io/apiserver/pkg/server/filters" 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" @@ -30,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" - genericfilters "k8s.io/kubernetes/pkg/genericapiserver/server/filters" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" diff --git a/cmd/kube-aggregator/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD index f137ac892f5..79732b84213 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/BUILD +++ b/cmd/kube-aggregator/pkg/cmd/server/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/genericapiserver/server:go_default_library", - "//pkg/genericapiserver/server/filters:go_default_library", "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/storage/storagebackend:go_default_library", @@ -29,6 +28,7 @@ go_library( "//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/client-go/rest", ], ) diff --git a/cmd/kube-aggregator/pkg/cmd/server/start.go b/cmd/kube-aggregator/pkg/cmd/server/start.go index cd6cb15d2d2..7a3ab88aad5 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/start.go +++ b/cmd/kube-aggregator/pkg/cmd/server/start.go @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/apiserver/pkg/server/filters" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/legacy" @@ -35,7 +36,6 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" - "k8s.io/kubernetes/pkg/genericapiserver/server/filters" genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/storage/storagebackend" diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index 272d87b6d9e..e255e465aac 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -28,7 +28,6 @@ go_library( "//pkg/controller/serviceaccount:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/genericapiserver/server:go_default_library", - "//pkg/genericapiserver/server/filters:go_default_library", "//pkg/kubeapiserver:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//pkg/kubeapiserver/authenticator:go_default_library", @@ -65,6 +64,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/filters", ], ) diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 8ca36236209..96a4c12b830 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -41,6 +41,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/server/filters" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" @@ -53,7 +54,6 @@ import ( 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/genericapiserver/server/filters" "k8s.io/kubernetes/pkg/kubeapiserver" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" kubeauthenticator "k8s.io/kubernetes/pkg/kubeapiserver/authenticator" diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index f559adc5439..c1181936c13 100644 --- a/federation/cmd/federation-apiserver/app/BUILD +++ b/federation/cmd/federation-apiserver/app/BUILD @@ -43,7 +43,6 @@ go_library( "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/genericapiserver/server:go_default_library", - "//pkg/genericapiserver/server/filters:go_default_library", "//pkg/kubeapiserver:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", @@ -73,6 +72,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/filters", ], ) diff --git a/federation/cmd/federation-apiserver/app/server.go b/federation/cmd/federation-apiserver/app/server.go index 6fe05949a96..e63ecb81f77 100644 --- a/federation/cmd/federation-apiserver/app/server.go +++ b/federation/cmd/federation-apiserver/app/server.go @@ -34,6 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + "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" @@ -42,7 +43,6 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" - "k8s.io/kubernetes/pkg/genericapiserver/server/filters" "k8s.io/kubernetes/pkg/kubeapiserver" kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" "k8s.io/kubernetes/pkg/registry/cachesize" diff --git a/hack/.linted_packages b/hack/.linted_packages index 83b040c6941..adc79f5dfd0 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -161,7 +161,6 @@ pkg/genericapiserver pkg/genericapiserver/endpoints/handlers/responsewriters pkg/genericapiserver/endpoints/openapi pkg/genericapiserver/registry -pkg/genericapiserver/server/filters pkg/genericapiserver/server/mux pkg/genericapiserver/server/routes pkg/hyperkube @@ -283,6 +282,7 @@ staging/src/k8s.io/apiserver/pkg/authentication/request/x509 staging/src/k8s.io/apiserver/pkg/authorization/union staging/src/k8s.io/apiserver/pkg/endpoints/request staging/src/k8s.io/apiserver/pkg/server +staging/src/k8s.io/apiserver/pkg/server/filters staging/src/k8s.io/apiserver/pkg/storage/names staging/src/k8s.io/apiserver/pkg/util/flushwriter staging/src/k8s.io/apiserver/plugin/pkg/authenticator diff --git a/pkg/genericapiserver/server/BUILD b/pkg/genericapiserver/server/BUILD index f753367fd64..fa3637720ee 100644 --- a/pkg/genericapiserver/server/BUILD +++ b/pkg/genericapiserver/server/BUILD @@ -71,7 +71,6 @@ go_library( "//pkg/genericapiserver/endpoints/filters:go_default_library", "//pkg/genericapiserver/endpoints/openapi:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server/filters:go_default_library", "//pkg/genericapiserver/server/mux:go_default_library", "//pkg/genericapiserver/server/options:go_default_library", "//pkg/genericapiserver/server/routes:go_default_library", @@ -104,6 +103,7 @@ go_library( "//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/client-go/rest", "//vendor:k8s.io/client-go/util/cert", @@ -121,7 +121,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/genericapiserver/server/filters:all-srcs", "//pkg/genericapiserver/server/mux:all-srcs", "//pkg/genericapiserver/server/openapi:all-srcs", "//pkg/genericapiserver/server/options:all-srcs", diff --git a/pkg/genericapiserver/server/config.go b/pkg/genericapiserver/server/config.go index 683c1cd698f..27dbaf1624f 100644 --- a/pkg/genericapiserver/server/config.go +++ b/pkg/genericapiserver/server/config.go @@ -50,13 +50,13 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizerfactory" authorizerunion "k8s.io/apiserver/pkg/authorization/union" apirequest "k8s.io/apiserver/pkg/endpoints/request" + genericfilters "k8s.io/apiserver/pkg/server/filters" "k8s.io/apiserver/pkg/server/healthz" restclient "k8s.io/client-go/rest" certutil "k8s.io/client-go/util/cert" "k8s.io/kubernetes/pkg/api" genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" apiopenapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints/openapi" - genericfilters "k8s.io/kubernetes/pkg/genericapiserver/server/filters" "k8s.io/kubernetes/pkg/genericapiserver/server/mux" "k8s.io/kubernetes/pkg/genericapiserver/server/options" "k8s.io/kubernetes/pkg/genericapiserver/server/routes" diff --git a/pkg/genericapiserver/server/filters/BUILD b/pkg/genericapiserver/server/filters/BUILD deleted file mode 100644 index 1ae6813567b..00000000000 --- a/pkg/genericapiserver/server/filters/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_library( - name = "go_default_library", - srcs = [ - "cors.go", - "doc.go", - "longrunning.go", - "maxinflight.go", - "timeout.go", - "wrap.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apiserver/pkg/endpoints/request", - "//vendor:k8s.io/apiserver/pkg/server/httplog", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "cors_test.go", - "maxinflight_test.go", - "timeout_test.go", - ], - library = ":go_default_library", - 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/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/filters/OWNERS b/staging/src/k8s.io/apiserver/pkg/server/filters/OWNERS similarity index 100% rename from pkg/genericapiserver/server/filters/OWNERS rename to staging/src/k8s.io/apiserver/pkg/server/filters/OWNERS diff --git a/pkg/genericapiserver/server/filters/cors.go b/staging/src/k8s.io/apiserver/pkg/server/filters/cors.go similarity index 100% rename from pkg/genericapiserver/server/filters/cors.go rename to staging/src/k8s.io/apiserver/pkg/server/filters/cors.go diff --git a/pkg/genericapiserver/server/filters/cors_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/cors_test.go similarity index 100% rename from pkg/genericapiserver/server/filters/cors_test.go rename to staging/src/k8s.io/apiserver/pkg/server/filters/cors_test.go diff --git a/pkg/genericapiserver/server/filters/doc.go b/staging/src/k8s.io/apiserver/pkg/server/filters/doc.go similarity index 89% rename from pkg/genericapiserver/server/filters/doc.go rename to staging/src/k8s.io/apiserver/pkg/server/filters/doc.go index 8ccdbb59737..a90cc3b4964 100644 --- a/pkg/genericapiserver/server/filters/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package filters contains all the http handler chain filters which // are not api related. -package filters // import "k8s.io/kubernetes/pkg/genericapiserver/server/filters" +package filters // import "k8s.io/apiserver/pkg/server/filters" diff --git a/pkg/genericapiserver/server/filters/longrunning.go b/staging/src/k8s.io/apiserver/pkg/server/filters/longrunning.go similarity index 100% rename from pkg/genericapiserver/server/filters/longrunning.go rename to staging/src/k8s.io/apiserver/pkg/server/filters/longrunning.go diff --git a/pkg/genericapiserver/server/filters/maxinflight.go b/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go similarity index 100% rename from pkg/genericapiserver/server/filters/maxinflight.go rename to staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go diff --git a/pkg/genericapiserver/server/filters/maxinflight_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight_test.go similarity index 100% rename from pkg/genericapiserver/server/filters/maxinflight_test.go rename to staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight_test.go diff --git a/pkg/genericapiserver/server/filters/timeout.go b/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go similarity index 100% rename from pkg/genericapiserver/server/filters/timeout.go rename to staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go diff --git a/pkg/genericapiserver/server/filters/timeout_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/timeout_test.go similarity index 100% rename from pkg/genericapiserver/server/filters/timeout_test.go rename to staging/src/k8s.io/apiserver/pkg/server/filters/timeout_test.go diff --git a/pkg/genericapiserver/server/filters/wrap.go b/staging/src/k8s.io/apiserver/pkg/server/filters/wrap.go similarity index 100% rename from pkg/genericapiserver/server/filters/wrap.go rename to staging/src/k8s.io/apiserver/pkg/server/filters/wrap.go diff --git a/vendor/BUILD b/vendor/BUILD index bcacc0e7f29..d6b8190ac44 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13774,3 +13774,43 @@ go_library( srcs = ["k8s.io/apimachinery/pkg/api/validation/path/name.go"], tags = ["automanaged"], ) + +go_test( + name = "k8s.io/apiserver/pkg/server/filters_test", + srcs = [ + "k8s.io/apiserver/pkg/server/filters/cors_test.go", + "k8s.io/apiserver/pkg/server/filters/maxinflight_test.go", + "k8s.io/apiserver/pkg/server/filters/timeout_test.go", + ], + 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/request", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/server/filters", + srcs = [ + "k8s.io/apiserver/pkg/server/filters/cors.go", + "k8s.io/apiserver/pkg/server/filters/doc.go", + "k8s.io/apiserver/pkg/server/filters/longrunning.go", + "k8s.io/apiserver/pkg/server/filters/maxinflight.go", + "k8s.io/apiserver/pkg/server/filters/timeout.go", + "k8s.io/apiserver/pkg/server/filters/wrap.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/server/httplog", + ], +) From aea12038b44a9f0319b7fee12865632e3fddc932 Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 26 Jan 2017 14:42:01 -0500 Subject: [PATCH 3/3] move storage/storagebackend to apiserver --- cmd/kube-aggregator/pkg/cmd/server/BUILD | 2 +- cmd/kube-aggregator/pkg/cmd/server/start.go | 2 +- examples/apiserver/BUILD | 2 +- examples/apiserver/apiserver.go | 2 +- pkg/controller/serviceaccount/BUILD | 2 +- pkg/controller/serviceaccount/tokengetter.go | 2 +- pkg/genericapiserver/registry/generic/BUILD | 2 +- .../registry/generic/options.go | 2 +- .../registry/generic/registry/BUILD | 2 +- .../generic/registry/storage_factory.go | 2 +- .../registry/generic/storage_decorator.go | 2 +- pkg/genericapiserver/server/BUILD | 4 +-- pkg/genericapiserver/server/options/BUILD | 2 +- pkg/genericapiserver/server/options/etcd.go | 2 +- .../server/storage_factory.go | 2 +- .../server/storage_factory_test.go | 2 +- pkg/kubeapiserver/BUILD | 2 +- .../default_storage_factory_builder.go | 2 +- pkg/master/thirdparty/BUILD | 2 +- pkg/master/thirdparty/thirdparty.go | 2 +- pkg/registry/core/rest/BUILD | 2 +- pkg/registry/core/rest/storage_core_test.go | 2 +- .../core/service/allocator/storage/BUILD | 4 +-- .../core/service/allocator/storage/storage.go | 2 +- .../service/allocator/storage/storage_test.go | 2 +- pkg/registry/registrytest/BUILD | 2 +- pkg/registry/registrytest/etcd.go | 2 +- pkg/storage/BUILD | 2 +- pkg/storage/etcd/testing/BUILD | 2 +- pkg/storage/etcd/testing/utils.go | 2 +- pkg/storage/storagebackend/BUILD | 31 ------------------- pkg/storage/storagebackend/factory/BUILD | 4 +-- pkg/storage/storagebackend/factory/etcd2.go | 2 +- pkg/storage/storagebackend/factory/etcd3.go | 2 +- pkg/storage/storagebackend/factory/factory.go | 2 +- .../storagebackend/factory/tls_test.go | 2 +- .../pkg}/storage/storagebackend/OWNERS | 0 .../pkg}/storage/storagebackend/config.go | 0 test/integration/framework/BUILD | 2 +- test/integration/framework/master_utils.go | 2 +- vendor/BUILD | 7 +++++ 41 files changed, 47 insertions(+), 71 deletions(-) delete mode 100644 pkg/storage/storagebackend/BUILD rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/storagebackend/OWNERS (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/storagebackend/config.go (100%) diff --git a/cmd/kube-aggregator/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD index 79732b84213..69137f87da3 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 7a3ab88aad5..6b3211f3415 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 d0a41a91f6c..27fb4b7c8ee 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 7a0fbdf1b82..06c1aa30e45 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 fab47a95b66..3462b81d2a5 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 4b694e71037..b42ed29f363 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 e452fa620a2..1128b61031b 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 d3bec0e0d4d..7f8e6f61063 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 6762727aeaf..8249668f237 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 5d7a62bff7b..ac3e9a6e86b 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 bf3530c566c..f3a3a911bdb 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 fa3637720ee..7e20cd26d0d 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 0b2cb979d37..91351010d64 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 15414cdf3de..4cbdbece05f 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 5b8332c8834..f3a9e319d80 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 614425884d7..c2a95c1957f 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 4ff856edae6..928de503e90 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 df26dba774f..e78536e1c74 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 6cea76968e9..15aca9ba7d8 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 6f8e06e95f3..fa612ab6639 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 cbd7c9cf03b..ef6f19ea33f 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 42263c0cdc1..348eb093d46 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 4362a93e000..65142f690c6 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 eb488c07cf3..8af50b30bb4 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 aa2718e9d86..5661ccd079d 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 d52cd59ec7c..362232fb295 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 50fb7d03038..4fd2f6f2f3f 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 a39a5086895..8d8567ed17e 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 03c0cc7ab39..a83f943589b 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 387c3650629..68facc01e9f 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 8da4ddcf4c6..00000000000 --- 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 ce4050b6861..d422a7e689b 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 e24dfbd1925..44007d405bc 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 5a69fdc2b15..a6916d1ec48 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 d9a4911a244..4fc4e92794a 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 23c76346c32..3ff1cd2bedc 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 8053177f7cb..1ff14a396af 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 ac84f890ec5..4c0a1981b62 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 d6b8190ac44..e91e09132f8 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"], +)