Merge pull request #39384 from deads2k/generic-01-start-staging

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",
     ],
 )

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"
 

hack/godep-save.sh

@@ -41,6 +41,9 @@ pushd "${KUBE_ROOT}" > /dev/null
   if [ ! -e "vendor/k8s.io/client-go" ]; then
     ln -s ../../staging/src/k8s.io/client-go vendor/k8s.io/client-go
   fi
+  if [ ! -e "vendor/k8s.io/apiserver" ]; then
+    ln -s ../../staging/src/k8s.io/apiserver vendor/k8s.io/apiserver
+  fi
 popd > /dev/null
 
 echo "Don't forget to run hack/update-godep-licenses.sh if you added or removed a dependency!"

hack/make-rules/test.sh

@@ -53,6 +53,7 @@ kube::test::find_dirs() {
     find -L . \
         -path './_output' -prune \
         -o -path './vendor/k8s.io/client-go/*' \
+        -o -path './vendor/k8s.io/apiserver/*' \
         -o -path './test/e2e_node/system/*' \
       -name '*_test.go' -print0 | xargs -0n1 dirname | sed 's|^\./||' | LC_ALL=C sort -u
   )

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",
     ],
 )
 

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"
 )

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"
 )

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",
     ],
 )

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"
 )

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) {

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",
     ],
 )

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"
 )

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) {

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",
     ],
 )

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"

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"
 )
 

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"],
 )

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",
     ],
 )

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 {

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) {

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

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"],
 )

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",
     ],
 )

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"
 )
 

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

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",
     ],
 )

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

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) {

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",
     ],
 )

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"
 )
 

pkg/auth/user/BUILD

@@ -9,9 +9,6 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "doc.go",
-        "user.go",
-    ],
+    srcs = ["doc.go"],
     tags = ["automanaged"],
 )

pkg/auth/user/doc.go

 /*
-Copyright 2014 The Kubernetes Authors.
+Copyright 2016 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package user contains utilities for dealing with simple user exchange in the auth
-// packages. The user.Info interface defines an interface for exchanging that info.
-package user // import "k8s.io/kubernetes/pkg/auth/user"
+// TODO genericapiserver remove this empty package.  Godep fails without this because heapster relies
+// on this package.  This will allow us to start splitting packages, but will force
+// heapster to update on their next kube rebase.
+package user

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",
     ],
 )

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",
     ],
 )

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"
 )
 

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"

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"
 )
 

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",
     ],
 )

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"
 )
 

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"
 )

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",
     ],
 )

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"

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"
 )
 

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",
     ],
 )

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

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"

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"

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",
     ],
 )

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"

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",
     ],
 )

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"
 )
 

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"

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",
     ],
 )

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

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",
     ],
 )

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"

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",
     ],
 )

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"
 )
 

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",
     ],
 )
 

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"

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 (

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",
     ],
 )

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"
 )

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",
     ],
 )

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"

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",
     ],
 )

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"

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"

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",
     ],
 )
 

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{}

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",
     ],
 )

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"
 )

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"],
 )

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 {

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) {

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",
     ],
 )

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 (

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"
 )
 

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",
     ],
 )

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

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 {

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"],
 )

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"

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) {

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"],
 )

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"
 )
 

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 {

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",
     ],
 )

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"
 )

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"
 )
 

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"],
 )

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{}

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) {

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",
     ],
 )

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"

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"
 )
 

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"],
 )

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 {

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) {

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"],
 )