From 81b073a5f5efef1092da9d0dffafe89d5eb03f3a Mon Sep 17 00:00:00 2001 From: deads2k Date: Fri, 13 Jan 2017 11:05:38 -0500 Subject: [PATCH 1/2] move no k8s.io/kubernetes deps to apiserver --- .../api/handlers/negotiation/BUILD | 49 --------------- pkg/genericapiserver/api/metrics/BUILD | 32 ---------- pkg/genericapiserver/api/request/BUILD | 60 ------------------- pkg/util/wsstream/BUILD | 48 --------------- .../authenticator/request/headerrequest/BUILD | 43 ------------- plugin/pkg/webhook/BUILD | 38 ------------ .../request/headerrequest/requestheader.go | 0 .../headerrequest/requestheader_test.go | 0 .../pkg}/handlers/negotiation/doc.go | 0 .../pkg}/handlers/negotiation/errors.go | 0 .../pkg}/handlers/negotiation/negotiate.go | 0 .../handlers/negotiation/negotiate_test.go | 0 .../src/k8s.io/apiserver/pkg}/metrics/OWNERS | 0 .../k8s.io/apiserver/pkg}/metrics/metrics.go | 0 .../src/k8s.io/apiserver/pkg}/request/OWNERS | 0 .../k8s.io/apiserver/pkg}/request/context.go | 0 .../apiserver/pkg}/request/context_test.go | 0 .../src/k8s.io/apiserver/pkg}/request/doc.go | 0 .../apiserver/pkg}/request/requestcontext.go | 0 .../apiserver/pkg}/request/requestinfo.go | 0 .../pkg}/request/requestinfo_test.go | 0 .../apiserver/pkg}/util/wsstream/conn.go | 0 .../apiserver/pkg}/util/wsstream/conn_test.go | 0 .../apiserver/pkg}/util/wsstream/doc.go | 0 .../apiserver/pkg}/util/wsstream/stream.go | 0 .../pkg}/util/wsstream/stream_test.go | 0 .../k8s.io/apiserver}/pkg/webhook/webhook.go | 0 27 files changed, 270 deletions(-) delete mode 100644 pkg/genericapiserver/api/handlers/negotiation/BUILD delete mode 100644 pkg/genericapiserver/api/metrics/BUILD delete mode 100644 pkg/genericapiserver/api/request/BUILD delete mode 100644 pkg/util/wsstream/BUILD delete mode 100644 plugin/pkg/auth/authenticator/request/headerrequest/BUILD delete mode 100644 plugin/pkg/webhook/BUILD rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/headerrequest/requestheader.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/headerrequest/requestheader_test.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/handlers/negotiation/doc.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/handlers/negotiation/errors.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/handlers/negotiation/negotiate.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/handlers/negotiation/negotiate_test.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/metrics/OWNERS (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/metrics/metrics.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/request/OWNERS (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/request/context.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/request/context_test.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/request/doc.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/request/requestcontext.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/request/requestinfo.go (100%) rename {pkg/genericapiserver/api => staging/src/k8s.io/apiserver/pkg}/request/requestinfo_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/wsstream/conn.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/wsstream/conn_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/wsstream/doc.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/wsstream/stream.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/wsstream/stream_test.go (100%) rename {plugin => staging/src/k8s.io/apiserver}/pkg/webhook/webhook.go (100%) diff --git a/pkg/genericapiserver/api/handlers/negotiation/BUILD b/pkg/genericapiserver/api/handlers/negotiation/BUILD deleted file mode 100644 index 20c24be142..0000000000 --- a/pkg/genericapiserver/api/handlers/negotiation/BUILD +++ /dev/null @@ -1,49 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = ["negotiate_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "errors.go", - "negotiate.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:bitbucket.org/ww/goautoneg", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - ], -) - -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/api/metrics/BUILD b/pkg/genericapiserver/api/metrics/BUILD deleted file mode 100644 index 4b25366108..0000000000 --- a/pkg/genericapiserver/api/metrics/BUILD +++ /dev/null @@ -1,32 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["metrics.go"], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/prometheus/client_golang/prometheus", - "//vendor:k8s.io/apimachinery/pkg/util/net", - ], -) - -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/api/request/BUILD b/pkg/genericapiserver/api/request/BUILD deleted file mode 100644 index 0c05a6b0b0..0000000000 --- a/pkg/genericapiserver/api/request/BUILD +++ /dev/null @@ -1,60 +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 = [ - "context.go", - "doc.go", - "requestcontext.go", - "requestinfo.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apiserver/pkg/authentication/user", - ], -) - -go_test( - name = "go_default_test", - srcs = ["requestinfo_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = ["//vendor:k8s.io/apimachinery/pkg/util/sets"], -) - -go_test( - name = "go_default_xtest", - srcs = ["context_test.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apiserver/pkg/authentication/user", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/util/wsstream/BUILD b/pkg/util/wsstream/BUILD deleted file mode 100644 index 1416e00f60..0000000000 --- a/pkg/util/wsstream/BUILD +++ /dev/null @@ -1,48 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "conn.go", - "doc.go", - "stream.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/websocket", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "conn_test.go", - "stream_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = ["//vendor:golang.org/x/net/websocket"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD b/plugin/pkg/auth/authenticator/request/headerrequest/BUILD deleted file mode 100644 index 7c3f5b6386..0000000000 --- a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD +++ /dev/null @@ -1,43 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = ["requestheader_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], -) - -go_library( - name = "go_default_library", - srcs = ["requestheader.go"], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", - "//vendor:k8s.io/apiserver/pkg/authentication/request/x509", - "//vendor:k8s.io/apiserver/pkg/authentication/user", - "//vendor:k8s.io/client-go/pkg/util/cert", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/plugin/pkg/webhook/BUILD b/plugin/pkg/webhook/BUILD deleted file mode 100644 index 3b41f10617..0000000000 --- a/plugin/pkg/webhook/BUILD +++ /dev/null @@ -1,38 +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 = ["webhook.go"], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/errors", - "//vendor:k8s.io/client-go/pkg/apis/authorization/install", - "//vendor:k8s.io/client-go/rest", - "//vendor:k8s.io/client-go/tools/clientcmd", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader.go similarity index 100% rename from plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader.go diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader_test.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader_test.go similarity index 100% rename from plugin/pkg/auth/authenticator/request/headerrequest/requestheader_test.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader_test.go diff --git a/pkg/genericapiserver/api/handlers/negotiation/doc.go b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go similarity index 100% rename from pkg/genericapiserver/api/handlers/negotiation/doc.go rename to staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go diff --git a/pkg/genericapiserver/api/handlers/negotiation/errors.go b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/errors.go similarity index 100% rename from pkg/genericapiserver/api/handlers/negotiation/errors.go rename to staging/src/k8s.io/apiserver/pkg/handlers/negotiation/errors.go diff --git a/pkg/genericapiserver/api/handlers/negotiation/negotiate.go b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate.go similarity index 100% rename from pkg/genericapiserver/api/handlers/negotiation/negotiate.go rename to staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate.go diff --git a/pkg/genericapiserver/api/handlers/negotiation/negotiate_test.go b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate_test.go similarity index 100% rename from pkg/genericapiserver/api/handlers/negotiation/negotiate_test.go rename to staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate_test.go diff --git a/pkg/genericapiserver/api/metrics/OWNERS b/staging/src/k8s.io/apiserver/pkg/metrics/OWNERS similarity index 100% rename from pkg/genericapiserver/api/metrics/OWNERS rename to staging/src/k8s.io/apiserver/pkg/metrics/OWNERS diff --git a/pkg/genericapiserver/api/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/metrics/metrics.go similarity index 100% rename from pkg/genericapiserver/api/metrics/metrics.go rename to staging/src/k8s.io/apiserver/pkg/metrics/metrics.go diff --git a/pkg/genericapiserver/api/request/OWNERS b/staging/src/k8s.io/apiserver/pkg/request/OWNERS similarity index 100% rename from pkg/genericapiserver/api/request/OWNERS rename to staging/src/k8s.io/apiserver/pkg/request/OWNERS diff --git a/pkg/genericapiserver/api/request/context.go b/staging/src/k8s.io/apiserver/pkg/request/context.go similarity index 100% rename from pkg/genericapiserver/api/request/context.go rename to staging/src/k8s.io/apiserver/pkg/request/context.go diff --git a/pkg/genericapiserver/api/request/context_test.go b/staging/src/k8s.io/apiserver/pkg/request/context_test.go similarity index 100% rename from pkg/genericapiserver/api/request/context_test.go rename to staging/src/k8s.io/apiserver/pkg/request/context_test.go diff --git a/pkg/genericapiserver/api/request/doc.go b/staging/src/k8s.io/apiserver/pkg/request/doc.go similarity index 100% rename from pkg/genericapiserver/api/request/doc.go rename to staging/src/k8s.io/apiserver/pkg/request/doc.go diff --git a/pkg/genericapiserver/api/request/requestcontext.go b/staging/src/k8s.io/apiserver/pkg/request/requestcontext.go similarity index 100% rename from pkg/genericapiserver/api/request/requestcontext.go rename to staging/src/k8s.io/apiserver/pkg/request/requestcontext.go diff --git a/pkg/genericapiserver/api/request/requestinfo.go b/staging/src/k8s.io/apiserver/pkg/request/requestinfo.go similarity index 100% rename from pkg/genericapiserver/api/request/requestinfo.go rename to staging/src/k8s.io/apiserver/pkg/request/requestinfo.go diff --git a/pkg/genericapiserver/api/request/requestinfo_test.go b/staging/src/k8s.io/apiserver/pkg/request/requestinfo_test.go similarity index 100% rename from pkg/genericapiserver/api/request/requestinfo_test.go rename to staging/src/k8s.io/apiserver/pkg/request/requestinfo_test.go diff --git a/pkg/util/wsstream/conn.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/conn.go similarity index 100% rename from pkg/util/wsstream/conn.go rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/conn.go diff --git a/pkg/util/wsstream/conn_test.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go similarity index 100% rename from pkg/util/wsstream/conn_test.go rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go diff --git a/pkg/util/wsstream/doc.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/doc.go similarity index 100% rename from pkg/util/wsstream/doc.go rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/doc.go diff --git a/pkg/util/wsstream/stream.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/stream.go similarity index 100% rename from pkg/util/wsstream/stream.go rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/stream.go diff --git a/pkg/util/wsstream/stream_test.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/stream_test.go similarity index 100% rename from pkg/util/wsstream/stream_test.go rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/stream_test.go diff --git a/plugin/pkg/webhook/webhook.go b/staging/src/k8s.io/apiserver/pkg/webhook/webhook.go similarity index 100% rename from plugin/pkg/webhook/webhook.go rename to staging/src/k8s.io/apiserver/pkg/webhook/webhook.go From 31b6ba4e9469592a7ca2f56235750767f34ab3fb Mon Sep 17 00:00:00 2001 From: deads2k Date: Fri, 13 Jan 2017 11:12:25 -0500 Subject: [PATCH 2/2] mechanicals --- cmd/kube-aggregator/pkg/apiserver/BUILD | 4 +- .../pkg/apiserver/apiserver.go | 2 +- .../pkg/apiserver/handler_proxy.go | 2 +- .../pkg/apiserver/handler_proxy_test.go | 2 +- .../pkg/registry/apiservice/BUILD | 2 +- .../pkg/registry/apiservice/strategy.go | 2 +- examples/apiserver/rest/BUILD | 2 +- examples/apiserver/rest/reststorage.go | 2 +- federation/registry/cluster/BUILD | 4 +- federation/registry/cluster/etcd/BUILD | 2 +- federation/registry/cluster/etcd/etcd.go | 2 +- federation/registry/cluster/registry.go | 2 +- federation/registry/cluster/strategy.go | 2 +- federation/registry/cluster/strategy_test.go | 2 +- pkg/api/rest/BUILD | 4 +- pkg/api/rest/create.go | 2 +- pkg/api/rest/delete.go | 2 +- pkg/api/rest/export.go | 2 +- pkg/api/rest/meta.go | 2 +- pkg/api/rest/meta_test.go | 2 +- pkg/api/rest/rest.go | 2 +- pkg/api/rest/resttest/BUILD | 2 +- pkg/api/rest/resttest/resttest.go | 2 +- pkg/api/rest/update.go | 2 +- pkg/auth/handlers/BUILD | 4 +- pkg/auth/handlers/handlers.go | 2 +- pkg/auth/handlers/handlers_test.go | 2 +- pkg/controller/serviceaccount/BUILD | 2 +- pkg/controller/serviceaccount/tokengetter.go | 2 +- pkg/genericapiserver/BUILD | 4 +- pkg/genericapiserver/api/BUILD | 10 +- pkg/genericapiserver/api/apiserver.go | 2 +- pkg/genericapiserver/api/apiserver_test.go | 2 +- pkg/genericapiserver/api/discovery.go | 2 +- pkg/genericapiserver/api/filters/BUILD | 4 +- pkg/genericapiserver/api/filters/audit.go | 2 +- .../api/filters/audit_test.go | 2 +- .../api/filters/authorization.go | 2 +- .../api/filters/authorization_test.go | 2 +- .../api/filters/impersonation.go | 2 +- .../api/filters/impersonation_test.go | 2 +- .../api/filters/requestinfo.go | 2 +- .../api/filters/requestinfo_test.go | 2 +- pkg/genericapiserver/api/groupversion.go | 2 +- pkg/genericapiserver/api/handlers/BUILD | 11 +- pkg/genericapiserver/api/handlers/proxy.go | 4 +- .../api/handlers/responsewriters/BUILD | 4 +- .../api/handlers/responsewriters/writers.go | 4 +- pkg/genericapiserver/api/handlers/rest.go | 4 +- .../api/handlers/rest_test.go | 2 +- pkg/genericapiserver/api/handlers/watch.go | 4 +- pkg/genericapiserver/api/installer.go | 6 +- pkg/genericapiserver/authenticator/BUILD | 2 +- .../authenticator/delegating.go | 2 +- pkg/genericapiserver/config.go | 2 +- pkg/genericapiserver/filters/BUILD | 4 +- pkg/genericapiserver/filters/longrunning.go | 2 +- pkg/genericapiserver/filters/maxinflight.go | 4 +- .../filters/maxinflight_test.go | 2 +- pkg/genericapiserver/filters/panics.go | 2 +- pkg/genericapiserver/filters/timeout.go | 2 +- pkg/genericapiserver/genericapiserver.go | 2 +- pkg/genericapiserver/genericapiserver_test.go | 2 +- pkg/genericapiserver/routes/BUILD | 2 +- pkg/genericapiserver/routes/metrics.go | 2 +- pkg/kubeapiserver/authenticator/BUILD | 2 +- pkg/kubeapiserver/authenticator/config.go | 2 +- pkg/kubelet/server/remotecommand/BUILD | 2 +- .../server/remotecommand/httpstream.go | 2 +- pkg/kubelet/server/remotecommand/websocket.go | 2 +- pkg/master/BUILD | 2 +- pkg/master/master_test.go | 2 +- pkg/master/thirdparty/BUILD | 2 +- pkg/master/thirdparty/thirdparty.go | 2 +- pkg/registry/apps/petset/BUILD | 4 +- pkg/registry/apps/petset/storage/BUILD | 4 +- pkg/registry/apps/petset/storage/storage.go | 2 +- .../apps/petset/storage/storage_test.go | 2 +- pkg/registry/apps/petset/strategy.go | 2 +- pkg/registry/apps/petset/strategy_test.go | 2 +- pkg/registry/authentication/tokenreview/BUILD | 2 +- .../authentication/tokenreview/storage.go | 2 +- .../localsubjectaccessreview/BUILD | 2 +- .../localsubjectaccessreview/rest.go | 2 +- .../selfsubjectaccessreview/BUILD | 2 +- .../selfsubjectaccessreview/rest.go | 2 +- .../authorization/subjectaccessreview/BUILD | 2 +- .../authorization/subjectaccessreview/rest.go | 2 +- .../autoscaling/horizontalpodautoscaler/BUILD | 2 +- .../horizontalpodautoscaler/storage/BUILD | 2 +- .../storage/storage.go | 2 +- .../horizontalpodautoscaler/strategy.go | 2 +- pkg/registry/batch/cronjob/BUILD | 4 +- pkg/registry/batch/cronjob/storage/BUILD | 2 +- pkg/registry/batch/cronjob/storage/storage.go | 2 +- pkg/registry/batch/cronjob/strategy.go | 2 +- pkg/registry/batch/cronjob/strategy_test.go | 2 +- pkg/registry/batch/job/BUILD | 4 +- pkg/registry/batch/job/storage/BUILD | 2 +- pkg/registry/batch/job/storage/storage.go | 2 +- pkg/registry/batch/job/strategy.go | 2 +- pkg/registry/batch/job/strategy_test.go | 2 +- pkg/registry/certificates/certificates/BUILD | 4 +- .../certificates/certificates/registry.go | 2 +- .../certificates/certificates/storage/BUILD | 2 +- .../certificates/storage/storage.go | 2 +- .../certificates/certificates/strategy.go | 2 +- .../certificates/strategy_test.go | 2 +- pkg/registry/core/componentstatus/BUILD | 4 +- pkg/registry/core/componentstatus/rest.go | 2 +- .../core/componentstatus/rest_test.go | 2 +- pkg/registry/core/configmap/BUILD | 4 +- pkg/registry/core/configmap/registry.go | 2 +- pkg/registry/core/configmap/strategy.go | 2 +- pkg/registry/core/configmap/strategy_test.go | 2 +- pkg/registry/core/controller/BUILD | 4 +- pkg/registry/core/controller/registry.go | 2 +- pkg/registry/core/controller/storage/BUILD | 4 +- .../core/controller/storage/storage.go | 2 +- .../core/controller/storage/storage_test.go | 2 +- pkg/registry/core/controller/strategy.go | 2 +- pkg/registry/core/controller/strategy_test.go | 2 +- pkg/registry/core/endpoint/BUILD | 2 +- pkg/registry/core/endpoint/registry.go | 2 +- pkg/registry/core/endpoint/strategy.go | 2 +- pkg/registry/core/event/BUILD | 2 +- pkg/registry/core/event/strategy.go | 2 +- pkg/registry/core/limitrange/BUILD | 2 +- pkg/registry/core/limitrange/strategy.go | 2 +- pkg/registry/core/namespace/BUILD | 4 +- pkg/registry/core/namespace/registry.go | 2 +- pkg/registry/core/namespace/storage/BUILD | 4 +- .../core/namespace/storage/storage.go | 2 +- .../core/namespace/storage/storage_test.go | 2 +- pkg/registry/core/namespace/strategy.go | 2 +- pkg/registry/core/namespace/strategy_test.go | 2 +- pkg/registry/core/node/BUILD | 2 +- pkg/registry/core/node/registry.go | 2 +- pkg/registry/core/node/rest/BUILD | 2 +- pkg/registry/core/node/rest/proxy.go | 2 +- pkg/registry/core/node/storage/BUILD | 2 +- pkg/registry/core/node/storage/storage.go | 2 +- pkg/registry/core/node/strategy.go | 2 +- pkg/registry/core/persistentvolume/BUILD | 2 +- .../core/persistentvolume/storage/BUILD | 4 +- .../core/persistentvolume/storage/storage.go | 2 +- .../persistentvolume/storage/storage_test.go | 2 +- .../core/persistentvolume/strategy.go | 2 +- pkg/registry/core/persistentvolumeclaim/BUILD | 2 +- .../core/persistentvolumeclaim/storage/BUILD | 4 +- .../persistentvolumeclaim/storage/storage.go | 2 +- .../storage/storage_test.go | 2 +- .../core/persistentvolumeclaim/strategy.go | 2 +- pkg/registry/core/pod/BUILD | 4 +- pkg/registry/core/pod/rest/BUILD | 4 +- pkg/registry/core/pod/rest/log.go | 2 +- pkg/registry/core/pod/rest/log_test.go | 2 +- pkg/registry/core/pod/rest/subresources.go | 2 +- pkg/registry/core/pod/storage/BUILD | 4 +- pkg/registry/core/pod/storage/eviction.go | 2 +- pkg/registry/core/pod/storage/storage.go | 2 +- pkg/registry/core/pod/storage/storage_test.go | 2 +- pkg/registry/core/pod/strategy.go | 2 +- pkg/registry/core/pod/strategy_test.go | 2 +- pkg/registry/core/podtemplate/BUILD | 2 +- pkg/registry/core/podtemplate/strategy.go | 2 +- pkg/registry/core/resourcequota/BUILD | 4 +- pkg/registry/core/resourcequota/storage/BUILD | 4 +- .../core/resourcequota/storage/storage.go | 2 +- .../resourcequota/storage/storage_test.go | 2 +- pkg/registry/core/resourcequota/strategy.go | 2 +- .../core/resourcequota/strategy_test.go | 2 +- pkg/registry/core/secret/BUILD | 4 +- pkg/registry/core/secret/registry.go | 2 +- pkg/registry/core/secret/strategy.go | 2 +- pkg/registry/core/secret/strategy_test.go | 2 +- pkg/registry/core/service/BUILD | 4 +- pkg/registry/core/service/proxy.go | 2 +- pkg/registry/core/service/registry.go | 2 +- pkg/registry/core/service/rest.go | 2 +- pkg/registry/core/service/rest_test.go | 2 +- pkg/registry/core/service/storage/BUILD | 2 +- pkg/registry/core/service/storage/storage.go | 2 +- pkg/registry/core/service/strategy.go | 2 +- pkg/registry/core/service/strategy_test.go | 2 +- pkg/registry/core/serviceaccount/BUILD | 2 +- pkg/registry/core/serviceaccount/registry.go | 2 +- pkg/registry/core/serviceaccount/strategy.go | 2 +- .../extensions/controller/storage/BUILD | 4 +- .../extensions/controller/storage/storage.go | 2 +- .../controller/storage/storage_test.go | 2 +- pkg/registry/extensions/daemonset/BUILD | 2 +- .../extensions/daemonset/storage/BUILD | 2 +- .../extensions/daemonset/storage/storage.go | 2 +- pkg/registry/extensions/daemonset/strategy.go | 2 +- pkg/registry/extensions/deployment/BUILD | 4 +- .../extensions/deployment/registry.go | 2 +- .../extensions/deployment/storage/BUILD | 4 +- .../extensions/deployment/storage/storage.go | 2 +- .../deployment/storage/storage_test.go | 2 +- .../extensions/deployment/strategy.go | 2 +- .../extensions/deployment/strategy_test.go | 2 +- pkg/registry/extensions/ingress/BUILD | 4 +- pkg/registry/extensions/ingress/storage/BUILD | 2 +- .../extensions/ingress/storage/storage.go | 2 +- pkg/registry/extensions/ingress/strategy.go | 2 +- .../extensions/ingress/strategy_test.go | 2 +- pkg/registry/extensions/networkpolicy/BUILD | 4 +- .../extensions/networkpolicy/storage/BUILD | 2 +- .../networkpolicy/storage/storage_test.go | 2 +- .../extensions/networkpolicy/strategy.go | 2 +- .../extensions/networkpolicy/strategy_test.go | 2 +- .../extensions/podsecuritypolicy/BUILD | 2 +- .../extensions/podsecuritypolicy/strategy.go | 2 +- pkg/registry/extensions/replicaset/BUILD | 4 +- .../extensions/replicaset/registry.go | 2 +- .../extensions/replicaset/storage/BUILD | 4 +- .../extensions/replicaset/storage/storage.go | 2 +- .../replicaset/storage/storage_test.go | 2 +- .../extensions/replicaset/strategy.go | 2 +- .../extensions/replicaset/strategy_test.go | 2 +- .../extensions/thirdpartyresource/BUILD | 2 +- .../extensions/thirdpartyresource/strategy.go | 2 +- .../extensions/thirdpartyresourcedata/BUILD | 2 +- .../thirdpartyresourcedata/registry.go | 2 +- .../thirdpartyresourcedata/strategy.go | 2 +- pkg/registry/generic/registry/BUILD | 4 +- pkg/registry/generic/registry/store.go | 2 +- pkg/registry/generic/registry/store_test.go | 2 +- pkg/registry/policy/poddisruptionbudget/BUILD | 4 +- .../policy/poddisruptionbudget/storage/BUILD | 4 +- .../poddisruptionbudget/storage/storage.go | 2 +- .../storage/storage_test.go | 2 +- .../policy/poddisruptionbudget/strategy.go | 2 +- .../poddisruptionbudget/strategy_test.go | 2 +- pkg/registry/rbac/BUILD | 2 +- pkg/registry/rbac/clusterrole/BUILD | 2 +- .../rbac/clusterrole/policybased/BUILD | 2 +- .../rbac/clusterrole/policybased/storage.go | 2 +- pkg/registry/rbac/clusterrole/registry.go | 2 +- pkg/registry/rbac/clusterrole/strategy.go | 2 +- pkg/registry/rbac/clusterrolebinding/BUILD | 2 +- .../rbac/clusterrolebinding/policybased/BUILD | 2 +- .../clusterrolebinding/policybased/storage.go | 2 +- .../rbac/clusterrolebinding/registry.go | 2 +- .../rbac/clusterrolebinding/strategy.go | 2 +- pkg/registry/rbac/escalation_check.go | 2 +- pkg/registry/rbac/role/BUILD | 2 +- pkg/registry/rbac/role/policybased/BUILD | 2 +- pkg/registry/rbac/role/policybased/storage.go | 2 +- pkg/registry/rbac/role/registry.go | 2 +- pkg/registry/rbac/role/strategy.go | 2 +- pkg/registry/rbac/rolebinding/BUILD | 2 +- .../rbac/rolebinding/policybased/BUILD | 2 +- .../rbac/rolebinding/policybased/storage.go | 2 +- pkg/registry/rbac/rolebinding/registry.go | 2 +- pkg/registry/rbac/rolebinding/strategy.go | 2 +- pkg/registry/rbac/validation/BUILD | 2 +- pkg/registry/rbac/validation/rule.go | 2 +- pkg/registry/registrytest/BUILD | 2 +- pkg/registry/registrytest/endpoint.go | 2 +- pkg/registry/registrytest/etcd.go | 2 +- pkg/registry/registrytest/node.go | 2 +- pkg/registry/registrytest/service.go | 2 +- pkg/registry/storage/storageclass/BUILD | 4 +- pkg/registry/storage/storageclass/strategy.go | 2 +- .../storage/storageclass/strategy_test.go | 2 +- pkg/util/BUILD | 1 - plugin/BUILD | 1 - plugin/pkg/admission/imagepolicy/BUILD | 2 +- plugin/pkg/admission/imagepolicy/admission.go | 2 +- plugin/pkg/auth/authenticator/BUILD | 1 - .../auth/authenticator/token/webhook/BUILD | 2 +- .../authenticator/token/webhook/webhook.go | 2 +- plugin/pkg/auth/authorizer/webhook/BUILD | 2 +- plugin/pkg/auth/authorizer/webhook/webhook.go | 2 +- plugin/pkg/scheduler/factory/BUILD | 2 +- plugin/pkg/scheduler/factory/factory.go | 2 +- .../apiserver/pkg/handlers/negotiation/doc.go | 2 +- .../apiserver/pkg/request/context_test.go | 2 +- .../src/k8s.io/apiserver/pkg/request/doc.go | 2 +- .../k8s.io/apiserver/pkg/util/wsstream/doc.go | 2 +- vendor/BUILD | 140 ++++++++++++++++++ 283 files changed, 472 insertions(+), 338 deletions(-) diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD index 9e7e482f46..59ae84b56b 100644 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -40,7 +40,6 @@ go_library( "//pkg/genericapiserver:go_default_library", "//pkg/genericapiserver/api/filters:go_default_library", "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/genericapiserver/filters:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/rest:go_default_library", @@ -53,6 +52,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -71,12 +71,12 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/listers/core/v1:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/cmd/kube-aggregator/pkg/apiserver/apiserver.go b/cmd/kube-aggregator/pkg/apiserver/apiserver.go index 9c63986c57..debe48d43c 100644 --- a/cmd/kube-aggregator/pkg/apiserver/apiserver.go +++ b/cmd/kube-aggregator/pkg/apiserver/apiserver.go @@ -22,6 +22,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/rest" authhandlers "k8s.io/kubernetes/pkg/auth/handlers" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -29,7 +30,6 @@ import ( v1listers "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/genericapiserver" genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" genericfilters "k8s.io/kubernetes/pkg/genericapiserver/filters" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/version" diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go index a6387443d9..df6358382c 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go @@ -22,10 +22,10 @@ import ( "sync" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/transport" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" genericrest "k8s.io/kubernetes/pkg/registry/generic/rest" "k8s.io/kubernetes/pkg/util/httpstream/spdy" diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go b/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go index 2122091155..10a6f0ba4e 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_proxy_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/authentication/user" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" ) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD index 1cab833f3b..082e41aea2 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD +++ b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD @@ -16,12 +16,12 @@ go_library( "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library", "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go index e4a5ba2880..3a25c4fa7c 100644 --- a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go +++ b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go @@ -22,9 +22,9 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" kapi "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" diff --git a/examples/apiserver/rest/BUILD b/examples/apiserver/rest/BUILD index 707edde6b8..a88e825e2d 100644 --- a/examples/apiserver/rest/BUILD +++ b/examples/apiserver/rest/BUILD @@ -15,13 +15,13 @@ go_library( "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/examples/apiserver/rest/reststorage.go b/examples/apiserver/rest/reststorage.go index 7eeec545d9..ba71ea7c80 100644 --- a/examples/apiserver/rest/reststorage.go +++ b/examples/apiserver/rest/reststorage.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/storage" diff --git a/federation/registry/cluster/BUILD b/federation/registry/cluster/BUILD index fad544cf05..f1196775bb 100644 --- a/federation/registry/cluster/BUILD +++ b/federation/registry/cluster/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -29,6 +28,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -42,8 +42,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/federation/registry/cluster/etcd/BUILD b/federation/registry/cluster/etcd/BUILD index bcf5db9989..6c467e396e 100644 --- a/federation/registry/cluster/etcd/BUILD +++ b/federation/registry/cluster/etcd/BUILD @@ -16,10 +16,10 @@ go_library( "//federation/apis/federation:go_default_library", "//federation/registry/cluster:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/federation/registry/cluster/etcd/etcd.go b/federation/registry/cluster/etcd/etcd.go index 6aa6eb0e5b..0ae05f7351 100644 --- a/federation/registry/cluster/etcd/etcd.go +++ b/federation/registry/cluster/etcd/etcd.go @@ -18,10 +18,10 @@ package etcd import ( "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/registry/cluster" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) diff --git a/federation/registry/cluster/registry.go b/federation/registry/cluster/registry.go index cb87c6f7b1..6808f57e2e 100644 --- a/federation/registry/cluster/registry.go +++ b/federation/registry/cluster/registry.go @@ -19,10 +19,10 @@ package cluster import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface implemented by things that know how to store Cluster objects. diff --git a/federation/registry/cluster/strategy.go b/federation/registry/cluster/strategy.go index e026e5217f..497ad3808f 100644 --- a/federation/registry/cluster/strategy.go +++ b/federation/registry/cluster/strategy.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/apis/federation/validation" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/federation/registry/cluster/strategy_test.go b/federation/registry/cluster/strategy_test.go index fef835947d..85a30492c0 100644 --- a/federation/registry/cluster/strategy_test.go +++ b/federation/registry/cluster/strategy_test.go @@ -22,11 +22,11 @@ import ( "reflect" "k8s.io/apimachinery/pkg/labels" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func validNewCluster() *federation.Cluster { diff --git a/pkg/api/rest/BUILD b/pkg/api/rest/BUILD index ea67055744..e0a3c23c16 100644 --- a/pkg/api/rest/BUILD +++ b/pkg/api/rest/BUILD @@ -26,7 +26,6 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/validation/genericvalidation:go_default_library", "//pkg/api/validation/path:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -34,6 +33,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -60,7 +60,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/util/uuid:go_default_library", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/api/rest/create.go b/pkg/api/rest/create.go index b510015fde..57c7e83f48 100644 --- a/pkg/api/rest/create.go +++ b/pkg/api/rest/create.go @@ -20,11 +20,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/validation/genericvalidation" "k8s.io/kubernetes/pkg/api/validation/path" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // RESTCreateStrategy defines the minimum validation, accepted input, and diff --git a/pkg/api/rest/delete.go b/pkg/api/rest/delete.go index edea4a8d20..ab76fc783f 100644 --- a/pkg/api/rest/delete.go +++ b/pkg/api/rest/delete.go @@ -23,9 +23,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // RESTDeleteStrategy defines deletion behavior on an object that follows Kubernetes diff --git a/pkg/api/rest/export.go b/pkg/api/rest/export.go index 6ec306263d..a29c9b79af 100644 --- a/pkg/api/rest/export.go +++ b/pkg/api/rest/export.go @@ -18,7 +18,7 @@ package rest import ( "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" + genericapirequest "k8s.io/apiserver/pkg/request" ) // RESTExportStrategy is the interface that defines how to export a Kubernetes object diff --git a/pkg/api/rest/meta.go b/pkg/api/rest/meta.go index 155f888210..96c84a7b8e 100644 --- a/pkg/api/rest/meta.go +++ b/pkg/api/rest/meta.go @@ -18,8 +18,8 @@ package rest import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util/uuid" ) diff --git a/pkg/api/rest/meta_test.go b/pkg/api/rest/meta_test.go index 9b79147e05..978e7524f7 100644 --- a/pkg/api/rest/meta_test.go +++ b/pkg/api/rest/meta_test.go @@ -19,8 +19,8 @@ package rest import ( "testing" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util/uuid" ) diff --git a/pkg/api/rest/rest.go b/pkg/api/rest/rest.go index e66a1ea565..8b7cfb3f04 100644 --- a/pkg/api/rest/rest.go +++ b/pkg/api/rest/rest.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) //TODO: diff --git a/pkg/api/rest/resttest/BUILD b/pkg/api/rest/resttest/BUILD index 79f70fe01b..0011b537ac 100644 --- a/pkg/api/rest/resttest/BUILD +++ b/pkg/api/rest/resttest/BUILD @@ -17,13 +17,13 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/conversion", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/api/rest/resttest/resttest.go b/pkg/api/rest/resttest/resttest.go index c3a4875e9a..92aa64bf22 100644 --- a/pkg/api/rest/resttest/resttest.go +++ b/pkg/api/rest/resttest/resttest.go @@ -29,12 +29,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) type Tester struct { diff --git a/pkg/api/rest/update.go b/pkg/api/rest/update.go index ed0dc0fe2a..55fc2b03ff 100644 --- a/pkg/api/rest/update.go +++ b/pkg/api/rest/update.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/validation/genericvalidation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // RESTUpdateStrategy defines the minimum validation, accepted input, and diff --git a/pkg/auth/handlers/BUILD b/pkg/auth/handlers/BUILD index 4fe19b0206..02ff1019c2 100644 --- a/pkg/auth/handlers/BUILD +++ b/pkg/auth/handlers/BUILD @@ -13,10 +13,10 @@ go_library( srcs = ["handlers.go"], tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -26,9 +26,9 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/auth/handlers/handlers.go b/pkg/auth/handlers/handlers.go index fa9b97d7e9..74e3a65b23 100644 --- a/pkg/auth/handlers/handlers.go +++ b/pkg/auth/handlers/handlers.go @@ -24,7 +24,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "k8s.io/apiserver/pkg/authentication/authenticator" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" + genericapirequest "k8s.io/apiserver/pkg/request" ) var ( diff --git a/pkg/auth/handlers/handlers_test.go b/pkg/auth/handlers/handlers_test.go index 7284f63db7..40ff025903 100644 --- a/pkg/auth/handlers/handlers_test.go +++ b/pkg/auth/handlers/handlers_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" + genericapirequest "k8s.io/apiserver/pkg/request" ) func TestAuthenticateRequest(t *testing.T) { diff --git a/pkg/controller/serviceaccount/BUILD b/pkg/controller/serviceaccount/BUILD index 6f575e8494..559d14a702 100644 --- a/pkg/controller/serviceaccount/BUILD +++ b/pkg/controller/serviceaccount/BUILD @@ -26,7 +26,6 @@ go_library( "//pkg/client/retry:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/secret:go_default_library", "//pkg/registry/core/secret/storage:go_default_library", "//pkg/registry/core/serviceaccount:go_default_library", @@ -46,6 +45,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index 2a14ca27f9..d7dc513dd4 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -18,9 +18,9 @@ package serviceaccount import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/secret" secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage" serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount" diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index d3cf2a4539..cbecfde517 100644 --- a/pkg/genericapiserver/BUILD +++ b/pkg/genericapiserver/BUILD @@ -34,7 +34,6 @@ go_library( "//pkg/genericapiserver/api:go_default_library", "//pkg/genericapiserver/api/filters:go_default_library", "//pkg/genericapiserver/api/openapi:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/genericapiserver/authenticator:go_default_library", "//pkg/genericapiserver/authorizer:go_default_library", "//pkg/genericapiserver/filters:go_default_library", @@ -69,6 +68,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/authorization/union", "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -94,7 +94,6 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/genericapiserver/options:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/storage/storagebackend:go_default_library", @@ -112,6 +111,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/genericapiserver/api/BUILD b/pkg/genericapiserver/api/BUILD index 92b5489712..89902efd92 100644 --- a/pkg/genericapiserver/api/BUILD +++ b/pkg/genericapiserver/api/BUILD @@ -25,10 +25,7 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/genericapiserver/api/handlers:go_default_library", - "//pkg/genericapiserver/api/handlers/negotiation:go_default_library", "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/metrics:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -36,6 +33,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apiserver/pkg/handlers/negotiation", + "//vendor:k8s.io/apiserver/pkg/metrics", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -60,7 +60,6 @@ go_test( "//pkg/genericapiserver/api/filters:go_default_library", "//pkg/genericapiserver/api/handlers:go_default_library", "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/genericapiserver/api/testing:go_default_library", "//plugin/pkg/admission/admit:go_default_library", "//plugin/pkg/admission/deny:go_default_library", @@ -77,6 +76,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -93,9 +93,7 @@ filegroup( ":package-srcs", "//pkg/genericapiserver/api/filters:all-srcs", "//pkg/genericapiserver/api/handlers:all-srcs", - "//pkg/genericapiserver/api/metrics:all-srcs", "//pkg/genericapiserver/api/openapi:all-srcs", - "//pkg/genericapiserver/api/request:all-srcs", "//pkg/genericapiserver/api/testing:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/genericapiserver/api/apiserver.go b/pkg/genericapiserver/api/apiserver.go index 63609ae3ee..ff6d8316ee 100644 --- a/pkg/genericapiserver/api/apiserver.go +++ b/pkg/genericapiserver/api/apiserver.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "k8s.io/kubernetes/pkg/genericapiserver/api/metrics" + "k8s.io/apiserver/pkg/metrics" ) func init() { diff --git a/pkg/genericapiserver/api/apiserver_test.go b/pkg/genericapiserver/api/apiserver_test.go index b28febbcf7..b3739caf41 100644 --- a/pkg/genericapiserver/api/apiserver_test.go +++ b/pkg/genericapiserver/api/apiserver_test.go @@ -42,6 +42,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" @@ -52,7 +53,6 @@ import ( "k8s.io/kubernetes/pkg/fields" genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" genericapitesting "k8s.io/kubernetes/pkg/genericapiserver/api/testing" "k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/admission/deny" diff --git a/pkg/genericapiserver/api/discovery.go b/pkg/genericapiserver/api/discovery.go index de3f8b5fdb..fed59636c6 100644 --- a/pkg/genericapiserver/api/discovery.go +++ b/pkg/genericapiserver/api/discovery.go @@ -27,8 +27,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/handlers/negotiation" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" ) diff --git a/pkg/genericapiserver/api/filters/BUILD b/pkg/genericapiserver/api/filters/BUILD index 8dc61a059c..30c65accff 100644 --- a/pkg/genericapiserver/api/filters/BUILD +++ b/pkg/genericapiserver/api/filters/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/authentication:go_default_library", "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/serviceaccount:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/pborman/uuid", @@ -30,6 +29,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/httplog", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -47,10 +47,10 @@ go_test( "//pkg/apis/authentication:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/genericapiserver/api/filters/audit.go b/pkg/genericapiserver/api/filters/audit.go index e4c9f65dfe..b6ae5b504f 100644 --- a/pkg/genericapiserver/api/filters/audit.go +++ b/pkg/genericapiserver/api/filters/audit.go @@ -30,9 +30,9 @@ import ( "github.com/pborman/uuid" utilnet "k8s.io/apimachinery/pkg/util/net" + "k8s.io/apiserver/pkg/request" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) var _ http.ResponseWriter = &auditResponseWriter{} diff --git a/pkg/genericapiserver/api/filters/audit_test.go b/pkg/genericapiserver/api/filters/audit_test.go index 6637629ed7..f77fdcd9c7 100644 --- a/pkg/genericapiserver/api/filters/audit_test.go +++ b/pkg/genericapiserver/api/filters/audit_test.go @@ -29,7 +29,7 @@ import ( "testing" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" + "k8s.io/apiserver/pkg/request" ) type simpleResponseWriter struct { diff --git a/pkg/genericapiserver/api/filters/authorization.go b/pkg/genericapiserver/api/filters/authorization.go index 29fe6e780e..2d15212ca5 100644 --- a/pkg/genericapiserver/api/filters/authorization.go +++ b/pkg/genericapiserver/api/filters/authorization.go @@ -23,8 +23,8 @@ import ( "github.com/golang/glog" "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // WithAuthorizationCheck passes all authorized requests on to handler, and returns a forbidden error otherwise. diff --git a/pkg/genericapiserver/api/filters/authorization_test.go b/pkg/genericapiserver/api/filters/authorization_test.go index 9cd3f7300f..644bde9151 100644 --- a/pkg/genericapiserver/api/filters/authorization_test.go +++ b/pkg/genericapiserver/api/filters/authorization_test.go @@ -24,9 +24,9 @@ import ( "testing" "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestGetAuthorizerAttributes(t *testing.T) { diff --git a/pkg/genericapiserver/api/filters/impersonation.go b/pkg/genericapiserver/api/filters/impersonation.go index 2d0c86f1aa..50cf3ae22e 100644 --- a/pkg/genericapiserver/api/filters/impersonation.go +++ b/pkg/genericapiserver/api/filters/impersonation.go @@ -27,10 +27,10 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/httplog" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/serviceaccount" ) diff --git a/pkg/genericapiserver/api/filters/impersonation_test.go b/pkg/genericapiserver/api/filters/impersonation_test.go index 19fd6d2175..6481d8cd69 100644 --- a/pkg/genericapiserver/api/filters/impersonation_test.go +++ b/pkg/genericapiserver/api/filters/impersonation_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/apiserver/pkg/request" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) type impersonateAuthorizer struct{} diff --git a/pkg/genericapiserver/api/filters/requestinfo.go b/pkg/genericapiserver/api/filters/requestinfo.go index dd381da54b..64e8fb8a10 100644 --- a/pkg/genericapiserver/api/filters/requestinfo.go +++ b/pkg/genericapiserver/api/filters/requestinfo.go @@ -21,8 +21,8 @@ import ( "fmt" "net/http" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // WithRequestInfo attaches a RequestInfo to the context. diff --git a/pkg/genericapiserver/api/filters/requestinfo_test.go b/pkg/genericapiserver/api/filters/requestinfo_test.go index 30300be388..f77307339f 100644 --- a/pkg/genericapiserver/api/filters/requestinfo_test.go +++ b/pkg/genericapiserver/api/filters/requestinfo_test.go @@ -18,7 +18,7 @@ package filters import ( "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" + "k8s.io/apiserver/pkg/request" ) func newTestRequestInfoResolver() *request.RequestInfoFactory { diff --git a/pkg/genericapiserver/api/groupversion.go b/pkg/genericapiserver/api/groupversion.go index ef5e619ca5..3b5210da93 100644 --- a/pkg/genericapiserver/api/groupversion.go +++ b/pkg/genericapiserver/api/groupversion.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/admission" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // APIGroupVersion is a helper for exposing rest.Storage objects as http.Handlers via go-restful diff --git a/pkg/genericapiserver/api/handlers/BUILD b/pkg/genericapiserver/api/handlers/BUILD index 5c4c192ead..7388dc91cd 100644 --- a/pkg/genericapiserver/api/handlers/BUILD +++ b/pkg/genericapiserver/api/handlers/BUILD @@ -19,7 +19,6 @@ go_test( "//pkg/api/rest:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/evanphx/json-patch", @@ -28,6 +27,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -47,15 +47,11 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/handlers/negotiation:go_default_library", "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/metrics:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/util:go_default_library", "//pkg/util/httpstream:go_default_library", "//pkg/util/proxy:go_default_library", "//pkg/util/strategicpatch:go_default_library", - "//pkg/util/wsstream:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/evanphx/json-patch", "//vendor:github.com/golang/glog", @@ -68,7 +64,11 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/handlers/negotiation", "//vendor:k8s.io/apiserver/pkg/httplog", + "//vendor:k8s.io/apiserver/pkg/metrics", + "//vendor:k8s.io/apiserver/pkg/request", + "//vendor:k8s.io/apiserver/pkg/util/wsstream", ], ) @@ -83,7 +83,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/genericapiserver/api/handlers/negotiation:all-srcs", "//pkg/genericapiserver/api/handlers/responsewriters:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/genericapiserver/api/handlers/proxy.go b/pkg/genericapiserver/api/handlers/proxy.go index d2bd9a81f6..57cf727602 100644 --- a/pkg/genericapiserver/api/handlers/proxy.go +++ b/pkg/genericapiserver/api/handlers/proxy.go @@ -31,12 +31,12 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/httplog" + "k8s.io/apiserver/pkg/metrics" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/metrics" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util/httpstream" proxyutil "k8s.io/kubernetes/pkg/util/proxy" diff --git a/pkg/genericapiserver/api/handlers/responsewriters/BUILD b/pkg/genericapiserver/api/handlers/responsewriters/BUILD index 5cc50008c0..41d35479fc 100644 --- a/pkg/genericapiserver/api/handlers/responsewriters/BUILD +++ b/pkg/genericapiserver/api/handlers/responsewriters/BUILD @@ -32,15 +32,15 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/handlers/negotiation:go_default_library", "//pkg/storage:go_default_library", - "//pkg/util/wsstream:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/handlers/negotiation", "//vendor:k8s.io/apiserver/pkg/util/flushwriter", + "//vendor:k8s.io/apiserver/pkg/util/wsstream", ], ) diff --git a/pkg/genericapiserver/api/handlers/responsewriters/writers.go b/pkg/genericapiserver/api/handlers/responsewriters/writers.go index e42188daf6..bc47064274 100644 --- a/pkg/genericapiserver/api/handlers/responsewriters/writers.go +++ b/pkg/genericapiserver/api/handlers/responsewriters/writers.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/apiserver/pkg/handlers/negotiation" "k8s.io/apiserver/pkg/util/flushwriter" + "k8s.io/apiserver/pkg/util/wsstream" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation" - "k8s.io/kubernetes/pkg/util/wsstream" ) // WriteObject renders a returned runtime.Object to the response as a stream or an encoded object. If the object diff --git a/pkg/genericapiserver/api/handlers/rest.go b/pkg/genericapiserver/api/handlers/rest.go index ad468d76ae..f02e8741f2 100644 --- a/pkg/genericapiserver/api/handlers/rest.go +++ b/pkg/genericapiserver/api/handlers/rest.go @@ -32,14 +32,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/apiserver/pkg/handlers/negotiation" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/strategicpatch" diff --git a/pkg/genericapiserver/api/handlers/rest_test.go b/pkg/genericapiserver/api/handlers/rest_test.go index 722620f851..f5d0f7cc24 100644 --- a/pkg/genericapiserver/api/handlers/rest_test.go +++ b/pkg/genericapiserver/api/handlers/rest_test.go @@ -31,12 +31,12 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util/strategicpatch" ) diff --git a/pkg/genericapiserver/api/handlers/watch.go b/pkg/genericapiserver/api/handlers/watch.go index 250db857bb..064b9e1517 100755 --- a/pkg/genericapiserver/api/handlers/watch.go +++ b/pkg/genericapiserver/api/handlers/watch.go @@ -28,10 +28,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer/streaming" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" + "k8s.io/apiserver/pkg/handlers/negotiation" "k8s.io/apiserver/pkg/httplog" + "k8s.io/apiserver/pkg/util/wsstream" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation" - "k8s.io/kubernetes/pkg/util/wsstream" "github.com/emicklei/go-restful" "golang.org/x/net/websocket" diff --git a/pkg/genericapiserver/api/installer.go b/pkg/genericapiserver/api/installer.go index 20289a92c1..53c9e16f4b 100644 --- a/pkg/genericapiserver/api/installer.go +++ b/pkg/genericapiserver/api/installer.go @@ -33,14 +33,14 @@ import ( "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/handlers/negotiation" + "k8s.io/apiserver/pkg/metrics" + "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" - "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation" - "k8s.io/kubernetes/pkg/genericapiserver/api/metrics" - "k8s.io/kubernetes/pkg/genericapiserver/api/request" "github.com/emicklei/go-restful" ) diff --git a/pkg/genericapiserver/authenticator/BUILD b/pkg/genericapiserver/authenticator/BUILD index 307ebb8c2a..7af1365f48 100644 --- a/pkg/genericapiserver/authenticator/BUILD +++ b/pkg/genericapiserver/authenticator/BUILD @@ -17,13 +17,13 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/util/cert:go_default_library", - "//plugin/pkg/auth/authenticator/request/headerrequest:go_default_library", "//plugin/pkg/auth/authenticator/token/webhook:go_default_library", "//vendor:github.com/go-openapi/spec", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/group", "//vendor:k8s.io/apiserver/pkg/authentication/request/anonymous", "//vendor:k8s.io/apiserver/pkg/authentication/request/bearertoken", + "//vendor:k8s.io/apiserver/pkg/authentication/request/headerrequest", "//vendor:k8s.io/apiserver/pkg/authentication/request/union", "//vendor:k8s.io/apiserver/pkg/authentication/request/x509", "//vendor:k8s.io/apiserver/pkg/authentication/token/tokenfile", diff --git a/pkg/genericapiserver/authenticator/delegating.go b/pkg/genericapiserver/authenticator/delegating.go index d43c15b4dd..97ed9facdb 100644 --- a/pkg/genericapiserver/authenticator/delegating.go +++ b/pkg/genericapiserver/authenticator/delegating.go @@ -27,13 +27,13 @@ import ( "k8s.io/apiserver/pkg/authentication/group" "k8s.io/apiserver/pkg/authentication/request/anonymous" "k8s.io/apiserver/pkg/authentication/request/bearertoken" + "k8s.io/apiserver/pkg/authentication/request/headerrequest" unionauth "k8s.io/apiserver/pkg/authentication/request/union" "k8s.io/apiserver/pkg/authentication/request/x509" "k8s.io/apiserver/pkg/authentication/user" authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" "k8s.io/kubernetes/pkg/util/cert" - "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/headerrequest" webhooktoken "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook" ) diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index 897497410c..d830951c62 100644 --- a/pkg/genericapiserver/config.go +++ b/pkg/genericapiserver/config.go @@ -46,13 +46,13 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" authorizerunion "k8s.io/apiserver/pkg/authorization/union" "k8s.io/apiserver/pkg/healthz" + apirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" authhandlers "k8s.io/kubernetes/pkg/auth/handlers" "k8s.io/kubernetes/pkg/client/restclient" genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters" apiopenapi "k8s.io/kubernetes/pkg/genericapiserver/api/openapi" - apirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" genericauthenticator "k8s.io/kubernetes/pkg/genericapiserver/authenticator" genericauthorizer "k8s.io/kubernetes/pkg/genericapiserver/authorizer" genericfilters "k8s.io/kubernetes/pkg/genericapiserver/filters" diff --git a/pkg/genericapiserver/filters/BUILD b/pkg/genericapiserver/filters/BUILD index e1668bd4af..1ce2572a9e 100644 --- a/pkg/genericapiserver/filters/BUILD +++ b/pkg/genericapiserver/filters/BUILD @@ -22,12 +22,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/util:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/httplog", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -43,8 +43,8 @@ go_test( deps = [ "//pkg/api/errors:go_default_library", "//pkg/genericapiserver/api/filters:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/genericapiserver/filters/longrunning.go b/pkg/genericapiserver/filters/longrunning.go index d2be9c6532..39831ef3b0 100644 --- a/pkg/genericapiserver/filters/longrunning.go +++ b/pkg/genericapiserver/filters/longrunning.go @@ -20,7 +20,7 @@ import ( "net/http" "k8s.io/apimachinery/pkg/util/sets" - apirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" + apirequest "k8s.io/apiserver/pkg/request" ) // LongRunningRequestCheck is a predicate which is true for long-running http requests. diff --git a/pkg/genericapiserver/filters/maxinflight.go b/pkg/genericapiserver/filters/maxinflight.go index 82bcccbd19..a018720453 100644 --- a/pkg/genericapiserver/filters/maxinflight.go +++ b/pkg/genericapiserver/filters/maxinflight.go @@ -22,9 +22,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/httplog" + apirequest "k8s.io/apiserver/pkg/request" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/errors" - apirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "github.com/golang/glog" ) diff --git a/pkg/genericapiserver/filters/maxinflight_test.go b/pkg/genericapiserver/filters/maxinflight_test.go index 259e88768f..84de4ffc0b 100644 --- a/pkg/genericapiserver/filters/maxinflight_test.go +++ b/pkg/genericapiserver/filters/maxinflight_test.go @@ -25,9 +25,9 @@ import ( "testing" "k8s.io/apimachinery/pkg/util/sets" + apirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/errors" apifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters" - apirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func createMaxInflightServer(callsWg, blockWg *sync.WaitGroup, disableCallsWg *bool, disableCallsWgMutex *sync.Mutex, nonMutating, mutating int) *httptest.Server { diff --git a/pkg/genericapiserver/filters/panics.go b/pkg/genericapiserver/filters/panics.go index b79772dc71..cce8c162a5 100644 --- a/pkg/genericapiserver/filters/panics.go +++ b/pkg/genericapiserver/filters/panics.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/httplog" + apirequest "k8s.io/apiserver/pkg/request" apierrors "k8s.io/kubernetes/pkg/api/errors" - apirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // WithPanicRecovery wraps an http Handler to recover and log panics. diff --git a/pkg/genericapiserver/filters/timeout.go b/pkg/genericapiserver/filters/timeout.go index bf79974ff7..a120849ebf 100644 --- a/pkg/genericapiserver/filters/timeout.go +++ b/pkg/genericapiserver/filters/timeout.go @@ -25,9 +25,9 @@ import ( "sync" "time" + apirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - apirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) const globalTimeout = time.Minute diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index fe0a7123c8..dbd5efdc7a 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -38,12 +38,12 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/healthz" + apirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/client/restclient" genericapi "k8s.io/kubernetes/pkg/genericapiserver/api" - apirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" genericmux "k8s.io/kubernetes/pkg/genericapiserver/mux" "k8s.io/kubernetes/pkg/genericapiserver/routes" ) diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go index a7a6c35a82..913cc652c3 100644 --- a/pkg/genericapiserver/genericapiserver_test.go +++ b/pkg/genericapiserver/genericapiserver_test.go @@ -36,13 +36,13 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" openapigen "k8s.io/kubernetes/pkg/generated/openapi" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/version" diff --git a/pkg/genericapiserver/routes/BUILD b/pkg/genericapiserver/routes/BUILD index 5645a05599..b136ac20b1 100644 --- a/pkg/genericapiserver/routes/BUILD +++ b/pkg/genericapiserver/routes/BUILD @@ -22,7 +22,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", - "//pkg/genericapiserver/api/metrics:go_default_library", "//pkg/genericapiserver/mux:go_default_library", "//pkg/genericapiserver/openapi:go_default_library", "//pkg/genericapiserver/routes/data/swagger:go_default_library", @@ -34,6 +33,7 @@ go_library( "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/genericapiserver/openapi/common", + "//vendor:k8s.io/apiserver/pkg/metrics", "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics", ], ) diff --git a/pkg/genericapiserver/routes/metrics.go b/pkg/genericapiserver/routes/metrics.go index a9cfcb68b8..8ea28de7b6 100644 --- a/pkg/genericapiserver/routes/metrics.go +++ b/pkg/genericapiserver/routes/metrics.go @@ -20,8 +20,8 @@ import ( "io" "net/http" + apimetrics "k8s.io/apiserver/pkg/metrics" etcdmetrics "k8s.io/apiserver/pkg/storage/etcd/metrics" - apimetrics "k8s.io/kubernetes/pkg/genericapiserver/api/metrics" "k8s.io/kubernetes/pkg/genericapiserver/mux" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/kubeapiserver/authenticator/BUILD b/pkg/kubeapiserver/authenticator/BUILD index cd3e65c878..a528db756e 100644 --- a/pkg/kubeapiserver/authenticator/BUILD +++ b/pkg/kubeapiserver/authenticator/BUILD @@ -18,7 +18,6 @@ go_library( "//plugin/pkg/auth/authenticator/password/keystone:go_default_library", "//plugin/pkg/auth/authenticator/password/passwordfile:go_default_library", "//plugin/pkg/auth/authenticator/request/basicauth:go_default_library", - "//plugin/pkg/auth/authenticator/request/headerrequest:go_default_library", "//plugin/pkg/auth/authenticator/token/anytoken:go_default_library", "//plugin/pkg/auth/authenticator/token/oidc:go_default_library", "//plugin/pkg/auth/authenticator/token/webhook:go_default_library", @@ -27,6 +26,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authentication/group", "//vendor:k8s.io/apiserver/pkg/authentication/request/anonymous", "//vendor:k8s.io/apiserver/pkg/authentication/request/bearertoken", + "//vendor:k8s.io/apiserver/pkg/authentication/request/headerrequest", "//vendor:k8s.io/apiserver/pkg/authentication/request/union", "//vendor:k8s.io/apiserver/pkg/authentication/request/x509", "//vendor:k8s.io/apiserver/pkg/authentication/token/tokenfile", diff --git a/pkg/kubeapiserver/authenticator/config.go b/pkg/kubeapiserver/authenticator/config.go index 807f4a1697..c442758945 100644 --- a/pkg/kubeapiserver/authenticator/config.go +++ b/pkg/kubeapiserver/authenticator/config.go @@ -25,6 +25,7 @@ import ( "k8s.io/apiserver/pkg/authentication/group" "k8s.io/apiserver/pkg/authentication/request/anonymous" "k8s.io/apiserver/pkg/authentication/request/bearertoken" + "k8s.io/apiserver/pkg/authentication/request/headerrequest" "k8s.io/apiserver/pkg/authentication/request/union" "k8s.io/apiserver/pkg/authentication/request/x509" "k8s.io/apiserver/pkg/authentication/token/tokenfile" @@ -35,7 +36,6 @@ import ( "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/keystone" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/passwordfile" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/basicauth" - "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/headerrequest" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/anytoken" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook" diff --git a/pkg/kubelet/server/remotecommand/BUILD b/pkg/kubelet/server/remotecommand/BUILD index 96ef9885f4..023acb3a24 100644 --- a/pkg/kubelet/server/remotecommand/BUILD +++ b/pkg/kubelet/server/remotecommand/BUILD @@ -25,12 +25,12 @@ go_library( "//pkg/util/httpstream:go_default_library", "//pkg/util/httpstream/spdy:go_default_library", "//pkg/util/term:go_default_library", - "//pkg/util/wsstream:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apiserver/pkg/httplog", + "//vendor:k8s.io/apiserver/pkg/util/wsstream", ], ) diff --git a/pkg/kubelet/server/remotecommand/httpstream.go b/pkg/kubelet/server/remotecommand/httpstream.go index dca3d596ee..370091a515 100644 --- a/pkg/kubelet/server/remotecommand/httpstream.go +++ b/pkg/kubelet/server/remotecommand/httpstream.go @@ -26,12 +26,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/apiserver/pkg/util/wsstream" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream/spdy" "k8s.io/kubernetes/pkg/util/term" - "k8s.io/kubernetes/pkg/util/wsstream" "github.com/golang/glog" ) diff --git a/pkg/kubelet/server/remotecommand/websocket.go b/pkg/kubelet/server/remotecommand/websocket.go index f30d611ad2..d8b9644e03 100644 --- a/pkg/kubelet/server/remotecommand/websocket.go +++ b/pkg/kubelet/server/remotecommand/websocket.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/httplog" - "k8s.io/kubernetes/pkg/util/wsstream" + "k8s.io/apiserver/pkg/util/wsstream" ) const ( diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 611b43c554..cd0bcae9af 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -116,7 +116,6 @@ go_test( "//pkg/client/testing/core:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/genericapiserver:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/util/intstr:go_default_library", @@ -131,6 +130,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index cce208eaff..8941bda846 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apiv1 "k8s.io/kubernetes/pkg/api/v1" @@ -48,7 +49,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/genericapiserver" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/version" diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index 643ac8295c..dc2238edce 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -18,7 +18,6 @@ go_library( "//pkg/genericapiserver:go_default_library", "//pkg/genericapiserver/api:go_default_library", "//pkg/genericapiserver/api/handlers:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/extensions/rest:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata/storage:go_default_library", @@ -29,6 +28,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index a1936aec06..598c63cdc0 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -27,13 +27,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver" genericapi "k8s.io/kubernetes/pkg/genericapiserver/api" genericapihandlers "k8s.io/kubernetes/pkg/genericapiserver/api/handlers" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" thirdpartyresourcedatastore "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/storage" diff --git a/pkg/registry/apps/petset/BUILD b/pkg/registry/apps/petset/BUILD index fed6afacd6..355be3678b 100644 --- a/pkg/registry/apps/petset/BUILD +++ b/pkg/registry/apps/petset/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -37,8 +37,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/apps/petset/storage/BUILD b/pkg/registry/apps/petset/storage/BUILD index 7a71673d4c..949392621e 100644 --- a/pkg/registry/apps/petset/storage/BUILD +++ b/pkg/registry/apps/petset/storage/BUILD @@ -18,12 +18,12 @@ go_test( "//pkg/api/rest:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -34,12 +34,12 @@ go_library( deps = [ "//pkg/api/rest:go_default_library", "//pkg/apis/apps:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/apps/petset:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/apps/petset/storage/storage.go b/pkg/registry/apps/petset/storage/storage.go index 6ad170baf7..d1711e98c9 100644 --- a/pkg/registry/apps/petset/storage/storage.go +++ b/pkg/registry/apps/petset/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/rest" appsapi "k8s.io/kubernetes/pkg/apis/apps" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/apps/petset" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/apps/petset/storage/storage_test.go b/pkg/registry/apps/petset/storage/storage_test.go index e4c96672e6..de7a3ef0b9 100644 --- a/pkg/registry/apps/petset/storage/storage_test.go +++ b/pkg/registry/apps/petset/storage/storage_test.go @@ -21,11 +21,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/apps/petset/strategy.go b/pkg/registry/apps/petset/strategy.go index e49f76dd7d..dea1b3607d 100644 --- a/pkg/registry/apps/petset/strategy.go +++ b/pkg/registry/apps/petset/strategy.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/apps/petset/strategy_test.go b/pkg/registry/apps/petset/strategy_test.go index 3be34d673f..31b4d457e8 100644 --- a/pkg/registry/apps/petset/strategy_test.go +++ b/pkg/registry/apps/petset/strategy_test.go @@ -20,9 +20,9 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestStatefulSetStrategy(t *testing.T) { diff --git a/pkg/registry/authentication/tokenreview/BUILD b/pkg/registry/authentication/tokenreview/BUILD index 0c429531cb..fe6f1b7463 100644 --- a/pkg/registry/authentication/tokenreview/BUILD +++ b/pkg/registry/authentication/tokenreview/BUILD @@ -14,9 +14,9 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/apis/authentication:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/authentication/tokenreview/storage.go b/pkg/registry/authentication/tokenreview/storage.go index bc8ac1f161..a7926aeeae 100644 --- a/pkg/registry/authentication/tokenreview/storage.go +++ b/pkg/registry/authentication/tokenreview/storage.go @@ -22,9 +22,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authentication/authenticator" + genericapirequest "k8s.io/apiserver/pkg/request" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/apis/authentication" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) type REST struct { diff --git a/pkg/registry/authorization/localsubjectaccessreview/BUILD b/pkg/registry/authorization/localsubjectaccessreview/BUILD index 143b1f9732..19d72855e4 100644 --- a/pkg/registry/authorization/localsubjectaccessreview/BUILD +++ b/pkg/registry/authorization/localsubjectaccessreview/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/authorization/util:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/authorization/localsubjectaccessreview/rest.go b/pkg/registry/authorization/localsubjectaccessreview/rest.go index 46d98db86e..1aa01d3b50 100644 --- a/pkg/registry/authorization/localsubjectaccessreview/rest.go +++ b/pkg/registry/authorization/localsubjectaccessreview/rest.go @@ -21,10 +21,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" + genericapirequest "k8s.io/apiserver/pkg/request" kapierrors "k8s.io/kubernetes/pkg/api/errors" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util" ) diff --git a/pkg/registry/authorization/selfsubjectaccessreview/BUILD b/pkg/registry/authorization/selfsubjectaccessreview/BUILD index 143b1f9732..19d72855e4 100644 --- a/pkg/registry/authorization/selfsubjectaccessreview/BUILD +++ b/pkg/registry/authorization/selfsubjectaccessreview/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/authorization/util:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/authorization/selfsubjectaccessreview/rest.go b/pkg/registry/authorization/selfsubjectaccessreview/rest.go index 589d2a1c0b..a36ef7aa02 100644 --- a/pkg/registry/authorization/selfsubjectaccessreview/rest.go +++ b/pkg/registry/authorization/selfsubjectaccessreview/rest.go @@ -21,10 +21,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" + genericapirequest "k8s.io/apiserver/pkg/request" apierrors "k8s.io/kubernetes/pkg/api/errors" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util" ) diff --git a/pkg/registry/authorization/subjectaccessreview/BUILD b/pkg/registry/authorization/subjectaccessreview/BUILD index 143b1f9732..19d72855e4 100644 --- a/pkg/registry/authorization/subjectaccessreview/BUILD +++ b/pkg/registry/authorization/subjectaccessreview/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/authorization/util:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/authorization/subjectaccessreview/rest.go b/pkg/registry/authorization/subjectaccessreview/rest.go index 6d49c732e1..eb1aea5de7 100644 --- a/pkg/registry/authorization/subjectaccessreview/rest.go +++ b/pkg/registry/authorization/subjectaccessreview/rest.go @@ -21,10 +21,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" + genericapirequest "k8s.io/apiserver/pkg/request" kapierrors "k8s.io/kubernetes/pkg/api/errors" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util" ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD index ae9bcf9241..c69c637487 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD @@ -20,11 +20,11 @@ go_library( "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD index d406aab946..0515d8a849 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD @@ -33,12 +33,12 @@ go_library( deps = [ "//pkg/api/rest:go_default_library", "//pkg/apis/autoscaling:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go index c2767ddbef..1457c87db2 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go b/pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go index 6fad078e6a..a0de713513 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/batch/cronjob/BUILD b/pkg/registry/batch/cronjob/BUILD index 6b29e468dd..ca8eb4b424 100644 --- a/pkg/registry/batch/cronjob/BUILD +++ b/pkg/registry/batch/cronjob/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -38,8 +38,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/batch/cronjob/storage/BUILD b/pkg/registry/batch/cronjob/storage/BUILD index 16946e428f..0eb1f8a874 100644 --- a/pkg/registry/batch/cronjob/storage/BUILD +++ b/pkg/registry/batch/cronjob/storage/BUILD @@ -34,12 +34,12 @@ go_library( deps = [ "//pkg/api/rest:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/batch/cronjob:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/batch/cronjob/storage/storage.go b/pkg/registry/batch/cronjob/storage/storage.go index c864852308..447abe105a 100644 --- a/pkg/registry/batch/cronjob/storage/storage.go +++ b/pkg/registry/batch/cronjob/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/batch/cronjob" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/batch/cronjob/strategy.go b/pkg/registry/batch/cronjob/strategy.go index 182774dbbb..4a5df12f7e 100644 --- a/pkg/registry/batch/cronjob/strategy.go +++ b/pkg/registry/batch/cronjob/strategy.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/batch/cronjob/strategy_test.go b/pkg/registry/batch/cronjob/strategy_test.go index 32eec7b5dd..ddaa145503 100644 --- a/pkg/registry/batch/cronjob/strategy_test.go +++ b/pkg/registry/batch/cronjob/strategy_test.go @@ -20,10 +20,10 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/apis/batch" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func newBool(a bool) *bool { diff --git a/pkg/registry/batch/job/BUILD b/pkg/registry/batch/job/BUILD index acb5c2a111..0f3b6f2a58 100644 --- a/pkg/registry/batch/job/BUILD +++ b/pkg/registry/batch/job/BUILD @@ -20,13 +20,13 @@ go_library( "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -40,9 +40,9 @@ go_test( "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/batch/job/storage/BUILD b/pkg/registry/batch/job/storage/BUILD index 5486017e8a..179a7f7972 100644 --- a/pkg/registry/batch/job/storage/BUILD +++ b/pkg/registry/batch/job/storage/BUILD @@ -33,12 +33,12 @@ go_library( deps = [ "//pkg/api/rest:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/batch/job:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/batch/job/storage/storage.go b/pkg/registry/batch/job/storage/storage.go index e7680b005b..9d28f40b70 100644 --- a/pkg/registry/batch/job/storage/storage.go +++ b/pkg/registry/batch/job/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/batch/job" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/batch/job/strategy.go b/pkg/registry/batch/job/strategy.go index cc315c4d33..ae2255f3c9 100644 --- a/pkg/registry/batch/job/strategy.go +++ b/pkg/registry/batch/job/strategy.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/batch/job/strategy_test.go b/pkg/registry/batch/job/strategy_test.go index cb22550568..aa1b4627ca 100644 --- a/pkg/registry/batch/job/strategy_test.go +++ b/pkg/registry/batch/job/strategy_test.go @@ -22,11 +22,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/apis/batch" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func newBool(a bool) *bool { diff --git a/pkg/registry/certificates/certificates/BUILD b/pkg/registry/certificates/certificates/BUILD index 78977e520f..b12c980883 100644 --- a/pkg/registry/certificates/certificates/BUILD +++ b/pkg/registry/certificates/certificates/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -30,6 +29,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -40,10 +40,10 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/apis/certificates:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/certificates/certificates/registry.go b/pkg/registry/certificates/certificates/registry.go index de0d4acfd8..112ab4cc98 100644 --- a/pkg/registry/certificates/certificates/registry.go +++ b/pkg/registry/certificates/certificates/registry.go @@ -19,10 +19,10 @@ package certificates import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/certificates" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store CSRs. diff --git a/pkg/registry/certificates/certificates/storage/BUILD b/pkg/registry/certificates/certificates/storage/BUILD index 5c364cee88..c58807acfa 100644 --- a/pkg/registry/certificates/certificates/storage/BUILD +++ b/pkg/registry/certificates/certificates/storage/BUILD @@ -14,11 +14,11 @@ go_library( deps = [ "//pkg/api/rest:go_default_library", "//pkg/apis/certificates:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/certificates/certificates:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/certificates/certificates/storage/storage.go b/pkg/registry/certificates/certificates/storage/storage.go index 5eab915449..f1471d9fe2 100644 --- a/pkg/registry/certificates/certificates/storage/storage.go +++ b/pkg/registry/certificates/certificates/storage/storage.go @@ -18,9 +18,9 @@ package storage import ( "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/certificates" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" csrregistry "k8s.io/kubernetes/pkg/registry/certificates/certificates" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/certificates/certificates/strategy.go b/pkg/registry/certificates/certificates/strategy.go index fa292e2af5..9171c54aa8 100644 --- a/pkg/registry/certificates/certificates/strategy.go +++ b/pkg/registry/certificates/certificates/strategy.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/certificates/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/certificates/certificates/strategy_test.go b/pkg/registry/certificates/certificates/strategy_test.go index 0c582e829b..7dacc7df84 100644 --- a/pkg/registry/certificates/certificates/strategy_test.go +++ b/pkg/registry/certificates/certificates/strategy_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apiserver/pkg/authentication/user" + genericapirequest "k8s.io/apiserver/pkg/request" certapi "k8s.io/kubernetes/pkg/apis/certificates" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestStrategyCreate(t *testing.T) { diff --git a/pkg/registry/core/componentstatus/BUILD b/pkg/registry/core/componentstatus/BUILD index 86951b1926..dc281019df 100644 --- a/pkg/registry/core/componentstatus/BUILD +++ b/pkg/registry/core/componentstatus/BUILD @@ -18,12 +18,12 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/probe:go_default_library", "//pkg/probe/http:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -37,10 +37,10 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/probe:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/componentstatus/rest.go b/pkg/registry/core/componentstatus/rest.go index 0a4eea9cda..c0d0be566a 100644 --- a/pkg/registry/core/componentstatus/rest.go +++ b/pkg/registry/core/componentstatus/rest.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/probe" httpprober "k8s.io/kubernetes/pkg/probe/http" ) diff --git a/pkg/registry/core/componentstatus/rest_test.go b/pkg/registry/core/componentstatus/rest_test.go index 17162c921e..f5e990cb41 100644 --- a/pkg/registry/core/componentstatus/rest_test.go +++ b/pkg/registry/core/componentstatus/rest_test.go @@ -28,8 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/diff" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/probe" ) diff --git a/pkg/registry/core/configmap/BUILD b/pkg/registry/core/configmap/BUILD index 4e168df984..340b326b5c 100644 --- a/pkg/registry/core/configmap/BUILD +++ b/pkg/registry/core/configmap/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -29,6 +28,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -40,7 +40,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/configmap/registry.go b/pkg/registry/core/configmap/registry.go index b759056646..365c93063e 100644 --- a/pkg/registry/core/configmap/registry.go +++ b/pkg/registry/core/configmap/registry.go @@ -19,9 +19,9 @@ package configmap import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store ConfigMaps. diff --git a/pkg/registry/core/configmap/strategy.go b/pkg/registry/core/configmap/strategy.go index 8e2bd0d3a4..6a5fdf00fe 100644 --- a/pkg/registry/core/configmap/strategy.go +++ b/pkg/registry/core/configmap/strategy.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/configmap/strategy_test.go b/pkg/registry/core/configmap/strategy_test.go index 063b7ce569..79b816e21f 100644 --- a/pkg/registry/core/configmap/strategy_test.go +++ b/pkg/registry/core/configmap/strategy_test.go @@ -19,9 +19,9 @@ package configmap import ( "testing" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestConfigMapStrategy(t *testing.T) { diff --git a/pkg/registry/core/controller/BUILD b/pkg/registry/core/controller/BUILD index 4b89e61c62..7f58dc1bc9 100644 --- a/pkg/registry/core/controller/BUILD +++ b/pkg/registry/core/controller/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -29,6 +28,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -40,7 +40,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/controller/registry.go b/pkg/registry/core/controller/registry.go index 85b130528e..7fe7ccb03f 100644 --- a/pkg/registry/core/controller/registry.go +++ b/pkg/registry/core/controller/registry.go @@ -23,9 +23,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store ReplicationControllers. diff --git a/pkg/registry/core/controller/storage/BUILD b/pkg/registry/core/controller/storage/BUILD index a1234d22aa..88de8a18cc 100644 --- a/pkg/registry/core/controller/storage/BUILD +++ b/pkg/registry/core/controller/storage/BUILD @@ -19,7 +19,6 @@ go_test( "//pkg/api/rest:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -27,6 +26,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -40,13 +40,13 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/controller:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/controller/storage/storage.go b/pkg/registry/core/controller/storage/storage.go index 94fc1e401f..0eb91fdd4e 100644 --- a/pkg/registry/core/controller/storage/storage.go +++ b/pkg/registry/core/controller/storage/storage.go @@ -24,12 +24,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling/validation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/controller" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/controller/storage/storage_test.go b/pkg/registry/core/controller/storage/storage_test.go index 4e9ba57c03..89deedc54f 100644 --- a/pkg/registry/core/controller/storage/storage_test.go +++ b/pkg/registry/core/controller/storage/storage_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/core/controller/strategy.go b/pkg/registry/core/controller/strategy.go index 073b9eba5f..f000dd66be 100644 --- a/pkg/registry/core/controller/strategy.go +++ b/pkg/registry/core/controller/strategy.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/controller/strategy_test.go b/pkg/registry/core/controller/strategy_test.go index c13dfb778d..7ce0c5248c 100644 --- a/pkg/registry/core/controller/strategy_test.go +++ b/pkg/registry/core/controller/strategy_test.go @@ -19,9 +19,9 @@ package controller import ( "testing" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestControllerStrategy(t *testing.T) { diff --git a/pkg/registry/core/endpoint/BUILD b/pkg/registry/core/endpoint/BUILD index 3c00d448d0..a8d43d53d8 100644 --- a/pkg/registry/core/endpoint/BUILD +++ b/pkg/registry/core/endpoint/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -30,6 +29,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/endpoint/registry.go b/pkg/registry/core/endpoint/registry.go index c5da891e03..67400fc844 100644 --- a/pkg/registry/core/endpoint/registry.go +++ b/pkg/registry/core/endpoint/registry.go @@ -19,9 +19,9 @@ package endpoint import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store endpoints. diff --git a/pkg/registry/core/endpoint/strategy.go b/pkg/registry/core/endpoint/strategy.go index 7bd210be1b..ff289211d8 100644 --- a/pkg/registry/core/endpoint/strategy.go +++ b/pkg/registry/core/endpoint/strategy.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" endptspkg "k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" pkgstorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/event/BUILD b/pkg/registry/core/event/BUILD index 45f6461bc8..c32af53cd4 100644 --- a/pkg/registry/core/event/BUILD +++ b/pkg/registry/core/event/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/event/strategy.go b/pkg/registry/core/event/strategy.go index eb5d28d1b6..f09b36bc02 100644 --- a/pkg/registry/core/event/strategy.go +++ b/pkg/registry/core/event/strategy.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/limitrange/BUILD b/pkg/registry/core/limitrange/BUILD index d54f36e08e..acd3bbdaa7 100644 --- a/pkg/registry/core/limitrange/BUILD +++ b/pkg/registry/core/limitrange/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/limitrange/strategy.go b/pkg/registry/core/limitrange/strategy.go index 728479fe87..0fd044f9e3 100644 --- a/pkg/registry/core/limitrange/strategy.go +++ b/pkg/registry/core/limitrange/strategy.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/util/uuid" ) diff --git a/pkg/registry/core/namespace/BUILD b/pkg/registry/core/namespace/BUILD index f8760dbcc9..1d73c3fd7b 100644 --- a/pkg/registry/core/namespace/BUILD +++ b/pkg/registry/core/namespace/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -29,6 +28,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -40,8 +40,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/namespace/registry.go b/pkg/registry/core/namespace/registry.go index 81df6d6860..cda161e414 100644 --- a/pkg/registry/core/namespace/registry.go +++ b/pkg/registry/core/namespace/registry.go @@ -19,9 +19,9 @@ package namespace import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface implemented by things that know how to store Namespace objects. diff --git a/pkg/registry/core/namespace/storage/BUILD b/pkg/registry/core/namespace/storage/BUILD index a0a8db6eea..e8f0c41036 100644 --- a/pkg/registry/core/namespace/storage/BUILD +++ b/pkg/registry/core/namespace/storage/BUILD @@ -16,12 +16,12 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -34,13 +34,13 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/errors/storage:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/namespace:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/namespace/storage/storage.go b/pkg/registry/core/namespace/storage/storage.go index c1d17a2537..8d590477b5 100644 --- a/pkg/registry/core/namespace/storage/storage.go +++ b/pkg/registry/core/namespace/storage/storage.go @@ -21,11 +21,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" storageerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/namespace" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/namespace/storage/storage_test.go b/pkg/registry/core/namespace/storage/storage_test.go index 1334e4ef6f..c8be34506f 100644 --- a/pkg/registry/core/namespace/storage/storage_test.go +++ b/pkg/registry/core/namespace/storage/storage_test.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/core/namespace/strategy.go b/pkg/registry/core/namespace/strategy.go index e694eba28f..2202359e82 100644 --- a/pkg/registry/core/namespace/strategy.go +++ b/pkg/registry/core/namespace/strategy.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/namespace/strategy_test.go b/pkg/registry/core/namespace/strategy_test.go index 3707949752..f3e481e2be 100644 --- a/pkg/registry/core/namespace/strategy_test.go +++ b/pkg/registry/core/namespace/strategy_test.go @@ -20,9 +20,9 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestNamespaceStrategy(t *testing.T) { diff --git a/pkg/registry/core/node/BUILD b/pkg/registry/core/node/BUILD index 3dfd15ea2b..ad04f149ec 100644 --- a/pkg/registry/core/node/BUILD +++ b/pkg/registry/core/node/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", @@ -33,6 +32,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/node/registry.go b/pkg/registry/core/node/registry.go index 07b385b4d8..a316ccf2e7 100644 --- a/pkg/registry/core/node/registry.go +++ b/pkg/registry/core/node/registry.go @@ -19,9 +19,9 @@ package node import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store node. diff --git a/pkg/registry/core/node/rest/BUILD b/pkg/registry/core/node/rest/BUILD index d7780d439d..4b776cc984 100644 --- a/pkg/registry/core/node/rest/BUILD +++ b/pkg/registry/core/node/rest/BUILD @@ -15,12 +15,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/capabilities:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/node:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/registry/generic/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/node/rest/proxy.go b/pkg/registry/core/node/rest/proxy.go index 0e23928888..139612572e 100644 --- a/pkg/registry/core/node/rest/proxy.go +++ b/pkg/registry/core/node/rest/proxy.go @@ -23,10 +23,10 @@ import ( "path" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/capabilities" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/node" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/node/storage/BUILD b/pkg/registry/core/node/storage/BUILD index aebe293739..6980b976dc 100644 --- a/pkg/registry/core/node/storage/BUILD +++ b/pkg/registry/core/node/storage/BUILD @@ -34,7 +34,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/node:go_default_library", "//pkg/registry/core/node/rest:go_default_library", @@ -42,6 +41,7 @@ go_library( "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/node/storage/storage.go b/pkg/registry/core/node/storage/storage.go index ddc2403c52..237915c876 100644 --- a/pkg/registry/core/node/storage/storage.go +++ b/pkg/registry/core/node/storage/storage.go @@ -23,10 +23,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/v1" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/node" noderest "k8s.io/kubernetes/pkg/registry/core/node/rest" diff --git a/pkg/registry/core/node/strategy.go b/pkg/registry/core/node/strategy.go index 87de881775..cc7088ffe7 100644 --- a/pkg/registry/core/node/strategy.go +++ b/pkg/registry/core/node/strategy.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/types" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/generic" pkgstorage "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/core/persistentvolume/BUILD b/pkg/registry/core/persistentvolume/BUILD index c146e31132..456e80e12e 100644 --- a/pkg/registry/core/persistentvolume/BUILD +++ b/pkg/registry/core/persistentvolume/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/persistentvolume/storage/BUILD b/pkg/registry/core/persistentvolume/storage/BUILD index b08d38dc70..ee97b378d0 100644 --- a/pkg/registry/core/persistentvolume/storage/BUILD +++ b/pkg/registry/core/persistentvolume/storage/BUILD @@ -18,7 +18,6 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -26,6 +25,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -36,12 +36,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/persistentvolume:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/persistentvolume/storage/storage.go b/pkg/registry/core/persistentvolume/storage/storage.go index d79e8ff23c..de9603229e 100644 --- a/pkg/registry/core/persistentvolume/storage/storage.go +++ b/pkg/registry/core/persistentvolume/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/persistentvolume" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/persistentvolume/storage/storage_test.go b/pkg/registry/core/persistentvolume/storage/storage_test.go index d50d49546a..fb2736b928 100644 --- a/pkg/registry/core/persistentvolume/storage/storage_test.go +++ b/pkg/registry/core/persistentvolume/storage/storage_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/core/persistentvolume/strategy.go b/pkg/registry/core/persistentvolume/strategy.go index 98e7dd3faf..c4afa7ed59 100644 --- a/pkg/registry/core/persistentvolume/strategy.go +++ b/pkg/registry/core/persistentvolume/strategy.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/persistentvolumeclaim/BUILD b/pkg/registry/core/persistentvolumeclaim/BUILD index ae9e39e98f..9cce2a0a79 100644 --- a/pkg/registry/core/persistentvolumeclaim/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/persistentvolumeclaim/storage/BUILD b/pkg/registry/core/persistentvolumeclaim/storage/BUILD index af9dc0af2c..7a956c4a1c 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/storage/BUILD @@ -18,7 +18,6 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -26,6 +25,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -36,12 +36,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/persistentvolumeclaim:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/persistentvolumeclaim/storage/storage.go b/pkg/registry/core/persistentvolumeclaim/storage/storage.go index 10b0609ca6..b0996a4581 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go index 369a07655c..15f71e0378 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/core/persistentvolumeclaim/strategy.go b/pkg/registry/core/persistentvolumeclaim/strategy.go index 458ec954c2..a4c2e619e6 100644 --- a/pkg/registry/core/persistentvolumeclaim/strategy.go +++ b/pkg/registry/core/persistentvolumeclaim/strategy.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/pod/BUILD b/pkg/registry/core/pod/BUILD index 6f6380ca96..feaf1ab1ed 100644 --- a/pkg/registry/core/pod/BUILD +++ b/pkg/registry/core/pod/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/registry/generic:go_default_library", @@ -31,6 +30,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -45,10 +45,10 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/pod/rest/BUILD b/pkg/registry/core/pod/rest/BUILD index ee5c678f0c..406bc09915 100644 --- a/pkg/registry/core/pod/rest/BUILD +++ b/pkg/registry/core/pod/rest/BUILD @@ -21,12 +21,12 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/capabilities:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/pod:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/registry/generic/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -38,10 +38,10 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/registry/registrytest:go_default_library", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/pod/rest/log.go b/pkg/registry/core/pod/rest/log.go index 9bcc007bb8..a05e694e95 100644 --- a/pkg/registry/core/pod/rest/log.go +++ b/pkg/registry/core/pod/rest/log.go @@ -20,11 +20,11 @@ import ( "fmt" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/pod/rest/log_test.go b/pkg/registry/core/pod/rest/log_test.go index b087a2e469..f5992cf834 100644 --- a/pkg/registry/core/pod/rest/log_test.go +++ b/pkg/registry/core/pod/rest/log_test.go @@ -19,9 +19,9 @@ package rest import ( "testing" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/registrytest" diff --git a/pkg/registry/core/pod/rest/subresources.go b/pkg/registry/core/pod/rest/subresources.go index b620ae5a51..a85df709a6 100644 --- a/pkg/registry/core/pod/rest/subresources.go +++ b/pkg/registry/core/pod/rest/subresources.go @@ -23,10 +23,10 @@ import ( "path" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/capabilities" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/pod/storage/BUILD b/pkg/registry/core/pod/storage/BUILD index 4c7f0520f7..85c66d217e 100644 --- a/pkg/registry/core/pod/storage/BUILD +++ b/pkg/registry/core/pod/storage/BUILD @@ -19,7 +19,6 @@ go_test( "//pkg/api/errors/storage:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/securitycontext:go_default_library", @@ -30,6 +29,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -49,7 +49,6 @@ go_library( "//pkg/apis/policy:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/client/retry:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/core/pod:go_default_library", "//pkg/registry/core/pod/rest:go_default_library", @@ -60,6 +59,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/pod/storage/eviction.go b/pkg/registry/core/pod/storage/eviction.go index 2559ba2d29..37835b6151 100644 --- a/pkg/registry/core/pod/storage/eviction.go +++ b/pkg/registry/core/pod/storage/eviction.go @@ -24,13 +24,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/policy" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/client/retry" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) diff --git a/pkg/registry/core/pod/storage/storage.go b/pkg/registry/core/pod/storage/storage.go index 3c292d3dd8..9515de22ed 100644 --- a/pkg/registry/core/pod/storage/storage.go +++ b/pkg/registry/core/pod/storage/storage.go @@ -23,13 +23,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" podrest "k8s.io/kubernetes/pkg/registry/core/pod/rest" diff --git a/pkg/registry/core/pod/storage/storage_test.go b/pkg/registry/core/pod/storage/storage_test.go index 9cf3a213ac..5a9c85bde1 100644 --- a/pkg/registry/core/pod/storage/storage_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/securitycontext" diff --git a/pkg/registry/core/pod/strategy.go b/pkg/registry/core/pod/strategy.go index 77ea065261..b5a8cc6f4b 100644 --- a/pkg/registry/core/pod/strategy.go +++ b/pkg/registry/core/pod/strategy.go @@ -31,11 +31,11 @@ import ( "k8s.io/apimachinery/pkg/types" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/kubelet/qos" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/core/pod/strategy_test.go b/pkg/registry/core/pod/strategy_test.go index 9708ea1747..66eabe0863 100644 --- a/pkg/registry/core/pod/strategy_test.go +++ b/pkg/registry/core/pod/strategy_test.go @@ -23,12 +23,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestMatchPod(t *testing.T) { diff --git a/pkg/registry/core/podtemplate/BUILD b/pkg/registry/core/podtemplate/BUILD index dc9ee40944..d0cddc9e57 100644 --- a/pkg/registry/core/podtemplate/BUILD +++ b/pkg/registry/core/podtemplate/BUILD @@ -19,11 +19,11 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/podtemplate/strategy.go b/pkg/registry/core/podtemplate/strategy.go index ced662628a..f65f560925 100644 --- a/pkg/registry/core/podtemplate/strategy.go +++ b/pkg/registry/core/podtemplate/strategy.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/resourcequota/BUILD b/pkg/registry/core/resourcequota/BUILD index bd19912e71..3771ab9298 100644 --- a/pkg/registry/core/resourcequota/BUILD +++ b/pkg/registry/core/resourcequota/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -37,7 +37,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/resourcequota/storage/BUILD b/pkg/registry/core/resourcequota/storage/BUILD index ba25ca578d..c75aff61b5 100644 --- a/pkg/registry/core/resourcequota/storage/BUILD +++ b/pkg/registry/core/resourcequota/storage/BUILD @@ -18,13 +18,13 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -35,12 +35,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/resourcequota:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/resourcequota/storage/storage.go b/pkg/registry/core/resourcequota/storage/storage.go index b70cfaabae..c03aca3070 100644 --- a/pkg/registry/core/resourcequota/storage/storage.go +++ b/pkg/registry/core/resourcequota/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/resourcequota" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/resourcequota/storage/storage_test.go b/pkg/registry/core/resourcequota/storage/storage_test.go index 0e1c2f3978..8f088fc055 100644 --- a/pkg/registry/core/resourcequota/storage/storage_test.go +++ b/pkg/registry/core/resourcequota/storage/storage_test.go @@ -22,11 +22,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/diff" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/core/resourcequota/strategy.go b/pkg/registry/core/resourcequota/strategy.go index 14bce59e08..1bf4e590b8 100644 --- a/pkg/registry/core/resourcequota/strategy.go +++ b/pkg/registry/core/resourcequota/strategy.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/resourcequota/strategy_test.go b/pkg/registry/core/resourcequota/strategy_test.go index 548b45532a..c7fc10cd1f 100644 --- a/pkg/registry/core/resourcequota/strategy_test.go +++ b/pkg/registry/core/resourcequota/strategy_test.go @@ -19,10 +19,10 @@ package resourcequota import ( "testing" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" apitesting "k8s.io/kubernetes/pkg/api/testing" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestResourceQuotaStrategy(t *testing.T) { diff --git a/pkg/registry/core/secret/BUILD b/pkg/registry/core/secret/BUILD index 82beb05e0f..4f004fe947 100644 --- a/pkg/registry/core/secret/BUILD +++ b/pkg/registry/core/secret/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -30,6 +29,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -41,8 +41,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/secret/registry.go b/pkg/registry/core/secret/registry.go index 31057803f0..0120b11872 100644 --- a/pkg/registry/core/secret/registry.go +++ b/pkg/registry/core/secret/registry.go @@ -19,9 +19,9 @@ package secret import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface implemented by things that know how to store Secret objects. diff --git a/pkg/registry/core/secret/strategy.go b/pkg/registry/core/secret/strategy.go index a9e2de6a94..14991fbde4 100644 --- a/pkg/registry/core/secret/strategy.go +++ b/pkg/registry/core/secret/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/secret/strategy_test.go b/pkg/registry/core/secret/strategy_test.go index e5d24b7d2e..274b2aade7 100644 --- a/pkg/registry/core/secret/strategy_test.go +++ b/pkg/registry/core/secret/strategy_test.go @@ -21,9 +21,9 @@ import ( "testing" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestExportSecret(t *testing.T) { diff --git a/pkg/registry/core/service/BUILD b/pkg/registry/core/service/BUILD index e04f5c96f9..ea4f8bacfe 100644 --- a/pkg/registry/core/service/BUILD +++ b/pkg/registry/core/service/BUILD @@ -26,7 +26,6 @@ go_library( "//pkg/api/validation:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/endpoint:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", @@ -42,6 +41,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -59,7 +59,6 @@ go_test( "//pkg/api/rest:go_default_library", "//pkg/api/service:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -68,6 +67,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/service/proxy.go b/pkg/registry/core/service/proxy.go index 740dfd63ac..5d62bf6e42 100644 --- a/pkg/registry/core/service/proxy.go +++ b/pkg/registry/core/service/proxy.go @@ -23,10 +23,10 @@ import ( "path" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/capabilities" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" genericrest "k8s.io/kubernetes/pkg/registry/generic/rest" ) diff --git a/pkg/registry/core/service/registry.go b/pkg/registry/core/service/registry.go index d0bc22c3d9..2af5c6db2f 100644 --- a/pkg/registry/core/service/registry.go +++ b/pkg/registry/core/service/registry.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store services. diff --git a/pkg/registry/core/service/rest.go b/pkg/registry/core/service/rest.go index f0d49478b3..c7c6a1811a 100644 --- a/pkg/registry/core/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -31,12 +31,12 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" apiservice "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/api/validation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/endpoint" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" diff --git a/pkg/registry/core/service/rest_test.go b/pkg/registry/core/service/rest_test.go index 684f757966..6c9c8de59e 100644 --- a/pkg/registry/core/service/rest_test.go +++ b/pkg/registry/core/service/rest_test.go @@ -24,11 +24,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilnet "k8s.io/apimachinery/pkg/util/net" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/service" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/registry/registrytest" diff --git a/pkg/registry/core/service/storage/BUILD b/pkg/registry/core/service/storage/BUILD index d0a0baecfe..b91b2e89d0 100644 --- a/pkg/registry/core/service/storage/BUILD +++ b/pkg/registry/core/service/storage/BUILD @@ -32,12 +32,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/service:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/service/storage/storage.go b/pkg/registry/core/service/storage/storage.go index 2aeed8dc26..695e333ae9 100644 --- a/pkg/registry/core/service/storage/storage.go +++ b/pkg/registry/core/service/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/service" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/core/service/strategy.go b/pkg/registry/core/service/strategy.go index 5f730c01e6..01822cafae 100644 --- a/pkg/registry/core/service/strategy.go +++ b/pkg/registry/core/service/strategy.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/core/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go index e01a46a9d9..c268944368 100644 --- a/pkg/registry/core/service/strategy_test.go +++ b/pkg/registry/core/service/strategy_test.go @@ -21,11 +21,11 @@ import ( "testing" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" apitesting "k8s.io/kubernetes/pkg/api/testing" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/registry/core/serviceaccount/BUILD b/pkg/registry/core/serviceaccount/BUILD index c62e5874f7..fd7ed585b8 100644 --- a/pkg/registry/core/serviceaccount/BUILD +++ b/pkg/registry/core/serviceaccount/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -29,6 +28,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/core/serviceaccount/registry.go b/pkg/registry/core/serviceaccount/registry.go index daeb747f24..ab3d5777d3 100644 --- a/pkg/registry/core/serviceaccount/registry.go +++ b/pkg/registry/core/serviceaccount/registry.go @@ -19,9 +19,9 @@ package serviceaccount import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface implemented by things that know how to store ServiceAccount objects. diff --git a/pkg/registry/core/serviceaccount/strategy.go b/pkg/registry/core/serviceaccount/strategy.go index 287771c089..f000d04316 100644 --- a/pkg/registry/core/serviceaccount/strategy.go +++ b/pkg/registry/core/serviceaccount/strategy.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/controller/storage/BUILD b/pkg/registry/extensions/controller/storage/BUILD index a4015e4c3f..c0ec3ec3a6 100644 --- a/pkg/registry/extensions/controller/storage/BUILD +++ b/pkg/registry/extensions/controller/storage/BUILD @@ -17,13 +17,13 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/storage/storagebackend/factory:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -37,12 +37,12 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/controller:go_default_library", "//pkg/registry/core/controller/storage:go_default_library", "//pkg/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/controller/storage/storage.go b/pkg/registry/extensions/controller/storage/storage.go index 5f9e011075..d7c1683ae9 100644 --- a/pkg/registry/extensions/controller/storage/storage.go +++ b/pkg/registry/extensions/controller/storage/storage.go @@ -21,12 +21,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/controller" controllerstore "k8s.io/kubernetes/pkg/registry/core/controller/storage" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/controller/storage/storage_test.go b/pkg/registry/extensions/controller/storage/storage_test.go index 0b6ae51c13..1e46d491e3 100644 --- a/pkg/registry/extensions/controller/storage/storage_test.go +++ b/pkg/registry/extensions/controller/storage/storage_test.go @@ -20,10 +20,10 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/extensions/daemonset/BUILD b/pkg/registry/extensions/daemonset/BUILD index f4b2c76383..882e2c478e 100644 --- a/pkg/registry/extensions/daemonset/BUILD +++ b/pkg/registry/extensions/daemonset/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/daemonset/storage/BUILD b/pkg/registry/extensions/daemonset/storage/BUILD index f72f342822..b2aab7902a 100644 --- a/pkg/registry/extensions/daemonset/storage/BUILD +++ b/pkg/registry/extensions/daemonset/storage/BUILD @@ -33,12 +33,12 @@ go_library( deps = [ "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/extensions/daemonset:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/daemonset/storage/storage.go b/pkg/registry/extensions/daemonset/storage/storage.go index 610a0b6259..34cd47ed76 100644 --- a/pkg/registry/extensions/daemonset/storage/storage.go +++ b/pkg/registry/extensions/daemonset/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/extensions/daemonset" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/extensions/daemonset/strategy.go b/pkg/registry/extensions/daemonset/strategy.go index 5482a7c6be..b5624d82f4 100644 --- a/pkg/registry/extensions/daemonset/strategy.go +++ b/pkg/registry/extensions/daemonset/strategy.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/deployment/BUILD b/pkg/registry/extensions/deployment/BUILD index 98e2466f36..80af48ea43 100644 --- a/pkg/registry/extensions/deployment/BUILD +++ b/pkg/registry/extensions/deployment/BUILD @@ -23,13 +23,13 @@ go_library( "//pkg/apis/extensions/validation:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -43,8 +43,8 @@ go_test( "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/deployment/registry.go b/pkg/registry/extensions/deployment/registry.go index a06a2fb04e..4e9b40ec20 100644 --- a/pkg/registry/extensions/deployment/registry.go +++ b/pkg/registry/extensions/deployment/registry.go @@ -20,10 +20,10 @@ import ( "fmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store Deployments. diff --git a/pkg/registry/extensions/deployment/storage/BUILD b/pkg/registry/extensions/deployment/storage/BUILD index ca8cb64db8..b51f1ae5e7 100644 --- a/pkg/registry/extensions/deployment/storage/BUILD +++ b/pkg/registry/extensions/deployment/storage/BUILD @@ -20,7 +20,6 @@ go_test( "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -29,6 +28,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -43,13 +43,13 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/extensions/deployment:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/deployment/storage/storage.go b/pkg/registry/extensions/deployment/storage/storage.go index 92c44aa25c..b5f9b7d9ac 100644 --- a/pkg/registry/extensions/deployment/storage/storage.go +++ b/pkg/registry/extensions/deployment/storage/storage.go @@ -22,13 +22,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/extensions/deployment" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/extensions/deployment/storage/storage_test.go b/pkg/registry/extensions/deployment/storage/storage_test.go index 6ea4de4fa8..900ba38faf 100644 --- a/pkg/registry/extensions/deployment/storage/storage_test.go +++ b/pkg/registry/extensions/deployment/storage/storage_test.go @@ -24,13 +24,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/extensions/deployment/strategy.go b/pkg/registry/extensions/deployment/strategy.go index 712b91bdcc..88cc3ac34b 100644 --- a/pkg/registry/extensions/deployment/strategy.go +++ b/pkg/registry/extensions/deployment/strategy.go @@ -25,13 +25,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/deployment/strategy_test.go b/pkg/registry/extensions/deployment/strategy_test.go index f0ccd9b5c0..92e96df740 100644 --- a/pkg/registry/extensions/deployment/strategy_test.go +++ b/pkg/registry/extensions/deployment/strategy_test.go @@ -21,11 +21,11 @@ import ( "testing" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestSelectableFieldLabelConversions(t *testing.T) { diff --git a/pkg/registry/extensions/ingress/BUILD b/pkg/registry/extensions/ingress/BUILD index 797b0db550..4df0ad0f81 100644 --- a/pkg/registry/extensions/ingress/BUILD +++ b/pkg/registry/extensions/ingress/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -39,8 +39,8 @@ go_test( "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/util/intstr:go_default_library", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/ingress/storage/BUILD b/pkg/registry/extensions/ingress/storage/BUILD index ff6e6a24de..ada4faab33 100644 --- a/pkg/registry/extensions/ingress/storage/BUILD +++ b/pkg/registry/extensions/ingress/storage/BUILD @@ -33,12 +33,12 @@ go_library( deps = [ "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/extensions/ingress:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/ingress/storage/storage.go b/pkg/registry/extensions/ingress/storage/storage.go index 2767d73f3c..1ebec1d3e2 100644 --- a/pkg/registry/extensions/ingress/storage/storage.go +++ b/pkg/registry/extensions/ingress/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/extensions/ingress" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/extensions/ingress/strategy.go b/pkg/registry/extensions/ingress/strategy.go index 5a42ab1c68..9eb056766a 100644 --- a/pkg/registry/extensions/ingress/strategy.go +++ b/pkg/registry/extensions/ingress/strategy.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/ingress/strategy_test.go b/pkg/registry/extensions/ingress/strategy_test.go index ea379c79eb..908c6fbf23 100644 --- a/pkg/registry/extensions/ingress/strategy_test.go +++ b/pkg/registry/extensions/ingress/strategy_test.go @@ -19,11 +19,11 @@ package ingress import ( "testing" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/registry/extensions/networkpolicy/BUILD b/pkg/registry/extensions/networkpolicy/BUILD index 4a8620279f..d6f8c2f3cf 100644 --- a/pkg/registry/extensions/networkpolicy/BUILD +++ b/pkg/registry/extensions/networkpolicy/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -37,8 +37,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/networkpolicy/storage/BUILD b/pkg/registry/extensions/networkpolicy/storage/BUILD index 15fce22d5a..fc248b2fd9 100644 --- a/pkg/registry/extensions/networkpolicy/storage/BUILD +++ b/pkg/registry/extensions/networkpolicy/storage/BUILD @@ -17,7 +17,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -25,6 +24,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/networkpolicy/storage/storage_test.go b/pkg/registry/extensions/networkpolicy/storage/storage_test.go index 4c1104c4a3..987b6384d8 100644 --- a/pkg/registry/extensions/networkpolicy/storage/storage_test.go +++ b/pkg/registry/extensions/networkpolicy/storage/storage_test.go @@ -22,10 +22,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/extensions/networkpolicy/strategy.go b/pkg/registry/extensions/networkpolicy/strategy.go index 5d2c253067..c2030a063e 100644 --- a/pkg/registry/extensions/networkpolicy/strategy.go +++ b/pkg/registry/extensions/networkpolicy/strategy.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/networkpolicy/strategy_test.go b/pkg/registry/extensions/networkpolicy/strategy_test.go index 3661ec37c8..70c8da9ecb 100644 --- a/pkg/registry/extensions/networkpolicy/strategy_test.go +++ b/pkg/registry/extensions/networkpolicy/strategy_test.go @@ -20,9 +20,9 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestNetworkPolicyStrategy(t *testing.T) { diff --git a/pkg/registry/extensions/podsecuritypolicy/BUILD b/pkg/registry/extensions/podsecuritypolicy/BUILD index 9d916c686c..6c63b45cc8 100644 --- a/pkg/registry/extensions/podsecuritypolicy/BUILD +++ b/pkg/registry/extensions/podsecuritypolicy/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/podsecuritypolicy/strategy.go b/pkg/registry/extensions/podsecuritypolicy/strategy.go index e2e3441b06..401e62b4e0 100644 --- a/pkg/registry/extensions/podsecuritypolicy/strategy.go +++ b/pkg/registry/extensions/podsecuritypolicy/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/replicaset/BUILD b/pkg/registry/extensions/replicaset/BUILD index 145fb6576c..29c9999f30 100644 --- a/pkg/registry/extensions/replicaset/BUILD +++ b/pkg/registry/extensions/replicaset/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -30,6 +29,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -41,8 +41,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/replicaset/registry.go b/pkg/registry/extensions/replicaset/registry.go index eec60a6908..1d202b82e3 100644 --- a/pkg/registry/extensions/replicaset/registry.go +++ b/pkg/registry/extensions/replicaset/registry.go @@ -23,10 +23,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store ReplicaSets. diff --git a/pkg/registry/extensions/replicaset/storage/BUILD b/pkg/registry/extensions/replicaset/storage/BUILD index 074f364596..8a9cd53ab1 100644 --- a/pkg/registry/extensions/replicaset/storage/BUILD +++ b/pkg/registry/extensions/replicaset/storage/BUILD @@ -19,7 +19,6 @@ go_test( "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -27,6 +26,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -40,12 +40,12 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/extensions/replicaset:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/replicaset/storage/storage.go b/pkg/registry/extensions/replicaset/storage/storage.go index f84fcedfd1..e1c053d477 100644 --- a/pkg/registry/extensions/replicaset/storage/storage.go +++ b/pkg/registry/extensions/replicaset/storage/storage.go @@ -23,12 +23,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/extensions/replicaset" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" diff --git a/pkg/registry/extensions/replicaset/storage/storage_test.go b/pkg/registry/extensions/replicaset/storage/storage_test.go index 18ff98eada..88c645e8d9 100644 --- a/pkg/registry/extensions/replicaset/storage/storage_test.go +++ b/pkg/registry/extensions/replicaset/storage/storage_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/extensions/replicaset/strategy.go b/pkg/registry/extensions/replicaset/strategy.go index bada8cb696..4a97f5f53b 100644 --- a/pkg/registry/extensions/replicaset/strategy.go +++ b/pkg/registry/extensions/replicaset/strategy.go @@ -26,12 +26,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/replicaset/strategy_test.go b/pkg/registry/extensions/replicaset/strategy_test.go index f80811966b..ac78030011 100644 --- a/pkg/registry/extensions/replicaset/strategy_test.go +++ b/pkg/registry/extensions/replicaset/strategy_test.go @@ -20,9 +20,9 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestReplicaSetStrategy(t *testing.T) { diff --git a/pkg/registry/extensions/thirdpartyresource/BUILD b/pkg/registry/extensions/thirdpartyresource/BUILD index 287dab6b19..00f0ccae87 100644 --- a/pkg/registry/extensions/thirdpartyresource/BUILD +++ b/pkg/registry/extensions/thirdpartyresource/BUILD @@ -21,11 +21,11 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/thirdpartyresource/strategy.go b/pkg/registry/extensions/thirdpartyresource/strategy.go index 0b5502b473..c6fb6e63c6 100644 --- a/pkg/registry/extensions/thirdpartyresource/strategy.go +++ b/pkg/registry/extensions/thirdpartyresource/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/BUILD index ecc213aeda..394fe71e2b 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -37,6 +36,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/util/yaml", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/registry.go b/pkg/registry/extensions/thirdpartyresourcedata/registry.go index d6c2711c3c..90e3bf022c 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/registry.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/registry.go @@ -19,10 +19,10 @@ package thirdpartyresourcedata import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface implemented by things that know how to store ThirdPartyResourceData objects. diff --git a/pkg/registry/extensions/thirdpartyresourcedata/strategy.go b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go index 2f568f890b..ea5eddf0cf 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/strategy.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/generic/registry/BUILD b/pkg/registry/generic/registry/BUILD index c5d5a9811f..e36538854b 100644 --- a/pkg/registry/generic/registry/BUILD +++ b/pkg/registry/generic/registry/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", @@ -41,6 +40,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -58,7 +58,6 @@ go_test( "//pkg/api/rest:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/pod:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", @@ -74,6 +73,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/generic/registry/store.go b/pkg/registry/generic/registry/store.go index 6b89f34e32..d6b3bb37d5 100644 --- a/pkg/registry/generic/registry/store.go +++ b/pkg/registry/generic/registry/store.go @@ -31,13 +31,13 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" kubeerr "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/registry/generic/registry/store_test.go index 28c713bf94..e693d915ea 100644 --- a/pkg/registry/generic/registry/store_test.go +++ b/pkg/registry/generic/registry/store_test.go @@ -33,12 +33,12 @@ import ( "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/wait" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/pod" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/policy/poddisruptionbudget/BUILD b/pkg/registry/policy/poddisruptionbudget/BUILD index a871ecad0a..d275dd737a 100644 --- a/pkg/registry/policy/poddisruptionbudget/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -37,9 +37,9 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/policy:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/policy/poddisruptionbudget/storage/BUILD b/pkg/registry/policy/poddisruptionbudget/storage/BUILD index c3da606e77..8c69304949 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/storage/BUILD @@ -18,13 +18,13 @@ go_test( "//pkg/api/rest:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -35,12 +35,12 @@ go_library( deps = [ "//pkg/api/rest:go_default_library", "//pkg/apis/policy:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/registry/policy/poddisruptionbudget:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage.go b/pkg/registry/policy/poddisruptionbudget/storage/storage.go index 5f48a9eb3c..80108eb31b 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage.go @@ -19,9 +19,9 @@ package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/rest" policyapi "k8s.io/kubernetes/pkg/apis/policy" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget" diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go index ae51351ab2..520041b0c4 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -21,11 +21,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/policy/poddisruptionbudget/strategy.go b/pkg/registry/policy/poddisruptionbudget/strategy.go index bfe39c9b8e..2570edff88 100644 --- a/pkg/registry/policy/poddisruptionbudget/strategy.go +++ b/pkg/registry/policy/poddisruptionbudget/strategy.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/policy/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/policy/poddisruptionbudget/strategy_test.go b/pkg/registry/policy/poddisruptionbudget/strategy_test.go index 83c0c195a2..13dc171240 100644 --- a/pkg/registry/policy/poddisruptionbudget/strategy_test.go +++ b/pkg/registry/policy/poddisruptionbudget/strategy_test.go @@ -20,9 +20,9 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/registry/rbac/BUILD b/pkg/registry/rbac/BUILD index 13367f69bd..cd5c3daa99 100644 --- a/pkg/registry/rbac/BUILD +++ b/pkg/registry/rbac/BUILD @@ -13,10 +13,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/clusterrole/BUILD b/pkg/registry/rbac/clusterrole/BUILD index cde96edbda..23cf16988f 100644 --- a/pkg/registry/rbac/clusterrole/BUILD +++ b/pkg/registry/rbac/clusterrole/BUILD @@ -21,13 +21,13 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/clusterrole/policybased/BUILD b/pkg/registry/rbac/clusterrole/policybased/BUILD index eacf4d81d8..c4b3d0af08 100644 --- a/pkg/registry/rbac/clusterrole/policybased/BUILD +++ b/pkg/registry/rbac/clusterrole/policybased/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/clusterrole/policybased/storage.go b/pkg/registry/rbac/clusterrole/policybased/storage.go index 26f1e219d9..84c03c12ea 100644 --- a/pkg/registry/rbac/clusterrole/policybased/storage.go +++ b/pkg/registry/rbac/clusterrole/policybased/storage.go @@ -19,10 +19,10 @@ package policybased import ( "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/clusterrole/registry.go b/pkg/registry/rbac/clusterrole/registry.go index 1bc3fc9070..c6893d8558 100644 --- a/pkg/registry/rbac/clusterrole/registry.go +++ b/pkg/registry/rbac/clusterrole/registry.go @@ -19,10 +19,10 @@ package clusterrole import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store ClusterRoles. diff --git a/pkg/registry/rbac/clusterrole/strategy.go b/pkg/registry/rbac/clusterrole/strategy.go index 32ec5b23ed..a9a1517a88 100644 --- a/pkg/registry/rbac/clusterrole/strategy.go +++ b/pkg/registry/rbac/clusterrole/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/clusterrolebinding/BUILD b/pkg/registry/rbac/clusterrolebinding/BUILD index fe187dd133..673e657a25 100644 --- a/pkg/registry/rbac/clusterrolebinding/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/BUILD @@ -21,13 +21,13 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD index 3dc66e08af..044ec0713a 100644 --- a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD @@ -15,11 +15,11 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/storage.go b/pkg/registry/rbac/clusterrolebinding/policybased/storage.go index d5d45521a5..62a5d9d6e6 100644 --- a/pkg/registry/rbac/clusterrolebinding/policybased/storage.go +++ b/pkg/registry/rbac/clusterrolebinding/policybased/storage.go @@ -20,10 +20,10 @@ package policybased import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/clusterrolebinding/registry.go b/pkg/registry/rbac/clusterrolebinding/registry.go index 725e4f4b23..93cd58c4bd 100644 --- a/pkg/registry/rbac/clusterrolebinding/registry.go +++ b/pkg/registry/rbac/clusterrolebinding/registry.go @@ -19,10 +19,10 @@ package clusterrolebinding import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store ClusterRoleBindings. diff --git a/pkg/registry/rbac/clusterrolebinding/strategy.go b/pkg/registry/rbac/clusterrolebinding/strategy.go index 3fdf568ccf..a6649dfb1f 100644 --- a/pkg/registry/rbac/clusterrolebinding/strategy.go +++ b/pkg/registry/rbac/clusterrolebinding/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/escalation_check.go b/pkg/registry/rbac/escalation_check.go index fee7fd6961..db493f180c 100644 --- a/pkg/registry/rbac/escalation_check.go +++ b/pkg/registry/rbac/escalation_check.go @@ -22,8 +22,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func EscalationAllowed(ctx genericapirequest.Context) bool { diff --git a/pkg/registry/rbac/role/BUILD b/pkg/registry/rbac/role/BUILD index 92f673d243..4d6d0f1a1b 100644 --- a/pkg/registry/rbac/role/BUILD +++ b/pkg/registry/rbac/role/BUILD @@ -21,13 +21,13 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/role/policybased/BUILD b/pkg/registry/rbac/role/policybased/BUILD index eacf4d81d8..c4b3d0af08 100644 --- a/pkg/registry/rbac/role/policybased/BUILD +++ b/pkg/registry/rbac/role/policybased/BUILD @@ -15,10 +15,10 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/role/policybased/storage.go b/pkg/registry/rbac/role/policybased/storage.go index 4cedc0329a..faf4b0f149 100644 --- a/pkg/registry/rbac/role/policybased/storage.go +++ b/pkg/registry/rbac/role/policybased/storage.go @@ -19,10 +19,10 @@ package policybased import ( "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/role/registry.go b/pkg/registry/rbac/role/registry.go index cb29de7e2b..0857033e4b 100644 --- a/pkg/registry/rbac/role/registry.go +++ b/pkg/registry/rbac/role/registry.go @@ -19,10 +19,10 @@ package role import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store Roles. diff --git a/pkg/registry/rbac/role/strategy.go b/pkg/registry/rbac/role/strategy.go index 35baf3153b..2c0429475d 100644 --- a/pkg/registry/rbac/role/strategy.go +++ b/pkg/registry/rbac/role/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/rolebinding/BUILD b/pkg/registry/rbac/rolebinding/BUILD index c0cd482443..f4dcf32ba0 100644 --- a/pkg/registry/rbac/rolebinding/BUILD +++ b/pkg/registry/rbac/rolebinding/BUILD @@ -21,13 +21,13 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/rolebinding/policybased/BUILD b/pkg/registry/rbac/rolebinding/policybased/BUILD index 3dc66e08af..044ec0713a 100644 --- a/pkg/registry/rbac/rolebinding/policybased/BUILD +++ b/pkg/registry/rbac/rolebinding/policybased/BUILD @@ -15,11 +15,11 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/rbac:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/rolebinding/policybased/storage.go b/pkg/registry/rbac/rolebinding/policybased/storage.go index fdf115f65f..d6cc25ddf2 100644 --- a/pkg/registry/rbac/rolebinding/policybased/storage.go +++ b/pkg/registry/rbac/rolebinding/policybased/storage.go @@ -20,10 +20,10 @@ package policybased import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/authorization/authorizer" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" rbacregistry "k8s.io/kubernetes/pkg/registry/rbac" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" ) diff --git a/pkg/registry/rbac/rolebinding/registry.go b/pkg/registry/rbac/rolebinding/registry.go index ed108fe442..c84cfb7ba1 100644 --- a/pkg/registry/rbac/rolebinding/registry.go +++ b/pkg/registry/rbac/rolebinding/registry.go @@ -19,10 +19,10 @@ package rolebinding import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store RoleBindings. diff --git a/pkg/registry/rbac/rolebinding/strategy.go b/pkg/registry/rbac/rolebinding/strategy.go index d1ebdce8aa..498de0831e 100644 --- a/pkg/registry/rbac/rolebinding/strategy.go +++ b/pkg/registry/rbac/rolebinding/strategy.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/rbac/validation/BUILD b/pkg/registry/rbac/validation/BUILD index faa0a203b3..4cc9886596 100644 --- a/pkg/registry/rbac/validation/BUILD +++ b/pkg/registry/rbac/validation/BUILD @@ -34,11 +34,11 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/serviceaccount:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/rbac/validation/rule.go b/pkg/registry/rbac/validation/rule.go index 7c1746b160..dfaad9b160 100644 --- a/pkg/registry/rbac/validation/rule.go +++ b/pkg/registry/rbac/validation/rule.go @@ -23,9 +23,9 @@ import ( "github.com/golang/glog" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/authentication/user" + genericapirequest "k8s.io/apiserver/pkg/request" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/apis/rbac" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/serviceaccount" ) diff --git a/pkg/registry/registrytest/BUILD b/pkg/registry/registrytest/BUILD index 28874ef28f..3ba004756b 100644 --- a/pkg/registry/registrytest/BUILD +++ b/pkg/registry/registrytest/BUILD @@ -23,7 +23,6 @@ go_library( "//pkg/api/rest/resttest:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/storage/etcd:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -34,6 +33,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/watch", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/registrytest/endpoint.go b/pkg/registry/registrytest/endpoint.go index 22af918bc3..9b4bca0451 100644 --- a/pkg/registry/registrytest/endpoint.go +++ b/pkg/registry/registrytest/endpoint.go @@ -22,9 +22,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // Registry is an interface for things that know how to store endpoints. diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index 2e34bc3e1e..137e8a140e 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -24,12 +24,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest/resttest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" diff --git a/pkg/registry/registrytest/node.go b/pkg/registry/registrytest/node.go index 7478ae8cd3..dee97901e9 100644 --- a/pkg/registry/registrytest/node.go +++ b/pkg/registry/registrytest/node.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // NodeRegistry implements node.Registry interface. diff --git a/pkg/registry/registrytest/service.go b/pkg/registry/registrytest/service.go index 428df339b3..5d11f8b537 100644 --- a/pkg/registry/registrytest/service.go +++ b/pkg/registry/registrytest/service.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func NewServiceRegistry() *ServiceRegistry { diff --git a/pkg/registry/storage/storageclass/BUILD b/pkg/registry/storage/storageclass/BUILD index 8eaaad3ae2..15fcc41fca 100644 --- a/pkg/registry/storage/storageclass/BUILD +++ b/pkg/registry/storage/storageclass/BUILD @@ -20,12 +20,12 @@ go_library( "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/validation:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage:go_default_library", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + "//vendor:k8s.io/apiserver/pkg/request", ], ) @@ -37,7 +37,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/storage:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/pkg/registry/storage/storageclass/strategy.go b/pkg/registry/storage/storageclass/strategy.go index 545196007d..dcc348b360 100644 --- a/pkg/registry/storage/storageclass/strategy.go +++ b/pkg/registry/storage/storageclass/strategy.go @@ -22,11 +22,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/apis/storage/validation" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/generic" apistorage "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/storage/storageclass/strategy_test.go b/pkg/registry/storage/storageclass/strategy_test.go index 94d7981e36..952c19c116 100644 --- a/pkg/registry/storage/storageclass/strategy_test.go +++ b/pkg/registry/storage/storageclass/strategy_test.go @@ -19,9 +19,9 @@ package storageclass import ( "testing" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/storage" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) func TestStorageClassStrategy(t *testing.T) { diff --git a/pkg/util/BUILD b/pkg/util/BUILD index 839f84d035..84e3c2ef26 100644 --- a/pkg/util/BUILD +++ b/pkg/util/BUILD @@ -113,7 +113,6 @@ filegroup( "//pkg/util/version:all-srcs", "//pkg/util/wait:all-srcs", "//pkg/util/workqueue:all-srcs", - "//pkg/util/wsstream:all-srcs", "//pkg/util/yaml:all-srcs", ], tags = ["automanaged"], diff --git a/plugin/BUILD b/plugin/BUILD index fe43a11e43..fabfccfae1 100644 --- a/plugin/BUILD +++ b/plugin/BUILD @@ -36,7 +36,6 @@ filegroup( "//plugin/pkg/auth:all-srcs", "//plugin/pkg/client/auth:all-srcs", "//plugin/pkg/scheduler:all-srcs", - "//plugin/pkg/webhook:all-srcs", ], tags = ["automanaged"], ) diff --git a/plugin/pkg/admission/imagepolicy/BUILD b/plugin/pkg/admission/imagepolicy/BUILD index 706e8c4ff5..4c464f5339 100644 --- a/plugin/pkg/admission/imagepolicy/BUILD +++ b/plugin/pkg/admission/imagepolicy/BUILD @@ -20,11 +20,11 @@ go_library( "//pkg/admission:go_default_library", "//pkg/api:go_default_library", "//pkg/apis/imagepolicy/install:go_default_library", - "//plugin/pkg/webhook:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/yaml", "//vendor:k8s.io/apiserver/pkg/util/cache", + "//vendor:k8s.io/apiserver/pkg/webhook", "//vendor:k8s.io/client-go/pkg/api/errors", "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/install", "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1", diff --git a/plugin/pkg/admission/imagepolicy/admission.go b/plugin/pkg/admission/imagepolicy/admission.go index f8533d340a..9d0852cd63 100644 --- a/plugin/pkg/admission/imagepolicy/admission.go +++ b/plugin/pkg/admission/imagepolicy/admission.go @@ -32,13 +32,13 @@ import ( kubeschema "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/apiserver/pkg/util/cache" + "k8s.io/apiserver/pkg/webhook" apierrors "k8s.io/client-go/pkg/api/errors" "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1" "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/plugin/pkg/webhook" // install the clientgo image policy API for use with api registry _ "k8s.io/client-go/pkg/apis/imagepolicy/install" diff --git a/plugin/pkg/auth/authenticator/BUILD b/plugin/pkg/auth/authenticator/BUILD index d3ec8689d5..a5e005aabf 100644 --- a/plugin/pkg/auth/authenticator/BUILD +++ b/plugin/pkg/auth/authenticator/BUILD @@ -26,7 +26,6 @@ filegroup( ":package-srcs", "//plugin/pkg/auth/authenticator/password:all-srcs", "//plugin/pkg/auth/authenticator/request/basicauth:all-srcs", - "//plugin/pkg/auth/authenticator/request/headerrequest:all-srcs", "//plugin/pkg/auth/authenticator/token/anytoken:all-srcs", "//plugin/pkg/auth/authenticator/token/oidc:all-srcs", "//plugin/pkg/auth/authenticator/token/tokentest:all-srcs", diff --git a/plugin/pkg/auth/authenticator/token/webhook/BUILD b/plugin/pkg/auth/authenticator/token/webhook/BUILD index 59c222bc32..a2308ab738 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/BUILD +++ b/plugin/pkg/auth/authenticator/token/webhook/BUILD @@ -14,11 +14,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/authentication/install:go_default_library", - "//plugin/pkg/webhook:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/util/cache", + "//vendor:k8s.io/apiserver/pkg/webhook", "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/authentication/install", "//vendor:k8s.io/client-go/pkg/apis/authentication/v1beta1", diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook.go b/plugin/pkg/auth/authenticator/token/webhook/webhook.go index 6a6e3cf747..85476cbf01 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook.go @@ -27,7 +27,7 @@ import ( authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" authentication "k8s.io/client-go/pkg/apis/authentication/v1beta1" - "k8s.io/kubernetes/plugin/pkg/webhook" + "k8s.io/apiserver/pkg/webhook" _ "k8s.io/client-go/pkg/apis/authentication/install" _ "k8s.io/kubernetes/pkg/apis/authentication/install" diff --git a/plugin/pkg/auth/authorizer/webhook/BUILD b/plugin/pkg/auth/authorizer/webhook/BUILD index 5891d64252..c7c8561198 100644 --- a/plugin/pkg/auth/authorizer/webhook/BUILD +++ b/plugin/pkg/auth/authorizer/webhook/BUILD @@ -14,11 +14,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/authorization/install:go_default_library", - "//plugin/pkg/webhook:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/util/cache", + "//vendor:k8s.io/apiserver/pkg/webhook", "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/authorization/install", "//vendor:k8s.io/client-go/pkg/apis/authorization/v1beta1", diff --git a/plugin/pkg/auth/authorizer/webhook/webhook.go b/plugin/pkg/auth/authorizer/webhook/webhook.go index 98ef9ec682..068fc4b851 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook.go @@ -29,7 +29,7 @@ import ( authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1" - "k8s.io/kubernetes/plugin/pkg/webhook" + "k8s.io/apiserver/pkg/webhook" _ "k8s.io/client-go/pkg/apis/authorization/install" _ "k8s.io/kubernetes/pkg/apis/authorization/install" diff --git a/plugin/pkg/scheduler/factory/BUILD b/plugin/pkg/scheduler/factory/BUILD index 7f258b4e7b..a0b4b77eed 100644 --- a/plugin/pkg/scheduler/factory/BUILD +++ b/plugin/pkg/scheduler/factory/BUILD @@ -23,7 +23,6 @@ go_library( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//plugin/pkg/scheduler:go_default_library", "//plugin/pkg/scheduler/algorithm:go_default_library", "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", @@ -37,6 +36,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation", + "//vendor:k8s.io/apiserver/pkg/request", ], ) diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go index 53b851c63e..d0efff5588 100644 --- a/plugin/pkg/scheduler/factory/factory.go +++ b/plugin/pkg/scheduler/factory/factory.go @@ -30,13 +30,13 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" utilvalidation "k8s.io/apimachinery/pkg/util/validation" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/fields" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/plugin/pkg/scheduler" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" diff --git a/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go index 059af8315f..b03b273ad0 100644 --- a/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package negotation contains media type negotiation logic. -package negotiation // import "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation" +package negotiation // import "k8s.io/apiserver/pkg/handlers/negotiation" diff --git a/staging/src/k8s.io/apiserver/pkg/request/context_test.go b/staging/src/k8s.io/apiserver/pkg/request/context_test.go index 5d2608f5c4..3f8f62e8f1 100644 --- a/staging/src/k8s.io/apiserver/pkg/request/context_test.go +++ b/staging/src/k8s.io/apiserver/pkg/request/context_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apiserver/pkg/authentication/user" + genericapirequest "k8s.io/apiserver/pkg/request" "k8s.io/kubernetes/pkg/api" - genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) // TestNamespaceContext validates that a namespace can be get/set on a context object diff --git a/staging/src/k8s.io/apiserver/pkg/request/doc.go b/staging/src/k8s.io/apiserver/pkg/request/doc.go index a2d8b3cc58..20436ebb25 100644 --- a/staging/src/k8s.io/apiserver/pkg/request/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/request/doc.go @@ -17,4 +17,4 @@ limitations under the License. // Package request contains everything around extracting info from // a http request object. // TODO: this package is temporary. Handlers must move into pkg/apiserver/handlers to avoid dependency cycle -package request // import "k8s.io/kubernetes/pkg/genericapiserver/api/request" +package request // import "k8s.io/apiserver/pkg/request" diff --git a/staging/src/k8s.io/apiserver/pkg/util/wsstream/doc.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/doc.go index 3bda93e269..694ce81d20 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/wsstream/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/util/wsstream/doc.go @@ -18,4 +18,4 @@ limitations under the License. // The Conn type allows callers to multiplex multiple read/write channels over // a single websocket. The Reader type allows an io.Reader to be copied over // a websocket channel as binary content. -package wsstream // import "k8s.io/kubernetes/pkg/util/wsstream" +package wsstream // import "k8s.io/apiserver/pkg/util/wsstream" diff --git a/vendor/BUILD b/vendor/BUILD index 3a5aae7bef..6e8a6e20a0 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13154,3 +13154,143 @@ go_test( "//vendor:k8s.io/client-go/rest/watch", ], ) + +go_test( + name = "k8s.io/apiserver/pkg/authentication/request/headerrequest_test", + srcs = ["k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader_test.go"], + library = ":k8s.io/apiserver/pkg/authentication/request/headerrequest", + tags = ["automanaged"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], +) + +go_library( + name = "k8s.io/apiserver/pkg/authentication/request/headerrequest", + srcs = ["k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", + "//vendor:k8s.io/apiserver/pkg/authentication/request/x509", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/client-go/pkg/util/cert", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/handlers/negotiation_test", + srcs = ["k8s.io/apiserver/pkg/handlers/negotiation/negotiate_test.go"], + library = ":k8s.io/apiserver/pkg/handlers/negotiation", + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/handlers/negotiation", + srcs = [ + "k8s.io/apiserver/pkg/handlers/negotiation/doc.go", + "k8s.io/apiserver/pkg/handlers/negotiation/errors.go", + "k8s.io/apiserver/pkg/handlers/negotiation/negotiate.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:bitbucket.org/ww/goautoneg", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/metrics", + srcs = ["k8s.io/apiserver/pkg/metrics/metrics.go"], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/prometheus/client_golang/prometheus", + "//vendor:k8s.io/apimachinery/pkg/util/net", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/request_test", + srcs = ["k8s.io/apiserver/pkg/request/requestinfo_test.go"], + library = ":k8s.io/apiserver/pkg/request", + tags = ["automanaged"], + deps = ["//vendor:k8s.io/apimachinery/pkg/util/sets"], +) + +go_library( + name = "k8s.io/apiserver/pkg/request", + srcs = [ + "k8s.io/apiserver/pkg/request/context.go", + "k8s.io/apiserver/pkg/request/doc.go", + "k8s.io/apiserver/pkg/request/requestcontext.go", + "k8s.io/apiserver/pkg/request/requestinfo.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/request_xtest", + srcs = ["k8s.io/apiserver/pkg/request/context_test.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/request", + ], +) + +go_test( + name = "k8s.io/apiserver/pkg/util/wsstream_test", + srcs = [ + "k8s.io/apiserver/pkg/util/wsstream/conn_test.go", + "k8s.io/apiserver/pkg/util/wsstream/stream_test.go", + ], + library = ":k8s.io/apiserver/pkg/util/wsstream", + tags = ["automanaged"], + deps = ["//vendor:golang.org/x/net/websocket"], +) + +go_library( + name = "k8s.io/apiserver/pkg/util/wsstream", + srcs = [ + "k8s.io/apiserver/pkg/util/wsstream/conn.go", + "k8s.io/apiserver/pkg/util/wsstream/doc.go", + "k8s.io/apiserver/pkg/util/wsstream/stream.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:golang.org/x/net/websocket", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/webhook", + srcs = ["k8s.io/apiserver/pkg/webhook/webhook.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/apimachinery/pkg/util/wait", + "//vendor:k8s.io/client-go/pkg/api", + "//vendor:k8s.io/client-go/pkg/api/errors", + "//vendor:k8s.io/client-go/pkg/apis/authorization/install", + "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/tools/clientcmd", + ], +)