mechanicals

pkg/auth/authenticator/bearertoken/BUILD

@@ -13,7 +13,7 @@ go_library(
     srcs = ["bearertoken.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/auth/authenticator:go_default_library",
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
     ],
 )
@@ -24,7 +24,7 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/auth/authenticator:go_default_library",
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
     ],
 )

pkg/auth/authenticator/bearertoken/bearertoken.go

@@ -21,8 +21,8 @@ import (
 	"net/http"
 	"strings"
 
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/kubernetes/pkg/auth/authenticator"
 )
 
 type Authenticator struct {

pkg/auth/authenticator/bearertoken/bearertoken_test.go

@@ -21,8 +21,8 @@ import (
 	"net/http"
 	"testing"
 
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/kubernetes/pkg/auth/authenticator"
 )
 
 func TestAuthenticateRequest(t *testing.T) {

pkg/auth/authorizer/abac/BUILD

@@ -16,9 +16,9 @@ go_library(
         "//pkg/apis/abac:go_default_library",
         "//pkg/apis/abac/latest:go_default_library",
         "//pkg/apis/abac/v0:go_default_library",
-        "//pkg/auth/authorizer:go_default_library",
         "//pkg/runtime:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
     ],
 )
 
@@ -42,8 +42,8 @@ go_test(
         "//pkg/apis/abac:go_default_library",
         "//pkg/apis/abac/v0:go_default_library",
         "//pkg/apis/abac/v1beta1:go_default_library",
-        "//pkg/auth/authorizer:go_default_library",
         "//pkg/runtime:go_default_library",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
+        "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
     ],
 )

pkg/auth/authorizer/abac/abac.go

@@ -27,10 +27,10 @@ import (
 
 	"github.com/golang/glog"
 
+	"k8s.io/apiserver/pkg/authorization/authorizer"
 	api "k8s.io/kubernetes/pkg/apis/abac"
 	_ "k8s.io/kubernetes/pkg/apis/abac/latest"
 	"k8s.io/kubernetes/pkg/apis/abac/v0"
-	"k8s.io/kubernetes/pkg/auth/authorizer"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 

pkg/auth/authorizer/abac/abac_test.go

@@ -22,10 +22,10 @@ import (
 	"testing"
 
 	"k8s.io/apiserver/pkg/authentication/user"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
 	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/runtime"
 )
 

pkg/auth/authorizer/union/BUILD

@@ -13,7 +13,7 @@ go_test(
     srcs = ["union_test.go"],
     library = ":go_default_library",
     tags = ["automanaged"],
-    deps = ["//pkg/auth/authorizer:go_default_library"],
+    deps = ["//vendor:k8s.io/apiserver/pkg/authorization/authorizer"],
 )
 
 go_library(
@@ -21,7 +21,7 @@ go_library(
     srcs = ["union.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/auth/authorizer:go_default_library",
+        "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
         "//vendor:k8s.io/client-go/pkg/util/errors",
     ],
 )

pkg/auth/authorizer/union/union.go

@@ -19,8 +19,8 @@ package union
 import (
 	"strings"
 
+	"k8s.io/apiserver/pkg/authorization/authorizer"
 	utilerrors "k8s.io/client-go/pkg/util/errors"
-	"k8s.io/kubernetes/pkg/auth/authorizer"
 )
 
 // unionAuthzHandler authorizer against a chain of authorizer.Authorizer

pkg/auth/authorizer/union/union_test.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"k8s.io/kubernetes/pkg/auth/authorizer"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
 )
 
 type mockAuthzHandler struct {

pkg/auth/group/BUILD

@@ -13,7 +13,7 @@ go_library(
     srcs = ["group_adder.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/auth/authenticator:go_default_library",
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
     ],
 )
@@ -24,7 +24,7 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/auth/authenticator:go_default_library",
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//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/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/kubernetes/pkg/auth/authenticator"
 )
 
 // 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/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/kubernetes/pkg/auth/authenticator"
 )
 
 func TestGroupAdder(t *testing.T) {

pkg/auth/handlers/BUILD

@@ -13,10 +13,10 @@ go_library(
     srcs = ["handlers.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/auth/authenticator:go_default_library",
         "//pkg/genericapiserver/api/request:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:github.com/prometheus/client_golang/prometheus",
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
     ],
 )
 
@@ -26,8 +26,8 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/auth/authenticator:go_default_library",
         "//pkg/genericapiserver/api/request:go_default_library",
+        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
     ],
 )

pkg/auth/handlers/handlers.go

@@ -23,7 +23,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"k8s.io/kubernetes/pkg/auth/authenticator"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
 )
 

pkg/auth/handlers/handlers_test.go

@@ -22,8 +22,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/kubernetes/pkg/auth/authenticator"
 	genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
 )