diff --git a/cmd/kubernetes-discovery/pkg/apiserver/BUILD b/cmd/kubernetes-discovery/pkg/apiserver/BUILD index f03ddc0bfac..46291304c16 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/BUILD +++ b/cmd/kubernetes-discovery/pkg/apiserver/BUILD @@ -70,12 +70,12 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/listers/core/v1:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/runtime:go_default_library", "//pkg/util/diff:go_default_library", "//pkg/util/sets:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/cmd/kubernetes-discovery/pkg/apiserver/handler_proxy_test.go b/cmd/kubernetes-discovery/pkg/apiserver/handler_proxy_test.go index e5fa8ce28f5..247f40efe59 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/handler_proxy_test.go +++ b/cmd/kubernetes-discovery/pkg/apiserver/handler_proxy_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/auth/user" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/util/sets" diff --git a/pkg/admission/BUILD b/pkg/admission/BUILD index e64710a1ae5..8cf61780c1b 100644 --- a/pkg/admission/BUILD +++ b/pkg/admission/BUILD @@ -22,12 +22,12 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/util/errors:go_default_library", "//pkg/util/sets:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/admission/attributes.go b/pkg/admission/attributes.go index 66e5be333d9..9cdec48ad66 100644 --- a/pkg/admission/attributes.go +++ b/pkg/admission/attributes.go @@ -17,7 +17,7 @@ limitations under the License. package admission import ( - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/admission/interfaces.go b/pkg/admission/interfaces.go index a2f4ef0a4bf..c998524b7a7 100644 --- a/pkg/admission/interfaces.go +++ b/pkg/admission/interfaces.go @@ -17,7 +17,7 @@ limitations under the License. package admission import ( - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/apis/abac/v0/BUILD b/pkg/apis/abac/v0/BUILD index 168f41656d2..382994e8f79 100644 --- a/pkg/apis/abac/v0/BUILD +++ b/pkg/apis/abac/v0/BUILD @@ -19,10 +19,10 @@ go_library( deps = [ "//pkg/apis/abac:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -33,6 +33,6 @@ go_test( deps = [ "//pkg/apis/abac:go_default_library", "//pkg/apis/abac/v0:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/apis/abac/v0/conversion.go b/pkg/apis/abac/v0/conversion.go index 722b9df100e..e1812adaca4 100644 --- a/pkg/apis/abac/v0/conversion.go +++ b/pkg/apis/abac/v0/conversion.go @@ -17,8 +17,8 @@ limitations under the License. package v0 import ( + "k8s.io/apiserver/pkg/authentication/user" api "k8s.io/kubernetes/pkg/apis/abac" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/apis/abac/v0/conversion_test.go b/pkg/apis/abac/v0/conversion_test.go index ff260d7bcc8..419005da17d 100644 --- a/pkg/apis/abac/v0/conversion_test.go +++ b/pkg/apis/abac/v0/conversion_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" + "k8s.io/apiserver/pkg/authentication/user" api "k8s.io/kubernetes/pkg/apis/abac" "k8s.io/kubernetes/pkg/apis/abac/v0" - "k8s.io/kubernetes/pkg/auth/user" ) func TestV0Conversion(t *testing.T) { diff --git a/pkg/apis/abac/v1beta1/BUILD b/pkg/apis/abac/v1beta1/BUILD index 657dc2c05ce..b908153bd26 100644 --- a/pkg/apis/abac/v1beta1/BUILD +++ b/pkg/apis/abac/v1beta1/BUILD @@ -22,10 +22,10 @@ go_library( deps = [ "//pkg/apis/abac:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -36,6 +36,6 @@ go_test( deps = [ "//pkg/apis/abac:go_default_library", "//pkg/apis/abac/v1beta1:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/apis/abac/v1beta1/conversion.go b/pkg/apis/abac/v1beta1/conversion.go index 6186314ae98..6fb9fcdc576 100644 --- a/pkg/apis/abac/v1beta1/conversion.go +++ b/pkg/apis/abac/v1beta1/conversion.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( + "k8s.io/apiserver/pkg/authentication/user" api "k8s.io/kubernetes/pkg/apis/abac" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/apis/abac/v1beta1/conversion_test.go b/pkg/apis/abac/v1beta1/conversion_test.go index 430e833e143..0f04c416b9f 100644 --- a/pkg/apis/abac/v1beta1/conversion_test.go +++ b/pkg/apis/abac/v1beta1/conversion_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" + "k8s.io/apiserver/pkg/authentication/user" api "k8s.io/kubernetes/pkg/apis/abac" "k8s.io/kubernetes/pkg/apis/abac/v1beta1" - "k8s.io/kubernetes/pkg/auth/user" ) func TestV1Beta1Conversion(t *testing.T) { diff --git a/pkg/apis/rbac/validation/BUILD b/pkg/apis/rbac/validation/BUILD index 5ca89d071ea..97d4bcb2920 100644 --- a/pkg/apis/rbac/validation/BUILD +++ b/pkg/apis/rbac/validation/BUILD @@ -21,12 +21,12 @@ go_library( "//pkg/api/validation:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/serviceaccount:go_default_library", "//pkg/util/errors:go_default_library", "//pkg/util/validation/field:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -42,8 +42,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/util/diff:go_default_library", "//pkg/util/validation/field:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/apis/rbac/validation/rulevalidation.go b/pkg/apis/rbac/validation/rulevalidation.go index b29a7e846c5..777a0b72e08 100644 --- a/pkg/apis/rbac/validation/rulevalidation.go +++ b/pkg/apis/rbac/validation/rulevalidation.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/user" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/auth/user" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/serviceaccount" utilerrors "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/apis/rbac/validation/rulevalidation_test.go b/pkg/apis/rbac/validation/rulevalidation_test.go index 679c70a3a5b..eba19742ac0 100644 --- a/pkg/apis/rbac/validation/rulevalidation_test.go +++ b/pkg/apis/rbac/validation/rulevalidation_test.go @@ -23,9 +23,9 @@ import ( "sort" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/util/diff" ) diff --git a/pkg/auth/authenticator/BUILD b/pkg/auth/authenticator/BUILD index df472cc1b50..d48de869913 100644 --- a/pkg/auth/authenticator/BUILD +++ b/pkg/auth/authenticator/BUILD @@ -11,5 +11,5 @@ go_library( name = "go_default_library", srcs = ["interfaces.go"], tags = ["automanaged"], - deps = ["//pkg/auth/user:go_default_library"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], ) diff --git a/pkg/auth/authenticator/bearertoken/BUILD b/pkg/auth/authenticator/bearertoken/BUILD index 028a747a823..cebb38b60da 100644 --- a/pkg/auth/authenticator/bearertoken/BUILD +++ b/pkg/auth/authenticator/bearertoken/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -25,6 +25,6 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/auth/authenticator/bearertoken/bearertoken.go b/pkg/auth/authenticator/bearertoken/bearertoken.go index 35f523d6820..cae0918bfc6 100644 --- a/pkg/auth/authenticator/bearertoken/bearertoken.go +++ b/pkg/auth/authenticator/bearertoken/bearertoken.go @@ -20,8 +20,8 @@ import ( "net/http" "strings" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" ) type Authenticator struct { diff --git a/pkg/auth/authenticator/bearertoken/bearertoken_test.go b/pkg/auth/authenticator/bearertoken/bearertoken_test.go index 0a90df2611a..d771b859f99 100644 --- a/pkg/auth/authenticator/bearertoken/bearertoken_test.go +++ b/pkg/auth/authenticator/bearertoken/bearertoken_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" ) func TestAuthenticateRequest(t *testing.T) { diff --git a/pkg/auth/authenticator/interfaces.go b/pkg/auth/authenticator/interfaces.go index 1eafe605c61..fd3d0383e52 100644 --- a/pkg/auth/authenticator/interfaces.go +++ b/pkg/auth/authenticator/interfaces.go @@ -19,7 +19,7 @@ package authenticator import ( "net/http" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) // Token checks a string value against a backing authentication store and returns diff --git a/pkg/auth/authorizer/BUILD b/pkg/auth/authorizer/BUILD index df472cc1b50..d48de869913 100644 --- a/pkg/auth/authorizer/BUILD +++ b/pkg/auth/authorizer/BUILD @@ -11,5 +11,5 @@ go_library( name = "go_default_library", srcs = ["interfaces.go"], tags = ["automanaged"], - deps = ["//pkg/auth/user:go_default_library"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], ) diff --git a/pkg/auth/authorizer/abac/BUILD b/pkg/auth/authorizer/abac/BUILD index 7ba59cdb85e..615803a5910 100644 --- a/pkg/auth/authorizer/abac/BUILD +++ b/pkg/auth/authorizer/abac/BUILD @@ -43,7 +43,7 @@ go_test( "//pkg/apis/abac/v0:go_default_library", "//pkg/apis/abac/v1beta1:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/runtime:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/auth/authorizer/abac/abac_test.go b/pkg/auth/authorizer/abac/abac_test.go index 7942ad2594e..1b2b56fd079 100644 --- a/pkg/auth/authorizer/abac/abac_test.go +++ b/pkg/auth/authorizer/abac/abac_test.go @@ -21,11 +21,11 @@ import ( "os" "testing" + "k8s.io/apiserver/pkg/authentication/user" api "k8s.io/kubernetes/pkg/apis/abac" "k8s.io/kubernetes/pkg/apis/abac/v0" "k8s.io/kubernetes/pkg/apis/abac/v1beta1" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/auth/authorizer/interfaces.go b/pkg/auth/authorizer/interfaces.go index 7255a5040d5..8d2753b972e 100644 --- a/pkg/auth/authorizer/interfaces.go +++ b/pkg/auth/authorizer/interfaces.go @@ -19,7 +19,7 @@ package authorizer import ( "net/http" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) // Attributes is an interface used by an Authorizer to get information about a request diff --git a/pkg/auth/group/BUILD b/pkg/auth/group/BUILD index 00da7ed4c44..137df3b65c5 100644 --- a/pkg/auth/group/BUILD +++ b/pkg/auth/group/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -25,6 +25,6 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/auth/group/group_adder.go b/pkg/auth/group/group_adder.go index 7a15941a94d..09eb0524a92 100644 --- a/pkg/auth/group/group_adder.go +++ b/pkg/auth/group/group_adder.go @@ -19,8 +19,8 @@ package group import ( "net/http" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" ) // GroupAdder adds groups to an authenticated user.Info diff --git a/pkg/auth/group/group_adder_test.go b/pkg/auth/group/group_adder_test.go index 4eec6c0b3bf..f5550cb529d 100644 --- a/pkg/auth/group/group_adder_test.go +++ b/pkg/auth/group/group_adder_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" ) func TestGroupAdder(t *testing.T) { diff --git a/pkg/auth/handlers/BUILD b/pkg/auth/handlers/BUILD index 192e14c69f8..ffbe61b896a 100644 --- a/pkg/auth/handlers/BUILD +++ b/pkg/auth/handlers/BUILD @@ -27,7 +27,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/auth/handlers/handlers_test.go b/pkg/auth/handlers/handlers_test.go index d4a1438c19a..530064a2e48 100644 --- a/pkg/auth/handlers/handlers_test.go +++ b/pkg/auth/handlers/handlers_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index 8ad95b38139..a8a02efcda6 100644 --- a/pkg/genericapiserver/BUILD +++ b/pkg/genericapiserver/BUILD @@ -37,7 +37,6 @@ go_library( "//pkg/auth/authorizer:go_default_library", "//pkg/auth/authorizer/union:go_default_library", "//pkg/auth/handlers:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/genericapiserver/api:go_default_library", "//pkg/genericapiserver/api/filters:go_default_library", @@ -76,6 +75,7 @@ go_library( "//vendor:github.com/pkg/errors", "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:gopkg.in/natefinch/lumberjack.v2", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -105,7 +105,6 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", @@ -122,5 +121,6 @@ go_test( "//pkg/version:go_default_library", "//vendor:github.com/go-openapi/spec", "//vendor:github.com/stretchr/testify/assert", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/genericapiserver/api/filters/BUILD b/pkg/genericapiserver/api/filters/BUILD index d1e42e05dff..56c98483c65 100644 --- a/pkg/genericapiserver/api/filters/BUILD +++ b/pkg/genericapiserver/api/filters/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/authentication:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/httplog:go_default_library", @@ -30,6 +29,7 @@ go_library( "//pkg/util/net:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/pborman/uuid", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -47,9 +47,9 @@ go_test( "//pkg/apis/authentication:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/genericapiserver/api/handlers/responsewriters:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/util/sets:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/genericapiserver/api/filters/audit_test.go b/pkg/genericapiserver/api/filters/audit_test.go index b592432afd3..6637629ed7c 100644 --- a/pkg/genericapiserver/api/filters/audit_test.go +++ b/pkg/genericapiserver/api/filters/audit_test.go @@ -28,7 +28,7 @@ import ( "strings" "testing" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) diff --git a/pkg/genericapiserver/api/filters/impersonation.go b/pkg/genericapiserver/api/filters/impersonation.go index 168968d770c..d12be0fd407 100644 --- a/pkg/genericapiserver/api/filters/impersonation.go +++ b/pkg/genericapiserver/api/filters/impersonation.go @@ -24,10 +24,10 @@ import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/httplog" diff --git a/pkg/genericapiserver/api/filters/impersonation_test.go b/pkg/genericapiserver/api/filters/impersonation_test.go index b4c9a217816..435145843c4 100644 --- a/pkg/genericapiserver/api/filters/impersonation_test.go +++ b/pkg/genericapiserver/api/filters/impersonation_test.go @@ -24,9 +24,9 @@ import ( "sync" "testing" + "k8s.io/apiserver/pkg/authentication/user" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) diff --git a/pkg/genericapiserver/api/request/BUILD b/pkg/genericapiserver/api/request/BUILD index e06b787341d..199a0f36b77 100644 --- a/pkg/genericapiserver/api/request/BUILD +++ b/pkg/genericapiserver/api/request/BUILD @@ -18,11 +18,11 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/auth/user:go_default_library", "//pkg/types:go_default_library", "//pkg/util/sets:go_default_library", "//vendor:github.com/golang/glog", "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -40,8 +40,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/types:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/genericapiserver/api/request/context.go b/pkg/genericapiserver/api/request/context.go index e3eae5fc5d1..eefa1e7257c 100644 --- a/pkg/genericapiserver/api/request/context.go +++ b/pkg/genericapiserver/api/request/context.go @@ -21,7 +21,7 @@ import ( "time" "golang.org/x/net/context" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/genericapiserver/api/request/context_test.go b/pkg/genericapiserver/api/request/context_test.go index 4b1f398fc0b..5819e4c8e94 100644 --- a/pkg/genericapiserver/api/request/context_test.go +++ b/pkg/genericapiserver/api/request/context_test.go @@ -19,8 +19,8 @@ package request_test import ( "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/auth/user" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/genericapiserver/authenticator/BUILD b/pkg/genericapiserver/authenticator/BUILD index a40f825fe5c..903aec3e905 100644 --- a/pkg/genericapiserver/authenticator/BUILD +++ b/pkg/genericapiserver/authenticator/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/auth/authenticator:go_default_library", "//pkg/auth/authenticator/bearertoken:go_default_library", "//pkg/auth/group:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/clientset_generated/clientset/typed/authentication/v1beta1:go_default_library", "//pkg/util/cert:go_default_library", "//plugin/pkg/auth/authenticator/request/anonymous:go_default_library", @@ -29,5 +28,6 @@ go_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/user", ], ) diff --git a/pkg/genericapiserver/authenticator/delegating.go b/pkg/genericapiserver/authenticator/delegating.go index 6e6927fa5b6..8875431ef07 100644 --- a/pkg/genericapiserver/authenticator/delegating.go +++ b/pkg/genericapiserver/authenticator/delegating.go @@ -23,10 +23,10 @@ import ( "github.com/go-openapi/spec" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" "k8s.io/kubernetes/pkg/auth/group" - "k8s.io/kubernetes/pkg/auth/user" authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" "k8s.io/kubernetes/pkg/util/cert" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/anonymous" diff --git a/pkg/genericapiserver/authenticator/loopback.go b/pkg/genericapiserver/authenticator/loopback.go index 8e3536a31c2..9ae672ee30e 100644 --- a/pkg/genericapiserver/authenticator/loopback.go +++ b/pkg/genericapiserver/authenticator/loopback.go @@ -17,9 +17,9 @@ limitations under the License. package authenticator import ( + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile" ) diff --git a/pkg/genericapiserver/authorizer/BUILD b/pkg/genericapiserver/authorizer/BUILD index 90805190cdc..a160340a283 100644 --- a/pkg/genericapiserver/authorizer/BUILD +++ b/pkg/genericapiserver/authorizer/BUILD @@ -32,6 +32,6 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/genericapiserver/authorizer/authz_test.go b/pkg/genericapiserver/authorizer/authz_test.go index 11f0ea34c00..e0fbc899c86 100644 --- a/pkg/genericapiserver/authorizer/authz_test.go +++ b/pkg/genericapiserver/authorizer/authz_test.go @@ -19,8 +19,8 @@ package authorizer import ( "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" ) // NewAlwaysAllowAuthorizer must return a struct which implements authorizer.Authorizer diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index e658817398a..ea7583e8a4a 100644 --- a/pkg/genericapiserver/config.go +++ b/pkg/genericapiserver/config.go @@ -36,6 +36,7 @@ import ( "github.com/pborman/uuid" "gopkg.in/natefinch/lumberjack.v2" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" @@ -43,7 +44,6 @@ import ( "k8s.io/kubernetes/pkg/auth/authorizer" authorizerunion "k8s.io/kubernetes/pkg/auth/authorizer/union" authhandlers "k8s.io/kubernetes/pkg/auth/handlers" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/restclient" genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/api/filters" apiopenapi "k8s.io/kubernetes/pkg/genericapiserver/api/openapi" diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go index 90c7a4c2c2b..0d409bf9859 100644 --- a/pkg/genericapiserver/genericapiserver_test.go +++ b/pkg/genericapiserver/genericapiserver_test.go @@ -27,6 +27,7 @@ import ( "reflect" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" @@ -36,7 +37,6 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" openapigen "k8s.io/kubernetes/pkg/generated/openapi" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/kubeapiserver/authenticator/BUILD b/pkg/kubeapiserver/authenticator/BUILD index 17ecac0e23c..e3211fda53b 100644 --- a/pkg/kubeapiserver/authenticator/BUILD +++ b/pkg/kubeapiserver/authenticator/BUILD @@ -15,7 +15,6 @@ go_library( "//pkg/auth/authenticator:go_default_library", "//pkg/auth/authenticator/bearertoken:go_default_library", "//pkg/auth/group:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/genericapiserver/authenticator:go_default_library", "//pkg/serviceaccount:go_default_library", "//pkg/util/cert:go_default_library", @@ -31,5 +30,6 @@ go_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/user", ], ) diff --git a/pkg/kubeapiserver/authenticator/config.go b/pkg/kubeapiserver/authenticator/config.go index b85c659b0b7..141652c1ed7 100644 --- a/pkg/kubeapiserver/authenticator/config.go +++ b/pkg/kubeapiserver/authenticator/config.go @@ -21,10 +21,10 @@ import ( "github.com/go-openapi/spec" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" "k8s.io/kubernetes/pkg/auth/group" - "k8s.io/kubernetes/pkg/auth/user" genericauthenticator "k8s.io/kubernetes/pkg/genericapiserver/authenticator" "k8s.io/kubernetes/pkg/serviceaccount" certutil "k8s.io/kubernetes/pkg/util/cert" diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 49b5f5825dc..63179a65c62 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/apis/meta/v1:go_default_library", "//pkg/auth/authenticator:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/healthz:go_default_library", "//pkg/httplog:go_default_library", "//pkg/kubelet/cm:go_default_library", @@ -47,6 +46,7 @@ go_library( "//vendor:github.com/google/cadvisor/info/v1", "//vendor:github.com/google/cadvisor/info/v2", "//vendor:github.com/prometheus/client_golang/prometheus", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -63,7 +63,6 @@ go_test( "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", @@ -81,5 +80,6 @@ go_test( "//vendor:github.com/google/cadvisor/info/v2", "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/kubelet/server/auth.go b/pkg/kubelet/server/auth.go index a1daf92d587..16143af2307 100644 --- a/pkg/kubelet/server/auth.go +++ b/pkg/kubelet/server/auth.go @@ -21,9 +21,9 @@ import ( "strings" "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 3415cb7a751..5a2c4eb672a 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -38,11 +38,11 @@ import ( cadvisorapiv2 "github.com/google/cadvisor/info/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainertesting "k8s.io/kubernetes/pkg/kubelet/container/testing" diff --git a/pkg/registry/authorization/util/BUILD b/pkg/registry/authorization/util/BUILD index 539fd83d136..1553d190924 100644 --- a/pkg/registry/authorization/util/BUILD +++ b/pkg/registry/authorization/util/BUILD @@ -14,6 +14,6 @@ go_library( deps = [ "//pkg/apis/authorization:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/registry/authorization/util/helpers.go b/pkg/registry/authorization/util/helpers.go index a9f7ac1d72f..a9bdc2d47e5 100644 --- a/pkg/registry/authorization/util/helpers.go +++ b/pkg/registry/authorization/util/helpers.go @@ -17,9 +17,9 @@ limitations under the License. package util import ( + "k8s.io/apiserver/pkg/authentication/user" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" ) // ResourceAttributesFrom combines the API object information and the user.Info from the context to build a full authorizer.AttributesRecord for resource access diff --git a/pkg/registry/certificates/certificates/BUILD b/pkg/registry/certificates/certificates/BUILD index 6adfb64bc21..11fdd26240e 100644 --- a/pkg/registry/certificates/certificates/BUILD +++ b/pkg/registry/certificates/certificates/BUILD @@ -40,9 +40,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/apis/certificates:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/runtime:go_default_library", "//pkg/util/diff:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/registry/certificates/certificates/strategy_test.go b/pkg/registry/certificates/certificates/strategy_test.go index db571da4e1e..ea5c897b50e 100644 --- a/pkg/registry/certificates/certificates/strategy_test.go +++ b/pkg/registry/certificates/certificates/strategy_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" + "k8s.io/apiserver/pkg/authentication/user" certapi "k8s.io/kubernetes/pkg/apis/certificates" - "k8s.io/kubernetes/pkg/auth/user" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/diff" diff --git a/pkg/registry/rbac/BUILD b/pkg/registry/rbac/BUILD index 545eaf7b947..f3e9741522f 100644 --- a/pkg/registry/rbac/BUILD +++ b/pkg/registry/rbac/BUILD @@ -12,7 +12,7 @@ go_library( srcs = ["escalation_check.go"], tags = ["automanaged"], deps = [ - "//pkg/auth/user:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/registry/rbac/escalation_check.go b/pkg/registry/rbac/escalation_check.go index 45deefac921..7b0657a277a 100644 --- a/pkg/registry/rbac/escalation_check.go +++ b/pkg/registry/rbac/escalation_check.go @@ -17,7 +17,7 @@ limitations under the License. package rbac import ( - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) diff --git a/pkg/serviceaccount/BUILD b/pkg/serviceaccount/BUILD index 95162ab3a15..198bd315dd3 100644 --- a/pkg/serviceaccount/BUILD +++ b/pkg/serviceaccount/BUILD @@ -20,9 +20,9 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", "//vendor:github.com/dgrijalva/jwt-go", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/serviceaccount/jwt.go b/pkg/serviceaccount/jwt.go index 111afe1c5dc..dad09cee6b4 100644 --- a/pkg/serviceaccount/jwt.go +++ b/pkg/serviceaccount/jwt.go @@ -26,9 +26,9 @@ import ( "fmt" "io/ioutil" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" jwt "github.com/dgrijalva/jwt-go" "github.com/golang/glog" diff --git a/pkg/serviceaccount/util.go b/pkg/serviceaccount/util.go index d8fbc442f32..9741fe424dc 100644 --- a/pkg/serviceaccount/util.go +++ b/pkg/serviceaccount/util.go @@ -20,10 +20,10 @@ import ( "fmt" "strings" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/auth/user" ) const ( diff --git a/plugin/pkg/admission/gc/BUILD b/plugin/pkg/admission/gc/BUILD index 46aa6c6a664..d7a2f0ad830 100644 --- a/plugin/pkg/admission/gc/BUILD +++ b/plugin/pkg/admission/gc/BUILD @@ -31,8 +31,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/admission/gc/gc_admission_test.go b/plugin/pkg/admission/gc/gc_admission_test.go index 12a4d35b0f2..39abedd230c 100644 --- a/plugin/pkg/admission/gc/gc_admission_test.go +++ b/plugin/pkg/admission/gc/gc_admission_test.go @@ -19,11 +19,11 @@ package gc import ( "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/plugin/pkg/admission/imagepolicy/BUILD b/plugin/pkg/admission/imagepolicy/BUILD index acaf50bfc0b..7ef307b4b09 100644 --- a/plugin/pkg/admission/imagepolicy/BUILD +++ b/plugin/pkg/admission/imagepolicy/BUILD @@ -44,7 +44,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/imagepolicy/install:go_default_library", "//pkg/apis/imagepolicy/v1alpha1:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/unversioned/clientcmd/api/v1:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/admission/imagepolicy/admission_test.go b/plugin/pkg/admission/imagepolicy/admission_test.go index f94c2cea2b6..a32320fe11d 100644 --- a/plugin/pkg/admission/imagepolicy/admission_test.go +++ b/plugin/pkg/admission/imagepolicy/admission_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" "fmt" diff --git a/plugin/pkg/admission/security/podsecuritypolicy/BUILD b/plugin/pkg/admission/security/podsecuritypolicy/BUILD index 9096f850c8f..dac1b0e8b51 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/BUILD +++ b/plugin/pkg/admission/security/podsecuritypolicy/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", @@ -32,6 +31,7 @@ go_library( "//pkg/util/validation/field:go_default_library", "//pkg/watch:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -45,7 +45,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/security/apparmor:go_default_library", "//pkg/security/podsecuritypolicy:go_default_library", @@ -54,5 +53,6 @@ go_test( "//pkg/util/diff:go_default_library", "//pkg/util/sets:go_default_library", "//vendor:github.com/stretchr/testify/assert", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/admission/security/podsecuritypolicy/admission.go b/plugin/pkg/admission/security/podsecuritypolicy/admission.go index f05d2627580..a05be5c5405 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/admission.go +++ b/plugin/pkg/admission/security/podsecuritypolicy/admission.go @@ -23,13 +23,13 @@ import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" diff --git a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go index dc311506ea7..dd49ec60ee9 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go +++ b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/assert" + "k8s.io/apiserver/pkg/authentication/user" kadmission "k8s.io/kubernetes/pkg/admission" kapi "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/security/apparmor" kpsp "k8s.io/kubernetes/pkg/security/podsecuritypolicy" diff --git a/plugin/pkg/auth/authenticator/password/allow/BUILD b/plugin/pkg/auth/authenticator/password/allow/BUILD index e701ebd9df4..98fb2e080fb 100644 --- a/plugin/pkg/auth/authenticator/password/allow/BUILD +++ b/plugin/pkg/auth/authenticator/password/allow/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/password/allow/allow.go b/plugin/pkg/auth/authenticator/password/allow/allow.go index f577c446a06..df5f0e8ef43 100644 --- a/plugin/pkg/auth/authenticator/password/allow/allow.go +++ b/plugin/pkg/auth/authenticator/password/allow/allow.go @@ -17,8 +17,8 @@ limitations under the License. package allow import ( + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" ) type allowAuthenticator struct{} diff --git a/plugin/pkg/auth/authenticator/password/keystone/BUILD b/plugin/pkg/auth/authenticator/password/keystone/BUILD index 1be05d1b7da..3959b6b6467 100644 --- a/plugin/pkg/auth/authenticator/password/keystone/BUILD +++ b/plugin/pkg/auth/authenticator/password/keystone/BUILD @@ -15,11 +15,11 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/auth/user:go_default_library", "//pkg/util/cert:go_default_library", "//pkg/util/net:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/rackspace/gophercloud", "//vendor:github.com/rackspace/gophercloud/openstack", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/password/keystone/keystone.go b/plugin/pkg/auth/authenticator/password/keystone/keystone.go index 1f261820b5c..5a103123b4d 100644 --- a/plugin/pkg/auth/authenticator/password/keystone/keystone.go +++ b/plugin/pkg/auth/authenticator/password/keystone/keystone.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "github.com/rackspace/gophercloud" "github.com/rackspace/gophercloud/openstack" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" certutil "k8s.io/kubernetes/pkg/util/cert" netutil "k8s.io/kubernetes/pkg/util/net" ) diff --git a/plugin/pkg/auth/authenticator/password/passwordfile/BUILD b/plugin/pkg/auth/authenticator/password/passwordfile/BUILD index 9400a842659..616c38dc3d0 100644 --- a/plugin/pkg/auth/authenticator/password/passwordfile/BUILD +++ b/plugin/pkg/auth/authenticator/password/passwordfile/BUILD @@ -13,8 +13,8 @@ go_library( srcs = ["passwordfile.go"], tags = ["automanaged"], deps = [ - "//pkg/auth/user:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -23,5 +23,5 @@ go_test( srcs = ["passwordfile_test.go"], library = ":go_default_library", tags = ["automanaged"], - deps = ["//pkg/auth/user:go_default_library"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], ) diff --git a/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go b/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go index 6496143223a..1d8616b7a44 100644 --- a/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go +++ b/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go @@ -23,7 +23,7 @@ import ( "os" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) type PasswordAuthenticator struct { diff --git a/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go b/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go index 9c343d6e80d..d5c596d8a6a 100644 --- a/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go +++ b/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) func TestPasswordFile(t *testing.T) { diff --git a/plugin/pkg/auth/authenticator/request/anonymous/BUILD b/plugin/pkg/auth/authenticator/request/anonymous/BUILD index 96249646c6c..eb8fa99c5cc 100644 --- a/plugin/pkg/auth/authenticator/request/anonymous/BUILD +++ b/plugin/pkg/auth/authenticator/request/anonymous/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -25,7 +25,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/util/sets:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/request/anonymous/anonymous.go b/plugin/pkg/auth/authenticator/request/anonymous/anonymous.go index 4a7a7a0a845..3f7ac5954cb 100644 --- a/plugin/pkg/auth/authenticator/request/anonymous/anonymous.go +++ b/plugin/pkg/auth/authenticator/request/anonymous/anonymous.go @@ -19,8 +19,8 @@ package anonymous import ( "net/http" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" ) const ( diff --git a/plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go b/plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go index 0d095cfc4aa..ec6668973b8 100644 --- a/plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go +++ b/plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go @@ -19,8 +19,8 @@ package anonymous import ( "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/plugin/pkg/auth/authenticator/request/basicauth/BUILD b/plugin/pkg/auth/authenticator/request/basicauth/BUILD index 9c3d0a4f245..2120f088528 100644 --- a/plugin/pkg/auth/authenticator/request/basicauth/BUILD +++ b/plugin/pkg/auth/authenticator/request/basicauth/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -25,6 +25,6 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go b/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go index a43a751b5e5..2d1712c99fd 100644 --- a/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go +++ b/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go @@ -19,8 +19,8 @@ package basicauth import ( "net/http" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" ) // Authenticator authenticates requests using basic auth diff --git a/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go b/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go index 6af0c1befc5..d4168b05164 100644 --- a/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go +++ b/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" ) type testPassword struct { diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD b/plugin/pkg/auth/authenticator/request/headerrequest/BUILD index 9fbb5f9b86b..c33ae09b869 100644 --- a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD +++ b/plugin/pkg/auth/authenticator/request/headerrequest/BUILD @@ -14,10 +14,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/util/cert:go_default_library", "//pkg/util/sets:go_default_library", "//plugin/pkg/auth/authenticator/request/x509:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -26,5 +26,5 @@ go_test( srcs = ["requestheader_test.go"], library = ":go_default_library", tags = ["automanaged"], - deps = ["//pkg/auth/user:go_default_library"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], ) diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go b/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go index 86fe515ea72..c4b376368d4 100644 --- a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go +++ b/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go @@ -23,8 +23,8 @@ import ( "net/http" "strings" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" utilcert "k8s.io/kubernetes/pkg/util/cert" "k8s.io/kubernetes/pkg/util/sets" x509request "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509" diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader_test.go b/plugin/pkg/auth/authenticator/request/headerrequest/requestheader_test.go index b7009d57345..33e5afcacad 100644 --- a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader_test.go +++ b/plugin/pkg/auth/authenticator/request/headerrequest/requestheader_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) func TestRequestHeader(t *testing.T) { diff --git a/plugin/pkg/auth/authenticator/request/union/BUILD b/plugin/pkg/auth/authenticator/request/union/BUILD index ecc5c298b19..31b8c0f0383 100644 --- a/plugin/pkg/auth/authenticator/request/union/BUILD +++ b/plugin/pkg/auth/authenticator/request/union/BUILD @@ -14,8 +14,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/util/errors:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -24,5 +24,5 @@ go_test( srcs = ["unionauth_test.go"], library = ":go_default_library", tags = ["automanaged"], - deps = ["//pkg/auth/user:go_default_library"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], ) diff --git a/plugin/pkg/auth/authenticator/request/union/union.go b/plugin/pkg/auth/authenticator/request/union/union.go index 020f3558c66..bc1ca5da379 100644 --- a/plugin/pkg/auth/authenticator/request/union/union.go +++ b/plugin/pkg/auth/authenticator/request/union/union.go @@ -19,8 +19,8 @@ package union import ( "net/http" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" utilerrors "k8s.io/kubernetes/pkg/util/errors" ) diff --git a/plugin/pkg/auth/authenticator/request/union/unionauth_test.go b/plugin/pkg/auth/authenticator/request/union/unionauth_test.go index 8792339501f..0d3f1a7cf2d 100644 --- a/plugin/pkg/auth/authenticator/request/union/unionauth_test.go +++ b/plugin/pkg/auth/authenticator/request/union/unionauth_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) type mockAuthRequestHandler struct { diff --git a/plugin/pkg/auth/authenticator/request/x509/BUILD b/plugin/pkg/auth/authenticator/request/x509/BUILD index 49093c2bdb3..19dd36864f8 100644 --- a/plugin/pkg/auth/authenticator/request/x509/BUILD +++ b/plugin/pkg/auth/authenticator/request/x509/BUILD @@ -17,10 +17,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/util/errors:go_default_library", "//pkg/util/sets:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -32,7 +32,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/util/sets:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/request/x509/x509.go b/plugin/pkg/auth/authenticator/request/x509/x509.go index 223799cc317..6203f1865a3 100644 --- a/plugin/pkg/auth/authenticator/request/x509/x509.go +++ b/plugin/pkg/auth/authenticator/request/x509/x509.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" utilerrors "k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/plugin/pkg/auth/authenticator/request/x509/x509_test.go b/plugin/pkg/auth/authenticator/request/x509/x509_test.go index 6565bea0bd2..1740834199e 100644 --- a/plugin/pkg/auth/authenticator/request/x509/x509_test.go +++ b/plugin/pkg/auth/authenticator/request/x509/x509_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/plugin/pkg/auth/authenticator/token/anytoken/BUILD b/plugin/pkg/auth/authenticator/token/anytoken/BUILD index b02d7fc2010..8222d992b80 100644 --- a/plugin/pkg/auth/authenticator/token/anytoken/BUILD +++ b/plugin/pkg/auth/authenticator/token/anytoken/BUILD @@ -12,7 +12,7 @@ go_library( name = "go_default_library", srcs = ["anytoken.go"], tags = ["automanaged"], - deps = ["//pkg/auth/user:go_default_library"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], ) go_test( @@ -20,5 +20,5 @@ go_test( srcs = ["anytoken_test.go"], library = ":go_default_library", tags = ["automanaged"], - deps = ["//pkg/auth/user:go_default_library"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], ) diff --git a/plugin/pkg/auth/authenticator/token/anytoken/anytoken.go b/plugin/pkg/auth/authenticator/token/anytoken/anytoken.go index 6e23999a7fc..049497cb66e 100644 --- a/plugin/pkg/auth/authenticator/token/anytoken/anytoken.go +++ b/plugin/pkg/auth/authenticator/token/anytoken/anytoken.go @@ -19,7 +19,7 @@ package anytoken import ( "strings" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) type AnyTokenAuthenticator struct{} diff --git a/plugin/pkg/auth/authenticator/token/anytoken/anytoken_test.go b/plugin/pkg/auth/authenticator/token/anytoken/anytoken_test.go index 5375050dcf7..3b261a0405d 100644 --- a/plugin/pkg/auth/authenticator/token/anytoken/anytoken_test.go +++ b/plugin/pkg/auth/authenticator/token/anytoken/anytoken_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) func TestAnyTokenAuthenticator(t *testing.T) { diff --git a/plugin/pkg/auth/authenticator/token/oidc/BUILD b/plugin/pkg/auth/authenticator/token/oidc/BUILD index cca7428312f..c00dcefe284 100644 --- a/plugin/pkg/auth/authenticator/token/oidc/BUILD +++ b/plugin/pkg/auth/authenticator/token/oidc/BUILD @@ -13,13 +13,13 @@ go_library( srcs = ["oidc.go"], tags = ["automanaged"], deps = [ - "//pkg/auth/user:go_default_library", "//pkg/util/cert:go_default_library", "//pkg/util/net:go_default_library", "//pkg/util/runtime:go_default_library", "//vendor:github.com/coreos/go-oidc/jose", "//vendor:github.com/coreos/go-oidc/oidc", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -29,9 +29,9 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/auth/user:go_default_library", "//plugin/pkg/auth/authenticator/token/oidc/testing:go_default_library", "//vendor:github.com/coreos/go-oidc/jose", "//vendor:github.com/coreos/go-oidc/oidc", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/token/oidc/oidc.go b/plugin/pkg/auth/authenticator/token/oidc/oidc.go index c2f4abcb2e3..c441aaa8658 100644 --- a/plugin/pkg/auth/authenticator/token/oidc/oidc.go +++ b/plugin/pkg/auth/authenticator/token/oidc/oidc.go @@ -39,7 +39,7 @@ import ( "github.com/coreos/go-oidc/jose" "github.com/coreos/go-oidc/oidc" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" certutil "k8s.io/kubernetes/pkg/util/cert" "k8s.io/kubernetes/pkg/util/net" "k8s.io/kubernetes/pkg/util/runtime" diff --git a/plugin/pkg/auth/authenticator/token/oidc/oidc_test.go b/plugin/pkg/auth/authenticator/token/oidc/oidc_test.go index 01df1f3c9d7..232b8902461 100644 --- a/plugin/pkg/auth/authenticator/token/oidc/oidc_test.go +++ b/plugin/pkg/auth/authenticator/token/oidc/oidc_test.go @@ -29,7 +29,7 @@ import ( "github.com/coreos/go-oidc/jose" "github.com/coreos/go-oidc/oidc" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" oidctesting "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc/testing" ) diff --git a/plugin/pkg/auth/authenticator/token/tokenfile/BUILD b/plugin/pkg/auth/authenticator/token/tokenfile/BUILD index 5de558ac325..a225a2e69e5 100644 --- a/plugin/pkg/auth/authenticator/token/tokenfile/BUILD +++ b/plugin/pkg/auth/authenticator/token/tokenfile/BUILD @@ -13,8 +13,8 @@ go_library( srcs = ["tokenfile.go"], tags = ["automanaged"], deps = [ - "//pkg/auth/user:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -23,5 +23,5 @@ go_test( srcs = ["tokenfile_test.go"], library = ":go_default_library", tags = ["automanaged"], - deps = ["//pkg/auth/user:go_default_library"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], ) diff --git a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go b/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go index b973556f8da..43ff764de9e 100644 --- a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go +++ b/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) type TokenAuthenticator struct { diff --git a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go b/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go index 8bb7a56265d..6fd13ba2d80 100644 --- a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go +++ b/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/apiserver/pkg/authentication/user" ) func TestTokenFile(t *testing.T) { diff --git a/plugin/pkg/auth/authenticator/token/tokentest/BUILD b/plugin/pkg/auth/authenticator/token/tokentest/BUILD index 2d973de9adc..28dbf043976 100644 --- a/plugin/pkg/auth/authenticator/token/tokentest/BUILD +++ b/plugin/pkg/auth/authenticator/token/tokentest/BUILD @@ -11,5 +11,5 @@ go_library( name = "go_default_library", srcs = ["tokentest.go"], tags = ["automanaged"], - deps = ["//pkg/auth/user:go_default_library"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], ) diff --git a/plugin/pkg/auth/authenticator/token/tokentest/tokentest.go b/plugin/pkg/auth/authenticator/token/tokentest/tokentest.go index be4d55b976b..7ce2221d251 100644 --- a/plugin/pkg/auth/authenticator/token/tokentest/tokentest.go +++ b/plugin/pkg/auth/authenticator/token/tokentest/tokentest.go @@ -16,7 +16,7 @@ limitations under the License. package tokentest -import "k8s.io/kubernetes/pkg/auth/user" +import "k8s.io/apiserver/pkg/authentication/user" type TokenAuthenticator struct { Tokens map[string]*user.DefaultInfo diff --git a/plugin/pkg/auth/authenticator/token/webhook/BUILD b/plugin/pkg/auth/authenticator/token/webhook/BUILD index f3260f26517..5e93cc2879b 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/BUILD +++ b/plugin/pkg/auth/authenticator/token/webhook/BUILD @@ -16,11 +16,11 @@ go_library( "//pkg/apis/authentication/install:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/clientset_generated/clientset/typed/authentication/v1beta1:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/util/cache:go_default_library", "//plugin/pkg/webhook:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -35,7 +35,7 @@ go_test( deps = [ "//pkg/apis/authentication/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/unversioned/clientcmd/api/v1:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook.go b/plugin/pkg/auth/authenticator/token/webhook/webhook.go index 59a9ce1ba2d..d5df8a560a2 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook.go @@ -20,10 +20,10 @@ package webhook import ( "time" + "k8s.io/apiserver/pkg/authentication/user" _ "k8s.io/kubernetes/pkg/apis/authentication/install" authentication "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/user" authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/cache" diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go b/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go index 541bdb78f1c..863505a0f40 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go @@ -30,9 +30,9 @@ import ( "testing" "time" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" ) diff --git a/plugin/pkg/auth/authorizer/rbac/BUILD b/plugin/pkg/auth/authorizer/rbac/BUILD index 7a7f6ae488a..e34b7312c40 100644 --- a/plugin/pkg/auth/authorizer/rbac/BUILD +++ b/plugin/pkg/auth/authorizer/rbac/BUILD @@ -19,9 +19,9 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/util/errors:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) @@ -38,6 +38,6 @@ go_test( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD index a56605f29f8..c790047d62d 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD @@ -18,8 +18,8 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/auth/user:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go index 09695234a68..a8d28ac58b3 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go @@ -17,9 +17,9 @@ limitations under the License. package bootstrappolicy import ( + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/auth/user" ) var ( diff --git a/plugin/pkg/auth/authorizer/rbac/rbac.go b/plugin/pkg/auth/authorizer/rbac/rbac.go index 858b65ca91d..75f162421ee 100644 --- a/plugin/pkg/auth/authorizer/rbac/rbac.go +++ b/plugin/pkg/auth/authorizer/rbac/rbac.go @@ -21,10 +21,10 @@ import ( "fmt" "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" ) type RequestToRuleMapper interface { diff --git a/plugin/pkg/auth/authorizer/rbac/rbac_test.go b/plugin/pkg/auth/authorizer/rbac/rbac_test.go index f781cea3ae1..447e7932c38 100644 --- a/plugin/pkg/auth/authorizer/rbac/rbac_test.go +++ b/plugin/pkg/auth/authorizer/rbac/rbac_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" ) func newRule(verbs, apiGroups, resources, nonResourceURLs string) rbac.PolicyRule { diff --git a/plugin/pkg/auth/authorizer/rbac/subject_locator.go b/plugin/pkg/auth/authorizer/rbac/subject_locator.go index a9470a238da..7e90b830d3a 100644 --- a/plugin/pkg/auth/authorizer/rbac/subject_locator.go +++ b/plugin/pkg/auth/authorizer/rbac/subject_locator.go @@ -18,10 +18,10 @@ limitations under the License. package rbac import ( + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" utilerrors "k8s.io/kubernetes/pkg/util/errors" ) diff --git a/plugin/pkg/auth/authorizer/rbac/subject_locator_test.go b/plugin/pkg/auth/authorizer/rbac/subject_locator_test.go index f828bd7d268..449a7f6b8dc 100644 --- a/plugin/pkg/auth/authorizer/rbac/subject_locator_test.go +++ b/plugin/pkg/auth/authorizer/rbac/subject_locator_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" ) func TestSubjectLocator(t *testing.T) { diff --git a/plugin/pkg/auth/authorizer/webhook/BUILD b/plugin/pkg/auth/authorizer/webhook/BUILD index 1360c49df45..68245e31dc7 100644 --- a/plugin/pkg/auth/authorizer/webhook/BUILD +++ b/plugin/pkg/auth/authorizer/webhook/BUILD @@ -36,8 +36,8 @@ go_test( "//pkg/apis/authorization/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/auth/user:go_default_library", "//pkg/client/unversioned/clientcmd/api/v1:go_default_library", "//pkg/util/diff:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authorizer/webhook/webhook_test.go b/plugin/pkg/auth/authorizer/webhook/webhook_test.go index 6ad1e650be4..2ac0dd165cd 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook_test.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook_test.go @@ -32,10 +32,10 @@ import ( "text/template" "time" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" "k8s.io/kubernetes/pkg/util/diff" ) diff --git a/test/integration/auth/accessreview_test.go b/test/integration/auth/accessreview_test.go index 6b28c85547c..74104cffe1f 100644 --- a/test/integration/auth/accessreview_test.go +++ b/test/integration/auth/accessreview_test.go @@ -24,12 +24,12 @@ import ( "strings" "testing" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/plugin/pkg/admission/admit" diff --git a/test/integration/auth/auth_test.go b/test/integration/auth/auth_test.go index 35aaa126cd1..a52d75bf082 100644 --- a/test/integration/auth/auth_test.go +++ b/test/integration/auth/auth_test.go @@ -36,6 +36,7 @@ import ( "testing" "time" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apimachinery/registered" @@ -47,7 +48,6 @@ import ( "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/authorizer/abac" "k8s.io/kubernetes/pkg/auth/group" - "k8s.io/kubernetes/pkg/auth/user" "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/framework/BUILD b/test/integration/framework/BUILD index 2d471e025ed..a904d98ee78 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -33,7 +33,6 @@ go_library( "//pkg/auth/authenticator:go_default_library", "//pkg/auth/authorizer:go_default_library", "//pkg/auth/authorizer/union:go_default_library", - "//pkg/auth/user: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", @@ -63,5 +62,6 @@ go_library( "//vendor:github.com/go-openapi/spec", "//vendor:github.com/golang/glog", "//vendor:github.com/pborman/uuid", + "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index ab3a69456a6..229abe216af 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -27,6 +27,7 @@ import ( "time" "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" @@ -43,7 +44,6 @@ import ( authauthenticator "k8s.io/kubernetes/pkg/auth/authenticator" authauthorizer "k8s.io/kubernetes/pkg/auth/authorizer" authorizerunion "k8s.io/kubernetes/pkg/auth/authorizer/union" - "k8s.io/kubernetes/pkg/auth/user" 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" diff --git a/test/integration/serviceaccount/service_account_test.go b/test/integration/serviceaccount/service_account_test.go index 28ddcc28546..0b09fc773f8 100644 --- a/test/integration/serviceaccount/service_account_test.go +++ b/test/integration/serviceaccount/service_account_test.go @@ -31,6 +31,7 @@ import ( "testing" "time" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" @@ -39,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/auth/user" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/vendor/BUILD b/vendor/BUILD index ff60a92b27b..d94153e8ad5 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -12247,3 +12247,12 @@ go_library( srcs = ["golang.org/x/text/internal/utf8internal/utf8internal.go"], tags = ["automanaged"], ) + +go_library( + name = "k8s.io/apiserver/pkg/authentication/user", + srcs = [ + "k8s.io/apiserver/pkg/authentication/user/doc.go", + "k8s.io/apiserver/pkg/authentication/user/user.go", + ], + tags = ["automanaged"], +)