github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mechanical changes for move

pull/6/head
deads2k 2017-01-04 09:31:53 -05:00
parent 442d2c1404
commit ca58ec0237
115 changed files with 144 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubernetes-discovery/pkg/apiserver/BUILD
View File

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

2
cmd/kubernetes-discovery/pkg/apiserver/handler_proxy_test.go
View File

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

2
pkg/admission/BUILD
View File

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

2
pkg/admission/attributes.go
View File

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

2
pkg/admission/interfaces.go
View File

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

4
pkg/apis/abac/v0/BUILD
View File

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

2
pkg/apis/abac/v0/conversion.go
View File

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

2
pkg/apis/abac/v0/conversion_test.go
View File

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

4
pkg/apis/abac/v1beta1/BUILD
View File

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

2
pkg/apis/abac/v1beta1/conversion.go
View File

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

2
pkg/apis/abac/v1beta1/conversion_test.go
View File

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

4
pkg/apis/rbac/validation/BUILD
View File

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

2
pkg/apis/rbac/validation/rulevalidation.go
View File

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

2
pkg/apis/rbac/validation/rulevalidation_test.go
View File

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

2
pkg/auth/authenticator/BUILD
View File

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

4
pkg/auth/authenticator/bearertoken/BUILD
View File

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

2
pkg/auth/authenticator/bearertoken/bearertoken.go
View File

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

2
pkg/auth/authenticator/bearertoken/bearertoken_test.go
View File

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

2
pkg/auth/authenticator/interfaces.go
View File

@ -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

2
pkg/auth/authorizer/BUILD
View File

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

2
pkg/auth/authorizer/abac/BUILD
View File

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

2
pkg/auth/authorizer/abac/abac_test.go
View File

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

2
pkg/auth/authorizer/interfaces.go
View File

@ -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

4
pkg/auth/group/BUILD
View File

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

2
pkg/auth/group/group_adder.go
View File

@ -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

2
pkg/auth/group/group_adder_test.go
View File

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

2
pkg/auth/handlers/BUILD
View File

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

2
pkg/auth/handlers/handlers_test.go
View File

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

4
pkg/genericapiserver/BUILD
View File

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

4
pkg/genericapiserver/api/filters/BUILD
View File

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

2
pkg/genericapiserver/api/filters/audit_test.go
View File

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

2
pkg/genericapiserver/api/filters/impersonation.go
View File

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

2
pkg/genericapiserver/api/filters/impersonation_test.go
View File

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

4
pkg/genericapiserver/api/request/BUILD
View File

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

2
pkg/genericapiserver/api/request/context.go
View File

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

2
pkg/genericapiserver/api/request/context_test.go
View File

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

2
pkg/genericapiserver/authenticator/BUILD
View File

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

2
pkg/genericapiserver/authenticator/delegating.go
View File

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

2
pkg/genericapiserver/authenticator/loopback.go
View File

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

2
pkg/genericapiserver/authorizer/BUILD
View File

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

2
pkg/genericapiserver/authorizer/authz_test.go
View File

@ -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

2
pkg/genericapiserver/config.go
View File

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

2
pkg/genericapiserver/genericapiserver_test.go
View File

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

2
pkg/kubeapiserver/authenticator/BUILD
View File

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

2
pkg/kubeapiserver/authenticator/config.go
View File

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

4
pkg/kubelet/server/BUILD
View File

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

2
pkg/kubelet/server/auth.go
View File

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

2
pkg/kubelet/server/server_test.go
View File

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

2
pkg/registry/authorization/util/BUILD
View File

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

2
pkg/registry/authorization/util/helpers.go
View File

@ -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

2
pkg/registry/certificates/certificates/BUILD
View File

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

2
pkg/registry/certificates/certificates/strategy_test.go
View File

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

2
pkg/registry/rbac/BUILD
View File

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

2
pkg/registry/rbac/escalation_check.go
View File

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

2
pkg/serviceaccount/BUILD
View File

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

2
pkg/serviceaccount/jwt.go
View File

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

2
pkg/serviceaccount/util.go
View File

@ -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 (

2
plugin/pkg/admission/gc/BUILD
View File

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

2
plugin/pkg/admission/gc/gc_admission_test.go
View File

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

2
plugin/pkg/admission/imagepolicy/BUILD
View File

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

2
plugin/pkg/admission/imagepolicy/admission_test.go
View File

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

4
plugin/pkg/admission/security/podsecuritypolicy/BUILD
View File

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

2
plugin/pkg/admission/security/podsecuritypolicy/admission.go
View File

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

2
plugin/pkg/admission/security/podsecuritypolicy/admission_test.go
View File

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

2
plugin/pkg/auth/authenticator/password/allow/BUILD
View File

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

2
plugin/pkg/auth/authenticator/password/allow/allow.go
View File

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

2
plugin/pkg/auth/authenticator/password/keystone/BUILD
View File

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

2
plugin/pkg/auth/authenticator/password/keystone/keystone.go
View File

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

4
plugin/pkg/auth/authenticator/password/passwordfile/BUILD
View File

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

2
plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go
View File

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

2
plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go
View File

@ -22,7 +22,7 @@ import (
"reflect"
"testing"
"k8s.io/kubernetes/pkg/auth/user"
"k8s.io/apiserver/pkg/authentication/user"
)
func TestPasswordFile(t *testing.T) {

4
plugin/pkg/auth/authenticator/request/anonymous/BUILD
View File

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

2
plugin/pkg/auth/authenticator/request/anonymous/anonymous.go
View File

@ -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 (

2
plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go
View File

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

4
plugin/pkg/auth/authenticator/request/basicauth/BUILD
View File

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

2
plugin/pkg/auth/authenticator/request/basicauth/basicauth.go
View File

@ -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

2
plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go
View File

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

4
plugin/pkg/auth/authenticator/request/headerrequest/BUILD
View File

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

2
plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go
View File

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

2
plugin/pkg/auth/authenticator/request/headerrequest/requestheader_test.go
View File

@ -21,7 +21,7 @@ import (
"reflect"
"testing"
"k8s.io/kubernetes/pkg/auth/user"
"k8s.io/apiserver/pkg/authentication/user"
)
func TestRequestHeader(t *testing.T) {

4
plugin/pkg/auth/authenticator/request/union/BUILD
View File

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

2
plugin/pkg/auth/authenticator/request/union/union.go
View File

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

2
plugin/pkg/auth/authenticator/request/union/unionauth_test.go
View File

@ -23,7 +23,7 @@ import (
"strings"
"testing"
"k8s.io/kubernetes/pkg/auth/user"
"k8s.io/apiserver/pkg/authentication/user"
)
type mockAuthRequestHandler struct {

4
plugin/pkg/auth/authenticator/request/x509/BUILD
View File

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

2
plugin/pkg/auth/authenticator/request/x509/x509.go
View File

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

2
plugin/pkg/auth/authenticator/request/x509/x509_test.go
View File

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

4
plugin/pkg/auth/authenticator/token/anytoken/BUILD
View File

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

2
plugin/pkg/auth/authenticator/token/anytoken/anytoken.go
View File

@ -19,7 +19,7 @@ package anytoken
import (
"strings"
"k8s.io/kubernetes/pkg/auth/user"
"k8s.io/apiserver/pkg/authentication/user"
)
type AnyTokenAuthenticator struct{}

2
plugin/pkg/auth/authenticator/token/anytoken/anytoken_test.go
View File

@ -20,7 +20,7 @@ import (
"reflect"
"testing"
"k8s.io/kubernetes/pkg/auth/user"
"k8s.io/apiserver/pkg/authentication/user"
)
func TestAnyTokenAuthenticator(t *testing.T) {

4
plugin/pkg/auth/authenticator/token/oidc/BUILD
View File

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

2
plugin/pkg/auth/authenticator/token/oidc/oidc.go
View File

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

2
plugin/pkg/auth/authenticator/token/oidc/oidc_test.go
View File

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

4
plugin/pkg/auth/authenticator/token/tokenfile/BUILD
View File

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

2
plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go
View File

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

2
plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go
View File

@ -22,7 +22,7 @@ import (
"reflect"
"testing"
"k8s.io/kubernetes/pkg/auth/user"
"k8s.io/apiserver/pkg/authentication/user"
)
func TestTokenFile(t *testing.T) {

2
plugin/pkg/auth/authenticator/token/tokentest/BUILD
View File

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

2
plugin/pkg/auth/authenticator/token/tokentest/tokentest.go
View File

@ -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

4
plugin/pkg/auth/authenticator/token/webhook/BUILD
View File

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

2
plugin/pkg/auth/authenticator/token/webhook/webhook.go
View File

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

2
plugin/pkg/auth/authenticator/token/webhook/webhook_test.go
View File

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

Some files were not shown because too many files have changed in this diff Show More