From 5280c8d3acbe2d9b7b15c12a2a871b04baff3b73 Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 5 Jan 2017 14:44:09 -0500 Subject: [PATCH] moves of genericapiserver packages without dependencies --- pkg/auth/authenticator/bearertoken/BUILD | 43 ---------------- pkg/auth/authorizer/union/BUILD | 40 --------------- pkg/auth/group/BUILD | 43 ---------------- pkg/httplog/BUILD | 39 -------------- pkg/ssh/BUILD | 20 ++++---- pkg/storage/etcd/metrics/BUILD | 28 ---------- pkg/util/cache/BUILD | 46 ----------------- .../authenticator/request/anonymous/BUILD | 44 ---------------- .../auth/authenticator/request/union/BUILD | 41 --------------- .../pkg/auth/authenticator/request/x509/BUILD | 51 ------------------- .../auth/authenticator/token/tokenfile/BUILD | 40 --------------- .../pkg/authentication}/group/group_adder.go | 0 .../authentication}/group/group_adder_test.go | 0 .../request/anonymous/anonymous.go | 0 .../request/anonymous/anonymous_test.go | 0 .../request}/bearertoken/bearertoken.go | 0 .../request}/bearertoken/bearertoken_test.go | 0 .../authentication}/request/union/union.go | 0 .../request/union/unionauth_test.go | 0 .../pkg/authentication}/request/x509/doc.go | 0 .../request/x509/testdata/client-expired.pem | 0 .../request/x509/testdata/client-valid.pem | 0 .../request/x509/testdata/client.config.json | 0 .../request/x509/testdata/client.csr.json | 0 .../request/x509/testdata/generate.sh | 0 .../x509/testdata/intermediate.config.json | 0 .../x509/testdata/intermediate.csr.json | 0 .../request/x509/testdata/intermediate.pem | 0 .../request/x509/testdata/root.csr.json | 0 .../request/x509/testdata/root.pem | 0 .../pkg/authentication}/request/x509/x509.go | 0 .../authentication}/request/x509/x509_test.go | 0 .../token/tokenfile/tokenfile.go | 0 .../token/tokenfile/tokenfile_test.go | 0 .../pkg/authorization}/union/union.go | 0 .../pkg/authorization}/union/union_test.go | 0 .../src/k8s.io/apiserver/pkg}/httplog/doc.go | 0 .../src/k8s.io/apiserver/pkg}/httplog/log.go | 0 .../k8s.io/apiserver/pkg}/httplog/log_test.go | 0 .../pkg}/storage/etcd/metrics/metrics.go | 0 .../k8s.io/apiserver/pkg}/util/cache/cache.go | 0 .../apiserver/pkg}/util/cache/cache_test.go | 0 .../pkg}/util/cache/lruexpirecache.go | 0 .../pkg}/util/cache/lruexpirecache_test.go | 0 44 files changed, 10 insertions(+), 425 deletions(-) delete mode 100644 pkg/auth/authenticator/bearertoken/BUILD delete mode 100644 pkg/auth/authorizer/union/BUILD delete mode 100644 pkg/auth/group/BUILD delete mode 100644 pkg/httplog/BUILD delete mode 100644 pkg/storage/etcd/metrics/BUILD delete mode 100644 pkg/util/cache/BUILD delete mode 100644 plugin/pkg/auth/authenticator/request/anonymous/BUILD delete mode 100644 plugin/pkg/auth/authenticator/request/union/BUILD delete mode 100644 plugin/pkg/auth/authenticator/request/x509/BUILD delete mode 100644 plugin/pkg/auth/authenticator/token/tokenfile/BUILD rename {pkg/auth => staging/src/k8s.io/apiserver/pkg/authentication}/group/group_adder.go (100%) rename {pkg/auth => staging/src/k8s.io/apiserver/pkg/authentication}/group/group_adder_test.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/anonymous/anonymous.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/anonymous/anonymous_test.go (100%) rename {pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication/request}/bearertoken/bearertoken.go (100%) rename {pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication/request}/bearertoken/bearertoken_test.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/union/union.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/union/unionauth_test.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/doc.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/client-expired.pem (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/client-valid.pem (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/client.config.json (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/client.csr.json (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/generate.sh (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/intermediate.config.json (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/intermediate.csr.json (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/intermediate.pem (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/root.csr.json (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/testdata/root.pem (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/x509.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/request/x509/x509_test.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/token/tokenfile/tokenfile.go (100%) rename {plugin/pkg/auth/authenticator => staging/src/k8s.io/apiserver/pkg/authentication}/token/tokenfile/tokenfile_test.go (100%) rename {pkg/auth/authorizer => staging/src/k8s.io/apiserver/pkg/authorization}/union/union.go (100%) rename {pkg/auth/authorizer => staging/src/k8s.io/apiserver/pkg/authorization}/union/union_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/httplog/doc.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/httplog/log.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/httplog/log_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/metrics/metrics.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/cache/cache.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/cache/cache_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/cache/lruexpirecache.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/cache/lruexpirecache_test.go (100%) diff --git a/pkg/auth/authenticator/bearertoken/BUILD b/pkg/auth/authenticator/bearertoken/BUILD deleted file mode 100644 index edd60aba53472..0000000000000 --- a/pkg/auth/authenticator/bearertoken/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_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"], -) diff --git a/pkg/auth/authorizer/union/BUILD b/pkg/auth/authorizer/union/BUILD deleted file mode 100644 index c6b277cd8172b..0000000000000 --- a/pkg/auth/authorizer/union/BUILD +++ /dev/null @@ -1,40 +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 = ["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"], -) diff --git a/pkg/auth/group/BUILD b/pkg/auth/group/BUILD deleted file mode 100644 index 0c6d1942d1370..0000000000000 --- a/pkg/auth/group/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_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"], -) diff --git a/pkg/httplog/BUILD b/pkg/httplog/BUILD deleted file mode 100644 index c6c320da5dc87..0000000000000 --- a/pkg/httplog/BUILD +++ /dev/null @@ -1,39 +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 = [ - "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"], -) diff --git a/pkg/ssh/BUILD b/pkg/ssh/BUILD index 2bb2f0cbbbf21..4b0ee375a4768 100644 --- a/pkg/ssh/BUILD +++ b/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", ], ) diff --git a/pkg/storage/etcd/metrics/BUILD b/pkg/storage/etcd/metrics/BUILD deleted file mode 100644 index 85d4d73532b45..0000000000000 --- a/pkg/storage/etcd/metrics/BUILD +++ /dev/null @@ -1,28 +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/prometheus/client_golang/prometheus"], -) - -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/cache/BUILD b/pkg/util/cache/BUILD deleted file mode 100644 index f85f78ba0d6f9..0000000000000 --- a/pkg/util/cache/BUILD +++ /dev/null @@ -1,46 +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 = [ - "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"], -) diff --git a/plugin/pkg/auth/authenticator/request/anonymous/BUILD b/plugin/pkg/auth/authenticator/request/anonymous/BUILD deleted file mode 100644 index ce50fbaf4c486..0000000000000 --- a/plugin/pkg/auth/authenticator/request/anonymous/BUILD +++ /dev/null @@ -1,44 +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 = ["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"], -) diff --git a/plugin/pkg/auth/authenticator/request/union/BUILD b/plugin/pkg/auth/authenticator/request/union/BUILD deleted file mode 100644 index 74d119c7e9509..0000000000000 --- a/plugin/pkg/auth/authenticator/request/union/BUILD +++ /dev/null @@ -1,41 +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 = ["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"], -) diff --git a/plugin/pkg/auth/authenticator/request/x509/BUILD b/plugin/pkg/auth/authenticator/request/x509/BUILD deleted file mode 100644 index e3780451fb5cc..0000000000000 --- a/plugin/pkg/auth/authenticator/request/x509/BUILD +++ /dev/null @@ -1,51 +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 = ["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"], -) diff --git a/plugin/pkg/auth/authenticator/token/tokenfile/BUILD b/plugin/pkg/auth/authenticator/token/tokenfile/BUILD deleted file mode 100644 index e301c2fddf3b3..0000000000000 --- a/plugin/pkg/auth/authenticator/token/tokenfile/BUILD +++ /dev/null @@ -1,40 +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 = ["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"], -) diff --git a/pkg/auth/group/group_adder.go b/staging/src/k8s.io/apiserver/pkg/authentication/group/group_adder.go similarity index 100% rename from pkg/auth/group/group_adder.go rename to staging/src/k8s.io/apiserver/pkg/authentication/group/group_adder.go diff --git a/pkg/auth/group/group_adder_test.go b/staging/src/k8s.io/apiserver/pkg/authentication/group/group_adder_test.go similarity index 100% rename from pkg/auth/group/group_adder_test.go rename to staging/src/k8s.io/apiserver/pkg/authentication/group/group_adder_test.go diff --git a/plugin/pkg/auth/authenticator/request/anonymous/anonymous.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/anonymous/anonymous.go similarity index 100% rename from plugin/pkg/auth/authenticator/request/anonymous/anonymous.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/anonymous/anonymous.go diff --git a/plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/anonymous/anonymous_test.go similarity index 100% rename from plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/anonymous/anonymous_test.go diff --git a/pkg/auth/authenticator/bearertoken/bearertoken.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/bearertoken/bearertoken.go similarity index 100% rename from pkg/auth/authenticator/bearertoken/bearertoken.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/bearertoken/bearertoken.go diff --git a/pkg/auth/authenticator/bearertoken/bearertoken_test.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/bearertoken/bearertoken_test.go similarity index 100% rename from pkg/auth/authenticator/bearertoken/bearertoken_test.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/bearertoken/bearertoken_test.go diff --git a/plugin/pkg/auth/authenticator/request/union/union.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/union/union.go similarity index 100% rename from plugin/pkg/auth/authenticator/request/union/union.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/union/union.go diff --git a/plugin/pkg/auth/authenticator/request/union/unionauth_test.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/union/unionauth_test.go similarity index 100% rename from plugin/pkg/auth/authenticator/request/union/unionauth_test.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/union/unionauth_test.go diff --git a/plugin/pkg/auth/authenticator/request/x509/doc.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/doc.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/client-expired.pem b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/client-expired.pem similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/client-expired.pem rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/client-expired.pem diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/client-valid.pem b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/client-valid.pem similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/client-valid.pem rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/client-valid.pem diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/client.config.json b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/client.config.json similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/client.config.json rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/client.config.json diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/client.csr.json b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/client.csr.json similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/client.csr.json rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/client.csr.json diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/generate.sh b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/generate.sh similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/generate.sh rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/generate.sh diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/intermediate.config.json b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/intermediate.config.json similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/intermediate.config.json rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/intermediate.config.json diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/intermediate.csr.json b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/intermediate.csr.json similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/intermediate.csr.json rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/intermediate.csr.json diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/intermediate.pem b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/intermediate.pem similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/intermediate.pem rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/intermediate.pem diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/root.csr.json b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/root.csr.json similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/root.csr.json rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/root.csr.json diff --git a/plugin/pkg/auth/authenticator/request/x509/testdata/root.pem b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/root.pem similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/testdata/root.pem rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/testdata/root.pem diff --git a/plugin/pkg/auth/authenticator/request/x509/x509.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/x509.go similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/x509.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/x509.go diff --git a/plugin/pkg/auth/authenticator/request/x509/x509_test.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/x509_test.go similarity index 100% rename from plugin/pkg/auth/authenticator/request/x509/x509_test.go rename to staging/src/k8s.io/apiserver/pkg/authentication/request/x509/x509_test.go diff --git a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go b/staging/src/k8s.io/apiserver/pkg/authentication/token/tokenfile/tokenfile.go similarity index 100% rename from plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go rename to staging/src/k8s.io/apiserver/pkg/authentication/token/tokenfile/tokenfile.go diff --git a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go b/staging/src/k8s.io/apiserver/pkg/authentication/token/tokenfile/tokenfile_test.go similarity index 100% rename from plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go rename to staging/src/k8s.io/apiserver/pkg/authentication/token/tokenfile/tokenfile_test.go diff --git a/pkg/auth/authorizer/union/union.go b/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go similarity index 100% rename from pkg/auth/authorizer/union/union.go rename to staging/src/k8s.io/apiserver/pkg/authorization/union/union.go diff --git a/pkg/auth/authorizer/union/union_test.go b/staging/src/k8s.io/apiserver/pkg/authorization/union/union_test.go similarity index 100% rename from pkg/auth/authorizer/union/union_test.go rename to staging/src/k8s.io/apiserver/pkg/authorization/union/union_test.go diff --git a/pkg/httplog/doc.go b/staging/src/k8s.io/apiserver/pkg/httplog/doc.go similarity index 100% rename from pkg/httplog/doc.go rename to staging/src/k8s.io/apiserver/pkg/httplog/doc.go diff --git a/pkg/httplog/log.go b/staging/src/k8s.io/apiserver/pkg/httplog/log.go similarity index 100% rename from pkg/httplog/log.go rename to staging/src/k8s.io/apiserver/pkg/httplog/log.go diff --git a/pkg/httplog/log_test.go b/staging/src/k8s.io/apiserver/pkg/httplog/log_test.go similarity index 100% rename from pkg/httplog/log_test.go rename to staging/src/k8s.io/apiserver/pkg/httplog/log_test.go diff --git a/pkg/storage/etcd/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/metrics/metrics.go similarity index 100% rename from pkg/storage/etcd/metrics/metrics.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/metrics/metrics.go diff --git a/pkg/util/cache/cache.go b/staging/src/k8s.io/apiserver/pkg/util/cache/cache.go similarity index 100% rename from pkg/util/cache/cache.go rename to staging/src/k8s.io/apiserver/pkg/util/cache/cache.go diff --git a/pkg/util/cache/cache_test.go b/staging/src/k8s.io/apiserver/pkg/util/cache/cache_test.go similarity index 100% rename from pkg/util/cache/cache_test.go rename to staging/src/k8s.io/apiserver/pkg/util/cache/cache_test.go diff --git a/pkg/util/cache/lruexpirecache.go b/staging/src/k8s.io/apiserver/pkg/util/cache/lruexpirecache.go similarity index 100% rename from pkg/util/cache/lruexpirecache.go rename to staging/src/k8s.io/apiserver/pkg/util/cache/lruexpirecache.go diff --git a/pkg/util/cache/lruexpirecache_test.go b/staging/src/k8s.io/apiserver/pkg/util/cache/lruexpirecache_test.go similarity index 100% rename from pkg/util/cache/lruexpirecache_test.go rename to staging/src/k8s.io/apiserver/pkg/util/cache/lruexpirecache_test.go