Merge pull request #39483 from deads2k/generic-15-deps-02-for-real

pkg/BUILD

@@ -30,10 +30,7 @@ filegroup(
         "//pkg/apis/policy:all-srcs",
         "//pkg/apis/rbac:all-srcs",
         "//pkg/apis/storage:all-srcs",
-        "//pkg/auth/authenticator/bearertoken:all-srcs",
         "//pkg/auth/authorizer/abac:all-srcs",
-        "//pkg/auth/authorizer/union:all-srcs",
-        "//pkg/auth/group:all-srcs",
         "//pkg/auth/handlers:all-srcs",
         "//pkg/auth/user:all-srcs",
         "//pkg/capabilities:all-srcs",
@@ -89,7 +86,6 @@ filegroup(
         "//pkg/fields:all-srcs",
         "//pkg/generated:all-srcs",
         "//pkg/genericapiserver:all-srcs",
-        "//pkg/httplog:all-srcs",
         "//pkg/hyperkube:all-srcs",
         "//pkg/kubeapiserver:all-srcs",
         "//pkg/kubectl:all-srcs",

pkg/auth/authenticator/bearertoken/BUILD

-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 = ["bearertoken.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["bearertoken_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//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"],
-)

pkg/auth/authorizer/union/BUILD

-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 = ["union_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = ["//vendor:k8s.io/apiserver/pkg/authorization/authorizer"],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["union.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
-        "//vendor:k8s.io/client-go/pkg/util/errors",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)

pkg/auth/group/BUILD

-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 = ["group_adder.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["group_adder_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//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"],
-)

pkg/genericapiserver/BUILD

@@ -30,7 +30,6 @@ go_library(
         "//pkg/admission:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/rest:go_default_library",
-        "//pkg/auth/authorizer/union:go_default_library",
         "//pkg/auth/handlers:go_default_library",
         "//pkg/client/restclient:go_default_library",
         "//pkg/genericapiserver/api:go_default_library",
@@ -50,7 +49,6 @@ go_library(
         "//pkg/util/clock:go_default_library",
         "//pkg/util/config:go_default_library",
         "//pkg/version:go_default_library",
-        "//plugin/pkg/auth/authenticator/request/union:go_default_library",
         "//vendor:github.com/coreos/go-systemd/daemon",
         "//vendor:github.com/emicklei/go-restful",
         "//vendor:github.com/emicklei/go-restful/swagger",
@@ -73,8 +71,10 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/util/validation",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/request/union",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
+        "//vendor:k8s.io/apiserver/pkg/authorization/union",
         "//vendor:k8s.io/apiserver/pkg/healthz",
     ],
 )

pkg/genericapiserver/api/filters/BUILD

@@ -23,13 +23,13 @@ go_library(
         "//pkg/apis/authentication:go_default_library",
         "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
         "//pkg/genericapiserver/api/request:go_default_library",
-        "//pkg/httplog:go_default_library",
         "//pkg/serviceaccount:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:github.com/pborman/uuid",
         "//vendor:k8s.io/apimachinery/pkg/util/net",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
+        "//vendor:k8s.io/apiserver/pkg/httplog",
     ],
 )
 

pkg/genericapiserver/api/filters/impersonation.go

@@ -26,11 +26,11 @@ import (
 
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/httplog"
 	"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/httplog"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 )
 

pkg/genericapiserver/api/handlers/BUILD

@@ -51,7 +51,6 @@ go_library(
         "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
         "//pkg/genericapiserver/api/metrics:go_default_library",
         "//pkg/genericapiserver/api/request:go_default_library",
-        "//pkg/httplog:go_default_library",
         "//pkg/util:go_default_library",
         "//pkg/util/httpstream:go_default_library",
         "//pkg/util/proxy:go_default_library",
@@ -69,6 +68,7 @@ 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/httplog",
     ],
 )
 

pkg/genericapiserver/api/handlers/proxy.go

@@ -30,13 +30,13 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/apiserver/pkg/httplog"
 	"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/httplog"
 	"k8s.io/kubernetes/pkg/util/httpstream"
 	proxyutil "k8s.io/kubernetes/pkg/util/proxy"
 

pkg/genericapiserver/api/handlers/watch.go

@@ -28,9 +28,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/httplog"
 	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation"
-	"k8s.io/kubernetes/pkg/httplog"
 	"k8s.io/kubernetes/pkg/util/wsstream"
 
 	"github.com/emicklei/go-restful"

pkg/genericapiserver/authenticator/BUILD

@@ -16,17 +16,17 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/auth/authenticator/bearertoken:go_default_library",
-        "//pkg/auth/group:go_default_library",
         "//pkg/util/cert:go_default_library",
-        "//plugin/pkg/auth/authenticator/request/anonymous:go_default_library",
         "//plugin/pkg/auth/authenticator/request/headerrequest:go_default_library",
-        "//plugin/pkg/auth/authenticator/request/union:go_default_library",
-        "//plugin/pkg/auth/authenticator/request/x509:go_default_library",
-        "//plugin/pkg/auth/authenticator/token/tokenfile: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/union",
+        "//vendor:k8s.io/apiserver/pkg/authentication/request/x509",
+        "//vendor:k8s.io/apiserver/pkg/authentication/token/tokenfile",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
     ],

pkg/genericapiserver/authenticator/delegating.go

@@ -24,16 +24,16 @@ import (
 	"github.com/go-openapi/spec"
 
 	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"k8s.io/apiserver/pkg/authentication/group"
+	"k8s.io/apiserver/pkg/authentication/request/anonymous"
+	"k8s.io/apiserver/pkg/authentication/request/bearertoken"
+	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/auth/authenticator/bearertoken"
-	"k8s.io/kubernetes/pkg/auth/group"
 	"k8s.io/kubernetes/pkg/util/cert"
-	"k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/anonymous"
 	"k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/headerrequest"
-	unionauth "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union"
-	"k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509"
 	webhooktoken "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook"
 )
 

pkg/genericapiserver/authenticator/loopback.go

@@ -18,9 +18,9 @@ package authenticator
 
 import (
 	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"k8s.io/apiserver/pkg/authentication/request/bearertoken"
+	"k8s.io/apiserver/pkg/authentication/token/tokenfile"
 	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/kubernetes/pkg/auth/authenticator/bearertoken"
-	"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile"
 )
 
 // newAuthenticatorFromToken returns an authenticator.Request or an error

pkg/genericapiserver/config.go

@@ -41,12 +41,13 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
+	authenticatorunion "k8s.io/apiserver/pkg/authentication/request/union"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
+	authorizerunion "k8s.io/apiserver/pkg/authorization/union"
 	"k8s.io/apiserver/pkg/healthz"
 	"k8s.io/kubernetes/pkg/admission"
 	"k8s.io/kubernetes/pkg/api"
-	authorizerunion "k8s.io/kubernetes/pkg/auth/authorizer/union"
 	authhandlers "k8s.io/kubernetes/pkg/auth/handlers"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters"
@@ -60,7 +61,6 @@ import (
 	"k8s.io/kubernetes/pkg/genericapiserver/routes"
 	certutil "k8s.io/kubernetes/pkg/util/cert"
 	"k8s.io/kubernetes/pkg/version"
-	authenticatorunion "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union"
 )
 
 const (

pkg/genericapiserver/filters/BUILD

@@ -23,11 +23,11 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/errors:go_default_library",
         "//pkg/genericapiserver/api/request:go_default_library",
-        "//pkg/httplog: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",
     ],
 )
 

pkg/genericapiserver/filters/maxinflight.go

@@ -21,10 +21,10 @@ import (
 	"net/http"
 
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/apiserver/pkg/httplog"
 	"k8s.io/kubernetes/pkg/api/errors"
 	apirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
 	genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
-	"k8s.io/kubernetes/pkg/httplog"
 
 	"github.com/golang/glog"
 )

pkg/genericapiserver/filters/panics.go

@@ -23,9 +23,9 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apiserver/pkg/httplog"
 	apierrors "k8s.io/kubernetes/pkg/api/errors"
 	apirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
-	"k8s.io/kubernetes/pkg/httplog"
 )
 
 // WithPanicRecovery wraps an http Handler to recover and log panics.

pkg/genericapiserver/routes/BUILD

@@ -26,7 +26,6 @@ go_library(
         "//pkg/genericapiserver/mux:go_default_library",
         "//pkg/genericapiserver/openapi:go_default_library",
         "//pkg/genericapiserver/routes/data/swagger:go_default_library",
-        "//pkg/storage/etcd/metrics:go_default_library",
         "//pkg/version:go_default_library",
         "//vendor:github.com/elazarl/go-bindata-assetfs",
         "//vendor:github.com/emicklei/go-restful",
@@ -35,6 +34,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/storage/etcd/metrics",
     ],
 )
 

pkg/genericapiserver/routes/metrics.go

@@ -20,9 +20,9 @@ import (
 	"io"
 	"net/http"
 
+	etcdmetrics "k8s.io/apiserver/pkg/storage/etcd/metrics"
 	apimetrics "k8s.io/kubernetes/pkg/genericapiserver/api/metrics"
 	"k8s.io/kubernetes/pkg/genericapiserver/mux"
-	etcdmetrics "k8s.io/kubernetes/pkg/storage/etcd/metrics"
 
 	"github.com/prometheus/client_golang/prometheus"
 )

pkg/httplog/BUILD

-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "doc.go",
-        "log.go",
-    ],
-    tags = ["automanaged"],
-    deps = ["//vendor:github.com/golang/glog"],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["log_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)

pkg/kubeapiserver/authenticator/BUILD

@@ -12,24 +12,24 @@ go_library(
     srcs = ["config.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/auth/authenticator/bearertoken:go_default_library",
-        "//pkg/auth/group:go_default_library",
         "//pkg/genericapiserver/authenticator:go_default_library",
         "//pkg/serviceaccount:go_default_library",
         "//pkg/util/cert:go_default_library",
         "//plugin/pkg/auth/authenticator/password/keystone:go_default_library",
         "//plugin/pkg/auth/authenticator/password/passwordfile:go_default_library",
-        "//plugin/pkg/auth/authenticator/request/anonymous: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/request/union:go_default_library",
-        "//plugin/pkg/auth/authenticator/request/x509: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/tokenfile: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/union",
+        "//vendor:k8s.io/apiserver/pkg/authentication/request/x509",
+        "//vendor:k8s.io/apiserver/pkg/authentication/token/tokenfile",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/client-go/plugin/pkg/client/auth/gcp",
         "//vendor:k8s.io/client-go/plugin/pkg/client/auth/oidc",

pkg/kubeapiserver/authenticator/config.go

@@ -22,22 +22,22 @@ import (
 	"github.com/go-openapi/spec"
 
 	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"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/union"
+	"k8s.io/apiserver/pkg/authentication/request/x509"
+	"k8s.io/apiserver/pkg/authentication/token/tokenfile"
 	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/kubernetes/pkg/auth/authenticator/bearertoken"
-	"k8s.io/kubernetes/pkg/auth/group"
 	genericauthenticator "k8s.io/kubernetes/pkg/genericapiserver/authenticator"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 	certutil "k8s.io/kubernetes/pkg/util/cert"
 	"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/anonymous"
 	"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/request/union"
-	"k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509"
 	"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/tokenfile"
 	"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook"
 
 	// Initialize all known client auth plugins.

pkg/kubeapiserver/authorizer/BUILD

@@ -24,12 +24,12 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/auth/authorizer/abac:go_default_library",
-        "//pkg/auth/authorizer/union:go_default_library",
         "//pkg/controller/informers:go_default_library",
         "//pkg/genericapiserver/authorizer:go_default_library",
         "//plugin/pkg/auth/authorizer/rbac:go_default_library",
         "//plugin/pkg/auth/authorizer/webhook:go_default_library",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
+        "//vendor:k8s.io/apiserver/pkg/authorization/union",
     ],
 )
 

pkg/kubeapiserver/authorizer/config.go

@@ -22,8 +22,8 @@ import (
 	"time"
 
 	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/authorization/union"
 	"k8s.io/kubernetes/pkg/auth/authorizer/abac"
-	"k8s.io/kubernetes/pkg/auth/authorizer/union"
 	"k8s.io/kubernetes/pkg/controller/informers"
 	genericauthorizer "k8s.io/kubernetes/pkg/genericapiserver/authorizer"
 	"k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac"

pkg/kubelet/server/BUILD

@@ -21,7 +21,6 @@ go_library(
         "//pkg/api/errors:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/api/v1/validation:go_default_library",
-        "//pkg/httplog:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/server/portforward:go_default_library",
@@ -46,6 +45,7 @@ go_library(
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
         "//vendor:k8s.io/apiserver/pkg/healthz",
+        "//vendor:k8s.io/apiserver/pkg/httplog",
         "//vendor:k8s.io/apiserver/pkg/util/flushwriter",
     ],
 )

pkg/kubelet/server/remotecommand/BUILD

@@ -21,7 +21,6 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/api/errors:go_default_library",
-        "//pkg/httplog:go_default_library",
         "//pkg/util/exec:go_default_library",
         "//pkg/util/httpstream:go_default_library",
         "//pkg/util/httpstream/spdy:go_default_library",
@@ -31,6 +30,7 @@ go_library(
         "//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",
     ],
 )
 

pkg/kubelet/server/remotecommand/websocket.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/kubernetes/pkg/httplog"
+	"k8s.io/apiserver/pkg/httplog"
 	"k8s.io/kubernetes/pkg/util/wsstream"
 )
 

pkg/kubelet/server/server.go

@@ -43,12 +43,12 @@ import (
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/healthz"
+	"k8s.io/apiserver/pkg/httplog"
 	"k8s.io/apiserver/pkg/util/flushwriter"
 	"k8s.io/kubernetes/pkg/api"
 	apierrs "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/api/v1/validation"
-	"k8s.io/kubernetes/pkg/httplog"
 	"k8s.io/kubernetes/pkg/kubelet/cm"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/server/portforward"

pkg/ssh/BUILD

@@ -8,28 +8,28 @@ load(
     "go_test",
 )
 
-go_library(
-    name = "go_default_library",
-    srcs = ["ssh.go"],
+go_test(
+    name = "go_default_test",
+    srcs = ["ssh_test.go"],
+    library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
         "//vendor:github.com/golang/glog",
-        "//vendor:github.com/prometheus/client_golang/prometheus",
         "//vendor:golang.org/x/crypto/ssh",
-        "//vendor:k8s.io/client-go/pkg/util/net",
-        "//vendor:k8s.io/client-go/pkg/util/runtime",
         "//vendor:k8s.io/client-go/pkg/util/wait",
     ],
 )
 
-go_test(
-    name = "go_default_test",
-    srcs = ["ssh_test.go"],
-    library = ":go_default_library",
+go_library(
+    name = "go_default_library",
+    srcs = ["ssh.go"],
     tags = ["automanaged"],
     deps = [
         "//vendor:github.com/golang/glog",
+        "//vendor:github.com/prometheus/client_golang/prometheus",
         "//vendor:golang.org/x/crypto/ssh",
+        "//vendor:k8s.io/client-go/pkg/util/net",
+        "//vendor:k8s.io/client-go/pkg/util/runtime",
         "//vendor:k8s.io/client-go/pkg/util/wait",
     ],
 )

pkg/storage/etcd/BUILD

@@ -20,10 +20,8 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/storage:go_default_library",
-        "//pkg/storage/etcd/metrics:go_default_library",
         "//pkg/storage/etcd/util:go_default_library",
         "//pkg/util:go_default_library",
-        "//pkg/util/cache:go_default_library",
         "//vendor:github.com/coreos/etcd/client",
         "//vendor:github.com/golang/glog",
         "//vendor:golang.org/x/net/context",
@@ -33,6 +31,8 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
+        "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics",
+        "//vendor:k8s.io/apiserver/pkg/util/cache",
     ],
 )
 
@@ -78,7 +78,6 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//pkg/storage/etcd/etcdtest:all-srcs",
-        "//pkg/storage/etcd/metrics:all-srcs",
         "//pkg/storage/etcd/testing:all-srcs",
         "//pkg/storage/etcd/util:all-srcs",
     ],

pkg/storage/etcd/etcd_helper.go

@@ -27,12 +27,12 @@ import (
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/storage/etcd/metrics"
+	utilcache "k8s.io/apiserver/pkg/util/cache"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/storage"
-	"k8s.io/kubernetes/pkg/storage/etcd/metrics"
 	etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util"
 	"k8s.io/kubernetes/pkg/util"
-	utilcache "k8s.io/kubernetes/pkg/util/cache"
 
 	etcd "github.com/coreos/etcd/client"
 	"github.com/golang/glog"

pkg/storage/etcd/metrics/BUILD

-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/prometheus/client_golang/prometheus"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)

pkg/util/BUILD

@@ -49,7 +49,6 @@ filegroup(
         ":package-srcs",
         "//pkg/util/async:all-srcs",
         "//pkg/util/bandwidth:all-srcs",
-        "//pkg/util/cache:all-srcs",
         "//pkg/util/cert:all-srcs",
         "//pkg/util/chmod:all-srcs",
         "//pkg/util/chown:all-srcs",

pkg/util/cache/BUILD

-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 = [
-        "cache.go",
-        "lruexpirecache.go",
-    ],
-    tags = ["automanaged"],
-    deps = ["//vendor:github.com/golang/groupcache/lru"],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "cache_test.go",
-        "lruexpirecache_test.go",
-    ],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//pkg/util/clock:go_default_library",
-        "//vendor:github.com/golang/groupcache/lru",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)

plugin/pkg/admission/imagepolicy/BUILD

@@ -19,11 +19,11 @@ go_library(
     deps = [
         "//pkg/admission:go_default_library",
         "//pkg/api:go_default_library",
-        "//pkg/util/cache: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/client-go/pkg/api/errors",
         "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/install",
         "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1",

plugin/pkg/admission/imagepolicy/admission.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/golang/glog"
 
+	"k8s.io/apiserver/pkg/util/cache"
 	apierrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1"
 	"k8s.io/client-go/pkg/runtime/schema"
@@ -37,7 +38,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/kubernetes/pkg/admission"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/util/cache"
 	"k8s.io/kubernetes/plugin/pkg/webhook"
 
 	// install the clientgo image policy API for use with api registry

plugin/pkg/admission/namespace/lifecycle/BUILD

@@ -20,11 +20,11 @@ go_library(
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/controller/informers:go_default_library",
         "//pkg/kubeapiserver/admission:go_default_library",
-        "//pkg/util/cache:go_default_library",
         "//pkg/util/clock:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
+        "//vendor:k8s.io/apiserver/pkg/util/cache",
     ],
 )
 

plugin/pkg/admission/namespace/lifecycle/admission.go

@@ -25,6 +25,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
+	utilcache "k8s.io/apiserver/pkg/util/cache"
 	"k8s.io/kubernetes/pkg/admission"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/errors"
@@ -32,7 +33,6 @@ import (
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/controller/informers"
 	kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
-	utilcache "k8s.io/kubernetes/pkg/util/cache"
 	"k8s.io/kubernetes/pkg/util/clock"
 )
 

plugin/pkg/auth/authenticator/BUILD

@@ -25,14 +25,10 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//plugin/pkg/auth/authenticator/password:all-srcs",
-        "//plugin/pkg/auth/authenticator/request/anonymous:all-srcs",
         "//plugin/pkg/auth/authenticator/request/basicauth:all-srcs",
         "//plugin/pkg/auth/authenticator/request/headerrequest:all-srcs",
-        "//plugin/pkg/auth/authenticator/request/union:all-srcs",
-        "//plugin/pkg/auth/authenticator/request/x509:all-srcs",
         "//plugin/pkg/auth/authenticator/token/anytoken:all-srcs",
         "//plugin/pkg/auth/authenticator/token/oidc:all-srcs",
-        "//plugin/pkg/auth/authenticator/token/tokenfile:all-srcs",
         "//plugin/pkg/auth/authenticator/token/tokentest:all-srcs",
         "//plugin/pkg/auth/authenticator/token/webhook:all-srcs",
     ],

plugin/pkg/auth/authenticator/request/anonymous/BUILD

-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 = ["anonymous.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["anonymous_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//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"],
-)

plugin/pkg/auth/authenticator/request/headerrequest/BUILD

@@ -21,8 +21,8 @@ go_library(
     srcs = ["requestheader.go"],
     tags = ["automanaged"],
     deps = [
-        "//plugin/pkg/auth/authenticator/request/x509:go_default_library",
         "//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",
         "//vendor:k8s.io/client-go/pkg/util/sets",

plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go

@@ -24,10 +24,10 @@ import (
 	"strings"
 
 	"k8s.io/apiserver/pkg/authentication/authenticator"
+	x509request "k8s.io/apiserver/pkg/authentication/request/x509"
 	"k8s.io/apiserver/pkg/authentication/user"
 	utilcert "k8s.io/client-go/pkg/util/cert"
 	"k8s.io/client-go/pkg/util/sets"
-	x509request "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509"
 )
 
 type requestHeaderAuthRequestHandler struct {

plugin/pkg/auth/authenticator/request/union/BUILD

-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 = ["unionauth_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["union.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-        "//vendor:k8s.io/client-go/pkg/util/errors",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)

plugin/pkg/auth/authenticator/request/x509/BUILD

-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 = ["x509_test.go"],
-    data = glob(["testdata/*"]),
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-        "//vendor:k8s.io/client-go/pkg/util/sets",
-    ],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "doc.go",
-        "x509.go",
-    ],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:github.com/golang/glog",
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-        "//vendor:k8s.io/client-go/pkg/util/errors",
-        "//vendor:k8s.io/client-go/pkg/util/sets",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)

plugin/pkg/auth/authenticator/token/tokenfile/BUILD

-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 = ["tokenfile.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:github.com/golang/glog",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["tokenfile_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = ["//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"],
-)

plugin/pkg/auth/authenticator/token/webhook/BUILD

@@ -13,10 +13,10 @@ go_library(
     srcs = ["webhook.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/util/cache:go_default_library",
         "//plugin/pkg/webhook:go_default_library",
         "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
+        "//vendor:k8s.io/apiserver/pkg/util/cache",
         "//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",

plugin/pkg/auth/authenticator/token/webhook/webhook.go

@@ -22,11 +22,11 @@ import (
 
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
+	"k8s.io/apiserver/pkg/util/cache"
 	authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1"
 	authentication "k8s.io/client-go/pkg/apis/authentication/v1beta1"
 	"k8s.io/client-go/pkg/runtime/schema"
 
-	"k8s.io/kubernetes/pkg/util/cache"
 	"k8s.io/kubernetes/plugin/pkg/webhook"
 
 	_ "k8s.io/client-go/pkg/apis/authentication/install"

plugin/pkg/auth/authorizer/webhook/BUILD

@@ -14,10 +14,10 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/apis/authorization/install:go_default_library",
-        "//pkg/util/cache:go_default_library",
         "//plugin/pkg/webhook:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
+        "//vendor:k8s.io/apiserver/pkg/util/cache",
         "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
         "//vendor:k8s.io/client-go/pkg/apis/authorization/v1beta1",
         "//vendor:k8s.io/client-go/pkg/runtime/schema",

plugin/pkg/auth/authorizer/webhook/webhook.go

@@ -24,11 +24,11 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/util/cache"
 	authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1"
 	authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1"
 	"k8s.io/client-go/pkg/runtime/schema"
 
-	"k8s.io/kubernetes/pkg/util/cache"
 	"k8s.io/kubernetes/plugin/pkg/webhook"
 
 	_ "k8s.io/kubernetes/pkg/apis/authorization/install"

plugin/pkg/auth/authenticator/request/x509/doc.go → staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package x509 provides a request authenticator that validates and
 // extracts user information from client certificates
-package x509 // import "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509"
+package x509 // import "k8s.io/apiserver/pkg/authentication/request/x509"

pkg/httplog/doc.go → staging/src/k8s.io/apiserver/pkg/httplog/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package httplog contains a helper object and functions to maintain a log
 // along with an http response.
-package httplog // import "k8s.io/kubernetes/pkg/httplog"
+package httplog // import "k8s.io/apiserver/pkg/httplog"

test/integration/auth/auth_test.go

@@ -38,6 +38,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"k8s.io/apiserver/pkg/authentication/group"
+	"k8s.io/apiserver/pkg/authentication/request/bearertoken"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/kubernetes/pkg/api"
@@ -45,9 +47,7 @@ import (
 	authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
 	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/auth/authenticator/bearertoken"
 	"k8s.io/kubernetes/pkg/auth/authorizer/abac"
-	"k8s.io/kubernetes/pkg/auth/group"
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1"
 	apiserverauthorizer "k8s.io/kubernetes/pkg/genericapiserver/authorizer"
 	"k8s.io/kubernetes/pkg/serviceaccount"

test/integration/auth/rbac_test.go

@@ -34,11 +34,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"k8s.io/apiserver/pkg/authentication/request/bearertoken"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	rbacapi "k8s.io/kubernetes/pkg/apis/rbac"
-	"k8s.io/kubernetes/pkg/auth/authenticator/bearertoken"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	"k8s.io/kubernetes/pkg/client/transport"

test/integration/framework/BUILD

@@ -28,7 +28,6 @@ go_library(
         "//pkg/apis/policy/v1alpha1:go_default_library",
         "//pkg/apis/rbac/v1alpha1:go_default_library",
         "//pkg/apis/storage/v1beta1:go_default_library",
-        "//pkg/auth/authorizer/union:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
@@ -47,7 +46,6 @@ go_library(
         "//pkg/util/env:go_default_library",
         "//pkg/version:go_default_library",
         "//plugin/pkg/admission/admit:go_default_library",
-        "//plugin/pkg/auth/authenticator/request/union:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/utils:go_default_library",
         "//vendor:github.com/go-openapi/spec",
@@ -61,8 +59,10 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/apimachinery/pkg/watch",
         "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/request/union",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
+        "//vendor:k8s.io/apiserver/pkg/authorization/union",
     ],
 )
 

test/integration/framework/master_utils.go

@@ -34,8 +34,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
 	authauthenticator "k8s.io/apiserver/pkg/authentication/authenticator"
+	authenticatorunion "k8s.io/apiserver/pkg/authentication/request/union"
 	"k8s.io/apiserver/pkg/authentication/user"
 	authauthorizer "k8s.io/apiserver/pkg/authorization/authorizer"
+	authorizerunion "k8s.io/apiserver/pkg/authorization/union"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/v1"
@@ -47,7 +49,6 @@ import (
 	policy "k8s.io/kubernetes/pkg/apis/policy/v1alpha1"
 	rbac "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
 	storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
-	authorizerunion "k8s.io/kubernetes/pkg/auth/authorizer/union"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -66,7 +67,6 @@ import (
 	"k8s.io/kubernetes/pkg/util/env"
 	"k8s.io/kubernetes/pkg/version"
 	"k8s.io/kubernetes/plugin/pkg/admission/admit"
-	authenticatorunion "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union"
 
 	"github.com/go-openapi/spec"
 	"github.com/pborman/uuid"

test/integration/serviceaccount/service_account_test.go

@@ -36,12 +36,13 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
+	"k8s.io/apiserver/pkg/authentication/request/bearertoken"
+	"k8s.io/apiserver/pkg/authentication/request/union"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/auth/authenticator/bearertoken"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/restclient"
@@ -50,7 +51,6 @@ import (
 	serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 	serviceaccountadmission "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"
-	"k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union"
 	"k8s.io/kubernetes/test/integration/framework"
 )
 

vendor/BUILD

@@ -13008,3 +13008,198 @@ go_library(
     ],
     tags = ["automanaged"],
 )
+
+go_test(
+    name = "k8s.io/apiserver/pkg/authentication/group_test",
+    srcs = ["k8s.io/apiserver/pkg/authentication/group/group_adder_test.go"],
+    library = ":k8s.io/apiserver/pkg/authentication/group",
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+    ],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/authentication/group",
+    srcs = ["k8s.io/apiserver/pkg/authentication/group/group_adder.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+    ],
+)
+
+go_test(
+    name = "k8s.io/apiserver/pkg/authentication/request/anonymous_test",
+    srcs = ["k8s.io/apiserver/pkg/authentication/request/anonymous/anonymous_test.go"],
+    library = ":k8s.io/apiserver/pkg/authentication/request/anonymous",
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apimachinery/pkg/util/sets",
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+    ],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/authentication/request/anonymous",
+    srcs = ["k8s.io/apiserver/pkg/authentication/request/anonymous/anonymous.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+    ],
+)
+
+go_test(
+    name = "k8s.io/apiserver/pkg/authentication/request/bearertoken_test",
+    srcs = ["k8s.io/apiserver/pkg/authentication/request/bearertoken/bearertoken_test.go"],
+    library = ":k8s.io/apiserver/pkg/authentication/request/bearertoken",
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+    ],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/authentication/request/bearertoken",
+    srcs = ["k8s.io/apiserver/pkg/authentication/request/bearertoken/bearertoken.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+    ],
+)
+
+go_test(
+    name = "k8s.io/apiserver/pkg/authentication/request/union_test",
+    srcs = ["k8s.io/apiserver/pkg/authentication/request/union/unionauth_test.go"],
+    library = ":k8s.io/apiserver/pkg/authentication/request/union",
+    tags = ["automanaged"],
+    deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/authentication/request/union",
+    srcs = ["k8s.io/apiserver/pkg/authentication/request/union/union.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+        "//vendor:k8s.io/client-go/pkg/util/errors",
+    ],
+)
+
+go_test(
+    name = "k8s.io/apiserver/pkg/authentication/request/x509_test",
+    srcs = ["k8s.io/apiserver/pkg/authentication/request/x509/x509_test.go"],
+    library = ":k8s.io/apiserver/pkg/authentication/request/x509",
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+        "//vendor:k8s.io/client-go/pkg/util/sets",
+    ],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/authentication/request/x509",
+    srcs = [
+        "k8s.io/apiserver/pkg/authentication/request/x509/doc.go",
+        "k8s.io/apiserver/pkg/authentication/request/x509/x509.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+        "//vendor:k8s.io/client-go/pkg/util/errors",
+        "//vendor:k8s.io/client-go/pkg/util/sets",
+    ],
+)
+
+go_test(
+    name = "k8s.io/apiserver/pkg/authentication/token/tokenfile_test",
+    srcs = ["k8s.io/apiserver/pkg/authentication/token/tokenfile/tokenfile_test.go"],
+    library = ":k8s.io/apiserver/pkg/authentication/token/tokenfile",
+    tags = ["automanaged"],
+    deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/authentication/token/tokenfile",
+    srcs = ["k8s.io/apiserver/pkg/authentication/token/tokenfile/tokenfile.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apiserver/pkg/authentication/user",
+    ],
+)
+
+go_test(
+    name = "k8s.io/apiserver/pkg/authorization/union_test",
+    srcs = ["k8s.io/apiserver/pkg/authorization/union/union_test.go"],
+    library = ":k8s.io/apiserver/pkg/authorization/union",
+    tags = ["automanaged"],
+    deps = ["//vendor:k8s.io/apiserver/pkg/authorization/authorizer"],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/authorization/union",
+    srcs = ["k8s.io/apiserver/pkg/authorization/union/union.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
+        "//vendor:k8s.io/client-go/pkg/util/errors",
+    ],
+)
+
+go_test(
+    name = "k8s.io/apiserver/pkg/httplog_test",
+    srcs = ["k8s.io/apiserver/pkg/httplog/log_test.go"],
+    library = ":k8s.io/apiserver/pkg/httplog",
+    tags = ["automanaged"],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/httplog",
+    srcs = [
+        "k8s.io/apiserver/pkg/httplog/doc.go",
+        "k8s.io/apiserver/pkg/httplog/log.go",
+    ],
+    tags = ["automanaged"],
+    deps = ["//vendor:github.com/golang/glog"],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/storage/etcd/metrics",
+    srcs = ["k8s.io/apiserver/pkg/storage/etcd/metrics/metrics.go"],
+    tags = ["automanaged"],
+    deps = ["//vendor:github.com/prometheus/client_golang/prometheus"],
+)
+
+go_test(
+    name = "k8s.io/apiserver/pkg/util/cache_test",
+    srcs = [
+        "k8s.io/apiserver/pkg/util/cache/cache_test.go",
+        "k8s.io/apiserver/pkg/util/cache/lruexpirecache_test.go",
+    ],
+    library = ":k8s.io/apiserver/pkg/util/cache",
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/util/clock:go_default_library",
+        "//vendor:github.com/golang/groupcache/lru",
+    ],
+)
+
+go_library(
+    name = "k8s.io/apiserver/pkg/util/cache",
+    srcs = [
+        "k8s.io/apiserver/pkg/util/cache/cache.go",
+        "k8s.io/apiserver/pkg/util/cache/lruexpirecache.go",
+    ],
+    tags = ["automanaged"],
+    deps = ["//vendor:github.com/golang/groupcache/lru"],
+)