From 9775269fb90ef3648cfe1e85f7d0009e54cb1fb5 Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 26 Jan 2017 14:39:54 -0500 Subject: [PATCH] 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", + ], +)