From 5280c8d3acbe2d9b7b15c12a2a871b04baff3b73 Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 5 Jan 2017 14:44:09 -0500 Subject: [PATCH 1/2] 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 | 24 ++++----- 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, 12 insertions(+), 427 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 edd60aba53..0000000000 --- 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 c6b277cd81..0000000000 --- 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 0c6d1942d1..0000000000 --- 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 c6c320da5d..0000000000 --- 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 2bb2f0cbbb..4b0ee375a4 100644 --- a/pkg/ssh/BUILD +++ b/pkg/ssh/BUILD @@ -8,6 +8,18 @@ load( "go_test", ) +go_test( + name = "go_default_test", + srcs = ["ssh_test.go"], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:golang.org/x/crypto/ssh", + "//vendor:k8s.io/client-go/pkg/util/wait", + ], +) + go_library( name = "go_default_library", srcs = ["ssh.go"], @@ -22,18 +34,6 @@ go_library( ], ) -go_test( - name = "go_default_test", - srcs = ["ssh_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/crypto/ssh", - "//vendor:k8s.io/client-go/pkg/util/wait", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/storage/etcd/metrics/BUILD b/pkg/storage/etcd/metrics/BUILD deleted file mode 100644 index 85d4d73532..0000000000 --- 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 f85f78ba0d..0000000000 --- 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 ce50fbaf4c..0000000000 --- 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 74d119c7e9..0000000000 --- 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 e3780451fb..0000000000 --- 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 e301c2fddf..0000000000 --- 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 From c4fae4e690772173b8d72d868393e26689f8be7c Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 5 Jan 2017 14:47:14 -0500 Subject: [PATCH 2/2] mechanical repercussions --- pkg/BUILD | 4 - pkg/genericapiserver/BUILD | 4 +- pkg/genericapiserver/api/filters/BUILD | 2 +- .../api/filters/impersonation.go | 2 +- pkg/genericapiserver/api/handlers/BUILD | 2 +- pkg/genericapiserver/api/handlers/proxy.go | 2 +- pkg/genericapiserver/api/handlers/watch.go | 2 +- pkg/genericapiserver/authenticator/BUILD | 12 +- .../authenticator/delegating.go | 10 +- .../authenticator/loopback.go | 4 +- pkg/genericapiserver/config.go | 4 +- pkg/genericapiserver/filters/BUILD | 2 +- pkg/genericapiserver/filters/maxinflight.go | 2 +- pkg/genericapiserver/filters/panics.go | 2 +- pkg/genericapiserver/routes/BUILD | 2 +- pkg/genericapiserver/routes/metrics.go | 2 +- pkg/kubeapiserver/authenticator/BUILD | 12 +- pkg/kubeapiserver/authenticator/config.go | 12 +- pkg/kubeapiserver/authorizer/BUILD | 2 +- pkg/kubeapiserver/authorizer/config.go | 2 +- pkg/kubelet/server/BUILD | 2 +- pkg/kubelet/server/remotecommand/BUILD | 2 +- pkg/kubelet/server/remotecommand/websocket.go | 2 +- pkg/kubelet/server/server.go | 2 +- pkg/storage/etcd/BUILD | 5 +- pkg/storage/etcd/etcd_helper.go | 4 +- pkg/util/BUILD | 1 - plugin/pkg/admission/imagepolicy/BUILD | 2 +- plugin/pkg/admission/imagepolicy/admission.go | 2 +- .../pkg/admission/namespace/lifecycle/BUILD | 2 +- .../namespace/lifecycle/admission.go | 2 +- plugin/pkg/auth/authenticator/BUILD | 4 - .../authenticator/request/headerrequest/BUILD | 2 +- .../request/headerrequest/requestheader.go | 2 +- .../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 +- .../pkg/authentication/request/x509/doc.go | 2 +- .../src/k8s.io/apiserver/pkg/httplog/doc.go | 2 +- test/integration/auth/auth_test.go | 4 +- test/integration/auth/rbac_test.go | 2 +- test/integration/framework/BUILD | 4 +- test/integration/framework/master_utils.go | 4 +- .../serviceaccount/service_account_test.go | 4 +- vendor/BUILD | 195 ++++++++++++++++++ 46 files changed, 265 insertions(+), 80 deletions(-) diff --git a/pkg/BUILD b/pkg/BUILD index ee6fc72c2a..d9137605b2 100644 --- a/pkg/BUILD +++ b/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", diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index a8b450c169..6288e290ce 100644 --- a/pkg/genericapiserver/BUILD +++ b/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", ], ) diff --git a/pkg/genericapiserver/api/filters/BUILD b/pkg/genericapiserver/api/filters/BUILD index f29f23e552..8dc61a059c 100644 --- a/pkg/genericapiserver/api/filters/BUILD +++ b/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", ], ) diff --git a/pkg/genericapiserver/api/filters/impersonation.go b/pkg/genericapiserver/api/filters/impersonation.go index b7de900d29..2d0c86f1aa 100644 --- a/pkg/genericapiserver/api/filters/impersonation.go +++ b/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" ) diff --git a/pkg/genericapiserver/api/handlers/BUILD b/pkg/genericapiserver/api/handlers/BUILD index 693c514923..5c4c192ead 100644 --- a/pkg/genericapiserver/api/handlers/BUILD +++ b/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", ], ) diff --git a/pkg/genericapiserver/api/handlers/proxy.go b/pkg/genericapiserver/api/handlers/proxy.go index 81b90fa485..d2bd9a81f6 100644 --- a/pkg/genericapiserver/api/handlers/proxy.go +++ b/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" diff --git a/pkg/genericapiserver/api/handlers/watch.go b/pkg/genericapiserver/api/handlers/watch.go index a80d4cfe7e..250db857bb 100755 --- a/pkg/genericapiserver/api/handlers/watch.go +++ b/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" diff --git a/pkg/genericapiserver/authenticator/BUILD b/pkg/genericapiserver/authenticator/BUILD index 59ea117b3b..307ebb8c2a 100644 --- a/pkg/genericapiserver/authenticator/BUILD +++ b/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", ], diff --git a/pkg/genericapiserver/authenticator/delegating.go b/pkg/genericapiserver/authenticator/delegating.go index 8c0bcde739..d43c15b4dd 100644 --- a/pkg/genericapiserver/authenticator/delegating.go +++ b/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" ) diff --git a/pkg/genericapiserver/authenticator/loopback.go b/pkg/genericapiserver/authenticator/loopback.go index 2693346c64..a5cb4edc84 100644 --- a/pkg/genericapiserver/authenticator/loopback.go +++ b/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 diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index 9e7bf73e2d..897497410c 100644 --- a/pkg/genericapiserver/config.go +++ b/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 ( diff --git a/pkg/genericapiserver/filters/BUILD b/pkg/genericapiserver/filters/BUILD index a04fb2e365..e1668bd4af 100644 --- a/pkg/genericapiserver/filters/BUILD +++ b/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", ], ) diff --git a/pkg/genericapiserver/filters/maxinflight.go b/pkg/genericapiserver/filters/maxinflight.go index f4d7da2302..82bcccbd19 100644 --- a/pkg/genericapiserver/filters/maxinflight.go +++ b/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" ) diff --git a/pkg/genericapiserver/filters/panics.go b/pkg/genericapiserver/filters/panics.go index c88bb7b239..b79772dc71 100644 --- a/pkg/genericapiserver/filters/panics.go +++ b/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. diff --git a/pkg/genericapiserver/routes/BUILD b/pkg/genericapiserver/routes/BUILD index 5074c5befc..5645a05599 100644 --- a/pkg/genericapiserver/routes/BUILD +++ b/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", ], ) diff --git a/pkg/genericapiserver/routes/metrics.go b/pkg/genericapiserver/routes/metrics.go index 8bf5750332..a9cfcb68b8 100644 --- a/pkg/genericapiserver/routes/metrics.go +++ b/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" ) diff --git a/pkg/kubeapiserver/authenticator/BUILD b/pkg/kubeapiserver/authenticator/BUILD index 6c4fe060b9..cd3e65c878 100644 --- a/pkg/kubeapiserver/authenticator/BUILD +++ b/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", diff --git a/pkg/kubeapiserver/authenticator/config.go b/pkg/kubeapiserver/authenticator/config.go index eddf0f3c98..807f4a1697 100644 --- a/pkg/kubeapiserver/authenticator/config.go +++ b/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. diff --git a/pkg/kubeapiserver/authorizer/BUILD b/pkg/kubeapiserver/authorizer/BUILD index 22dc3e33f4..46a1a35e3c 100644 --- a/pkg/kubeapiserver/authorizer/BUILD +++ b/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", ], ) diff --git a/pkg/kubeapiserver/authorizer/config.go b/pkg/kubeapiserver/authorizer/config.go index 2edc2a7933..10d98f1096 100644 --- a/pkg/kubeapiserver/authorizer/config.go +++ b/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" diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 3c9c047c42..c34a9d7e10 100644 --- a/pkg/kubelet/server/BUILD +++ b/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", ], ) diff --git a/pkg/kubelet/server/remotecommand/BUILD b/pkg/kubelet/server/remotecommand/BUILD index bbd6baddd7..96ef9885f4 100644 --- a/pkg/kubelet/server/remotecommand/BUILD +++ b/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", ], ) diff --git a/pkg/kubelet/server/remotecommand/websocket.go b/pkg/kubelet/server/remotecommand/websocket.go index 1b93c864c0..f30d611ad2 100644 --- a/pkg/kubelet/server/remotecommand/websocket.go +++ b/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" ) diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 0e3d757a16..9d225b7d1a 100644 --- a/pkg/kubelet/server/server.go +++ b/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" diff --git a/pkg/storage/etcd/BUILD b/pkg/storage/etcd/BUILD index 33b2b11c27..2b0f3db1d8 100644 --- a/pkg/storage/etcd/BUILD +++ b/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", ], diff --git a/pkg/storage/etcd/etcd_helper.go b/pkg/storage/etcd/etcd_helper.go index 41a3b76826..fd6c226cf2 100644 --- a/pkg/storage/etcd/etcd_helper.go +++ b/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" diff --git a/pkg/util/BUILD b/pkg/util/BUILD index 08a083f7d9..839f84d035 100644 --- a/pkg/util/BUILD +++ b/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", diff --git a/plugin/pkg/admission/imagepolicy/BUILD b/plugin/pkg/admission/imagepolicy/BUILD index 7877b0bf8b..97a6a3fa32 100644 --- a/plugin/pkg/admission/imagepolicy/BUILD +++ b/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", diff --git a/plugin/pkg/admission/imagepolicy/admission.go b/plugin/pkg/admission/imagepolicy/admission.go index a780517442..6eb42dca7f 100644 --- a/plugin/pkg/admission/imagepolicy/admission.go +++ b/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 diff --git a/plugin/pkg/admission/namespace/lifecycle/BUILD b/plugin/pkg/admission/namespace/lifecycle/BUILD index b8d450e488..4ce275e6d8 100644 --- a/plugin/pkg/admission/namespace/lifecycle/BUILD +++ b/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", ], ) diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go index a641950180..7fba82fbe7 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission.go +++ b/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" ) diff --git a/plugin/pkg/auth/authenticator/BUILD b/plugin/pkg/auth/authenticator/BUILD index 830c2821aa..d3ec8689d5 100644 --- a/plugin/pkg/auth/authenticator/BUILD +++ b/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", ], diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD b/plugin/pkg/auth/authenticator/request/headerrequest/BUILD index cd7d0aee8c..df70709e93 100644 --- a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD +++ b/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", diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go b/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go index 88400a1718..8d9cd184b7 100644 --- a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go +++ b/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 { diff --git a/plugin/pkg/auth/authenticator/token/webhook/BUILD b/plugin/pkg/auth/authenticator/token/webhook/BUILD index bc2bbe4d4e..017f393faa 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/BUILD +++ b/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", diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook.go b/plugin/pkg/auth/authenticator/token/webhook/webhook.go index fa2394413d..bb85695eb1 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook.go +++ b/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" diff --git a/plugin/pkg/auth/authorizer/webhook/BUILD b/plugin/pkg/auth/authorizer/webhook/BUILD index d07af885bb..95e461ca0e 100644 --- a/plugin/pkg/auth/authorizer/webhook/BUILD +++ b/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", diff --git a/plugin/pkg/auth/authorizer/webhook/webhook.go b/plugin/pkg/auth/authorizer/webhook/webhook.go index 2e6f744484..4a8c89a6af 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook.go +++ b/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" diff --git a/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go index 807b016fd3..8f3d36b66d 100644 --- a/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go +++ b/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" diff --git a/staging/src/k8s.io/apiserver/pkg/httplog/doc.go b/staging/src/k8s.io/apiserver/pkg/httplog/doc.go index 139dea694a..ade3e974f1 100644 --- a/staging/src/k8s.io/apiserver/pkg/httplog/doc.go +++ b/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" diff --git a/test/integration/auth/auth_test.go b/test/integration/auth/auth_test.go index 116c91e94c..df38fb8a8a 100644 --- a/test/integration/auth/auth_test.go +++ b/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" diff --git a/test/integration/auth/rbac_test.go b/test/integration/auth/rbac_test.go index f5be6cb71b..cd9cd77ec9 100644 --- a/test/integration/auth/rbac_test.go +++ b/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" diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index 8f5e447c8d..539023c199 100644 --- a/test/integration/framework/BUILD +++ b/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", ], ) diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 0bb864e066..d421b08193 100644 --- a/test/integration/framework/master_utils.go +++ b/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" diff --git a/test/integration/serviceaccount/service_account_test.go b/test/integration/serviceaccount/service_account_test.go index 5f21b922ca..7e74c302f6 100644 --- a/test/integration/serviceaccount/service_account_test.go +++ b/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" ) diff --git a/vendor/BUILD b/vendor/BUILD index 11aa99e8ee..a3e82ddaa1 100644 --- a/vendor/BUILD +++ b/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"], +)