diff --git a/cmd/cloud-controller-manager/BUILD b/cmd/cloud-controller-manager/BUILD index 64388263c6..ce3583e50d 100644 --- a/cmd/cloud-controller-manager/BUILD +++ b/cmd/cloud-controller-manager/BUILD @@ -24,12 +24,12 @@ go_library( "//pkg/client/metrics/prometheus:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/util/flag:go_default_library", "//pkg/util/logs:go_default_library", "//pkg/version/prometheus:go_default_library", "//pkg/version/verflag:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/cmd/cloud-controller-manager/app/BUILD b/cmd/cloud-controller-manager/app/BUILD index 4a597874d3..0ce5993174 100644 --- a/cmd/cloud-controller-manager/app/BUILD +++ b/cmd/cloud-controller-manager/app/BUILD @@ -27,12 +27,12 @@ go_library( "//pkg/controller/informers:go_default_library", "//pkg/controller/route:go_default_library", "//pkg/controller/service:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/util/configz:go_default_library", "//pkg/util/wait:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index 8e6f4b2889..28512388f7 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -25,6 +25,7 @@ import ( "strconv" "time" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -40,7 +41,6 @@ import ( "k8s.io/kubernetes/pkg/controller/informers" routecontroller "k8s.io/kubernetes/pkg/controller/route" servicecontroller "k8s.io/kubernetes/pkg/controller/service" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/pkg/util/wait" diff --git a/cmd/cloud-controller-manager/controller-manager.go b/cmd/cloud-controller-manager/controller-manager.go index a465fec359..8840aaaa2a 100644 --- a/cmd/cloud-controller-manager/controller-manager.go +++ b/cmd/cloud-controller-manager/controller-manager.go @@ -23,12 +23,12 @@ import ( "fmt" "os" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/cmd/cloud-controller-manager/app" "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration "k8s.io/kubernetes/pkg/cloudprovider" _ "k8s.io/kubernetes/pkg/cloudprovider/providers" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration diff --git a/cmd/hyperkube/BUILD b/cmd/hyperkube/BUILD index 97ce22f2a4..5a97c34299 100644 --- a/cmd/hyperkube/BUILD +++ b/cmd/hyperkube/BUILD @@ -56,7 +56,6 @@ go_library( "//federation/cmd/federation-controller-manager/app:go_default_library", "//federation/cmd/federation-controller-manager/app/options:go_default_library", "//pkg/client/metrics/prometheus:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/kubectl/cmd:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/util:go_default_library", @@ -67,5 +66,6 @@ go_library( "//plugin/cmd/kube-scheduler/app:go_default_library", "//plugin/cmd/kube-scheduler/app/options:go_default_library", "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go index 9de0f4d84b..1110852c3d 100644 --- a/cmd/hyperkube/kube-proxy.go +++ b/cmd/hyperkube/kube-proxy.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/cmd/kube-proxy/app/options" - "k8s.io/kubernetes/pkg/healthz" ) func init() { diff --git a/cmd/kube-controller-manager/BUILD b/cmd/kube-controller-manager/BUILD index da14d95072..83775aa989 100644 --- a/cmd/kube-controller-manager/BUILD +++ b/cmd/kube-controller-manager/BUILD @@ -22,12 +22,12 @@ go_library( "//cmd/kube-controller-manager/app:go_default_library", "//cmd/kube-controller-manager/app/options:go_default_library", "//pkg/client/metrics/prometheus:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/util/flag:go_default_library", "//pkg/util/logs:go_default_library", "//pkg/util/workqueue/prometheus:go_default_library", "//pkg/version/prometheus:go_default_library", "//pkg/version/verflag:go_default_library", "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index e6c5af1dcc..3ec6eb9611 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -72,7 +72,6 @@ go_library( "//pkg/controller/serviceaccount:go_default_library", "//pkg/controller/volume/attachdetach:go_default_library", "//pkg/controller/volume/persistentvolume:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/quota/install:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/runtime/serializer:go_default_library", @@ -100,5 +99,6 @@ go_library( "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 9a617e6db9..d829beb175 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -31,6 +31,7 @@ import ( "strconv" "time" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -50,7 +51,6 @@ import ( serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" "k8s.io/kubernetes/pkg/controller/volume/attachdetach" persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/serviceaccount" certutil "k8s.io/kubernetes/pkg/util/cert" diff --git a/cmd/kube-controller-manager/controller-manager.go b/cmd/kube-controller-manager/controller-manager.go index f577649f6d..8487bae44d 100644 --- a/cmd/kube-controller-manager/controller-manager.go +++ b/cmd/kube-controller-manager/controller-manager.go @@ -24,10 +24,10 @@ import ( "fmt" "os" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/cmd/kube-controller-manager/app" "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration diff --git a/cmd/kube-proxy/BUILD b/cmd/kube-proxy/BUILD index ae48528de2..036d290277 100644 --- a/cmd/kube-proxy/BUILD +++ b/cmd/kube-proxy/BUILD @@ -22,11 +22,11 @@ go_library( "//cmd/kube-proxy/app:go_default_library", "//cmd/kube-proxy/app/options:go_default_library", "//pkg/client/metrics/prometheus:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/util/flag:go_default_library", "//pkg/util/logs:go_default_library", "//pkg/version/prometheus:go_default_library", "//pkg/version/verflag:go_default_library", "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index ec67093365..54732eec49 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -20,10 +20,10 @@ import ( "fmt" "os" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/cmd/kube-proxy/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index 08e7626114..5799bfdbb1 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -25,8 +25,6 @@ go_library( "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/componentconfig/v1alpha1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/client/chaosclient:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", @@ -47,7 +45,6 @@ go_library( "//pkg/credentialprovider/gcp:go_default_library", "//pkg/genericapiserver/authenticator:go_default_library", "//pkg/genericapiserver/authorizer:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/kubelet:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/cm:go_default_library", @@ -101,6 +98,9 @@ go_library( "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", "//vendor:golang.org/x/exp/inotify", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/cmd/kubelet/app/auth.go b/cmd/kubelet/app/auth.go index 17954df2f9..203c6ba5cb 100644 --- a/cmd/kubelet/app/auth.go +++ b/cmd/kubelet/app/auth.go @@ -21,9 +21,9 @@ import ( "fmt" "reflect" + "k8s.io/apiserver/pkg/authentication/authenticator" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/apis/componentconfig" - "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/authorizer" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 3e6565d185..4395718933 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -36,6 +36,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" @@ -53,7 +54,6 @@ import ( clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/credentialprovider" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm" diff --git a/federation/cmd/federation-controller-manager/BUILD b/federation/cmd/federation-controller-manager/BUILD index 41e6e735e2..629b538a5d 100644 --- a/federation/cmd/federation-controller-manager/BUILD +++ b/federation/cmd/federation-controller-manager/BUILD @@ -21,11 +21,11 @@ go_library( deps = [ "//federation/cmd/federation-controller-manager/app:go_default_library", "//federation/cmd/federation-controller-manager/app/options:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/util/flag:go_default_library", "//pkg/util/logs:go_default_library", "//pkg/util/workqueue/prometheus:go_default_library", "//pkg/version/verflag:go_default_library", "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/federation/cmd/federation-controller-manager/app/BUILD b/federation/cmd/federation-controller-manager/app/BUILD index 06e380a831..84c52e49ec 100644 --- a/federation/cmd/federation-controller-manager/app/BUILD +++ b/federation/cmd/federation-controller-manager/app/BUILD @@ -36,7 +36,6 @@ go_library( "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/util/config:go_default_library", "//pkg/util/configz:go_default_library", @@ -46,6 +45,7 @@ go_library( "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/federation/cmd/federation-controller-manager/app/controllermanager.go b/federation/cmd/federation-controller-manager/app/controllermanager.go index 9bdab7f8dd..19c5e10345 100644 --- a/federation/cmd/federation-controller-manager/app/controllermanager.go +++ b/federation/cmd/federation-controller-manager/app/controllermanager.go @@ -26,6 +26,7 @@ import ( "net/http/pprof" "strconv" + "k8s.io/apiserver/pkg/healthz" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options" "k8s.io/kubernetes/federation/pkg/dnsprovider" @@ -42,7 +43,6 @@ import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/version" diff --git a/federation/cmd/federation-controller-manager/controller-manager.go b/federation/cmd/federation-controller-manager/controller-manager.go index 9d09536407..839d434034 100644 --- a/federation/cmd/federation-controller-manager/controller-manager.go +++ b/federation/cmd/federation-controller-manager/controller-manager.go @@ -21,9 +21,9 @@ import ( "os" "github.com/spf13/pflag" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration diff --git a/pkg/auth/authenticator/bearertoken/BUILD b/pkg/auth/authenticator/bearertoken/BUILD index cebb38b60d..ce052ff08e 100644 --- a/pkg/auth/authenticator/bearertoken/BUILD +++ b/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", ], ) diff --git a/pkg/auth/authenticator/bearertoken/bearertoken.go b/pkg/auth/authenticator/bearertoken/bearertoken.go index 59654083e1..f4fff22d01 100644 --- a/pkg/auth/authenticator/bearertoken/bearertoken.go +++ b/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 { diff --git a/pkg/auth/authenticator/bearertoken/bearertoken_test.go b/pkg/auth/authenticator/bearertoken/bearertoken_test.go index c9ac7f250e..f48b1b7872 100644 --- a/pkg/auth/authenticator/bearertoken/bearertoken_test.go +++ b/pkg/auth/authenticator/bearertoken/bearertoken_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" ) func TestAuthenticateRequest(t *testing.T) { diff --git a/pkg/auth/authorizer/abac/BUILD b/pkg/auth/authorizer/abac/BUILD index 615803a591..7e5b96ecef 100644 --- a/pkg/auth/authorizer/abac/BUILD +++ b/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", ], ) diff --git a/pkg/auth/authorizer/abac/abac.go b/pkg/auth/authorizer/abac/abac.go index ccdb40b77f..f3d6dec304 100644 --- a/pkg/auth/authorizer/abac/abac.go +++ b/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" ) diff --git a/pkg/auth/authorizer/abac/abac_test.go b/pkg/auth/authorizer/abac/abac_test.go index 1b2b56fd07..f3844b4607 100644 --- a/pkg/auth/authorizer/abac/abac_test.go +++ b/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" ) diff --git a/pkg/auth/authorizer/union/BUILD b/pkg/auth/authorizer/union/BUILD index 7063e3a2c1..c6dd649ccb 100644 --- a/pkg/auth/authorizer/union/BUILD +++ b/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", ], ) diff --git a/pkg/auth/authorizer/union/union.go b/pkg/auth/authorizer/union/union.go index e9bd203a37..3b484d160d 100644 --- a/pkg/auth/authorizer/union/union.go +++ b/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 diff --git a/pkg/auth/authorizer/union/union_test.go b/pkg/auth/authorizer/union/union_test.go index d6841188ca..6107ace459 100644 --- a/pkg/auth/authorizer/union/union_test.go +++ b/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 { diff --git a/pkg/auth/group/BUILD b/pkg/auth/group/BUILD index 137df3b65c..0fb6421c02 100644 --- a/pkg/auth/group/BUILD +++ b/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", ], ) diff --git a/pkg/auth/group/group_adder.go b/pkg/auth/group/group_adder.go index 09eb0524a9..1f71429b4e 100644 --- a/pkg/auth/group/group_adder.go +++ b/pkg/auth/group/group_adder.go @@ -19,8 +19,8 @@ package group import ( "net/http" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" ) // GroupAdder adds groups to an authenticated user.Info diff --git a/pkg/auth/group/group_adder_test.go b/pkg/auth/group/group_adder_test.go index f5550cb529..886f07c36c 100644 --- a/pkg/auth/group/group_adder_test.go +++ b/pkg/auth/group/group_adder_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" ) func TestGroupAdder(t *testing.T) { diff --git a/pkg/auth/handlers/BUILD b/pkg/auth/handlers/BUILD index ffbe61b896..98ff666368 100644 --- a/pkg/auth/handlers/BUILD +++ b/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", ], ) diff --git a/pkg/auth/handlers/handlers.go b/pkg/auth/handlers/handlers.go index a51dc6ff36..fa9b97d7e9 100644 --- a/pkg/auth/handlers/handlers.go +++ b/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" ) diff --git a/pkg/auth/handlers/handlers_test.go b/pkg/auth/handlers/handlers_test.go index 530064a2e4..7284f63db7 100644 --- a/pkg/auth/handlers/handlers_test.go +++ b/pkg/auth/handlers/handlers_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index a8a02efcda..1768f49eb2 100644 --- a/pkg/genericapiserver/BUILD +++ b/pkg/genericapiserver/BUILD @@ -33,8 +33,6 @@ go_library( "//pkg/apimachinery:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/auth/authorizer/union:go_default_library", "//pkg/auth/handlers:go_default_library", "//pkg/client/restclient:go_default_library", @@ -49,7 +47,6 @@ go_library( "//pkg/genericapiserver/openapi/common:go_default_library", "//pkg/genericapiserver/options:go_default_library", "//pkg/genericapiserver/routes:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/runtime/serializer/recognizer:go_default_library", @@ -75,7 +72,10 @@ 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/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) @@ -104,7 +104,6 @@ go_test( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/authorizer: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( "//vendor:github.com/go-openapi/spec", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/genericapiserver/api/filters/BUILD b/pkg/genericapiserver/api/filters/BUILD index 56c98483c6..fb812b7863 100644 --- a/pkg/genericapiserver/api/filters/BUILD +++ b/pkg/genericapiserver/api/filters/BUILD @@ -21,7 +21,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/authentication:go_default_library", - "//pkg/auth/authorizer: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( "//vendor:github.com/golang/glog", "//vendor:github.com/pborman/uuid", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) @@ -46,10 +46,10 @@ go_test( deps = [ "//pkg/apis/authentication:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/auth/authorizer: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", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/genericapiserver/api/filters/authorization.go b/pkg/genericapiserver/api/filters/authorization.go index 750008054a..29fe6e780e 100644 --- a/pkg/genericapiserver/api/filters/authorization.go +++ b/pkg/genericapiserver/api/filters/authorization.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" - "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) diff --git a/pkg/genericapiserver/api/filters/authorization_test.go b/pkg/genericapiserver/api/filters/authorization_test.go index 8f479b124e..9cd3f7300f 100644 --- a/pkg/genericapiserver/api/filters/authorization_test.go +++ b/pkg/genericapiserver/api/filters/authorization_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) diff --git a/pkg/genericapiserver/api/filters/impersonation.go b/pkg/genericapiserver/api/filters/impersonation.go index d12be0fd40..b7de900d29 100644 --- a/pkg/genericapiserver/api/filters/impersonation.go +++ b/pkg/genericapiserver/api/filters/impersonation.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" - "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters" "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/httplog" diff --git a/pkg/genericapiserver/api/filters/impersonation_test.go b/pkg/genericapiserver/api/filters/impersonation_test.go index 435145843c..19fd6d2175 100644 --- a/pkg/genericapiserver/api/filters/impersonation_test.go +++ b/pkg/genericapiserver/api/filters/impersonation_test.go @@ -25,8 +25,8 @@ import ( "testing" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" - "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/genericapiserver/api/request" ) diff --git a/pkg/genericapiserver/api/handlers/responsewriters/BUILD b/pkg/genericapiserver/api/handlers/responsewriters/BUILD index 3e51528d77..ec96196bc8 100644 --- a/pkg/genericapiserver/api/handlers/responsewriters/BUILD +++ b/pkg/genericapiserver/api/handlers/responsewriters/BUILD @@ -33,13 +33,13 @@ go_library( deps = [ "//pkg/api/rest:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/genericapiserver/api/handlers/negotiation:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/storage:go_default_library", - "//pkg/util/flushwriter:go_default_library", "//pkg/util/runtime:go_default_library", "//pkg/util/wsstream:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/util/flushwriter", ], ) diff --git a/pkg/genericapiserver/api/handlers/responsewriters/errors.go b/pkg/genericapiserver/api/handlers/responsewriters/errors.go index f794124893..ddf31e4e16 100644 --- a/pkg/genericapiserver/api/handlers/responsewriters/errors.go +++ b/pkg/genericapiserver/api/handlers/responsewriters/errors.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/util/runtime" ) diff --git a/pkg/genericapiserver/api/handlers/responsewriters/writers.go b/pkg/genericapiserver/api/handlers/responsewriters/writers.go index 12a8773bd8..2258eac937 100644 --- a/pkg/genericapiserver/api/handlers/responsewriters/writers.go +++ b/pkg/genericapiserver/api/handlers/responsewriters/writers.go @@ -23,11 +23,11 @@ import ( "net/http" "strconv" + "k8s.io/apiserver/pkg/util/flushwriter" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/util/flushwriter" utilruntime "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/wsstream" ) diff --git a/pkg/genericapiserver/authenticator/BUILD b/pkg/genericapiserver/authenticator/BUILD index 903aec3e90..fab0f82fd1 100644 --- a/pkg/genericapiserver/authenticator/BUILD +++ b/pkg/genericapiserver/authenticator/BUILD @@ -16,7 +16,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/auth/authenticator:go_default_library", "//pkg/auth/authenticator/bearertoken:go_default_library", "//pkg/auth/group:go_default_library", "//pkg/client/clientset_generated/clientset/typed/authentication/v1beta1:go_default_library", @@ -28,6 +27,7 @@ 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/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/genericapiserver/authenticator/delegating.go b/pkg/genericapiserver/authenticator/delegating.go index 8875431ef0..606377001c 100644 --- a/pkg/genericapiserver/authenticator/delegating.go +++ b/pkg/genericapiserver/authenticator/delegating.go @@ -23,8 +23,8 @@ import ( "github.com/go-openapi/spec" + "k8s.io/apiserver/pkg/authentication/authenticator" "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" authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" diff --git a/pkg/genericapiserver/authenticator/loopback.go b/pkg/genericapiserver/authenticator/loopback.go index 9ae672ee30..2693346c64 100644 --- a/pkg/genericapiserver/authenticator/loopback.go +++ b/pkg/genericapiserver/authenticator/loopback.go @@ -17,8 +17,8 @@ limitations under the License. package authenticator import ( + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile" ) diff --git a/pkg/genericapiserver/authorizer/BUILD b/pkg/genericapiserver/authorizer/BUILD index a160340a28..4622fa7d71 100644 --- a/pkg/genericapiserver/authorizer/BUILD +++ b/pkg/genericapiserver/authorizer/BUILD @@ -16,9 +16,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/auth/authorizer:go_default_library", "//pkg/client/clientset_generated/clientset/typed/authorization/v1beta1:go_default_library", "//plugin/pkg/auth/authorizer/webhook:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) @@ -31,7 +31,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/auth/authorizer:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/genericapiserver/authorizer/authz_test.go b/pkg/genericapiserver/authorizer/authz_test.go index e0fbc899c8..dc3df4c533 100644 --- a/pkg/genericapiserver/authorizer/authz_test.go +++ b/pkg/genericapiserver/authorizer/authz_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/apiserver/pkg/authorization/authorizer" ) // NewAlwaysAllowAuthorizer must return a struct which implements authorizer.Authorizer diff --git a/pkg/genericapiserver/authorizer/builtin.go b/pkg/genericapiserver/authorizer/builtin.go index a5ea71f9b6..6d6c27760b 100644 --- a/pkg/genericapiserver/authorizer/builtin.go +++ b/pkg/genericapiserver/authorizer/builtin.go @@ -19,7 +19,7 @@ package authorizer import ( "errors" - "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/apiserver/pkg/authorization/authorizer" ) // alwaysAllowAuthorizer is an implementation of authorizer.Attributes diff --git a/pkg/genericapiserver/authorizer/delegating.go b/pkg/genericapiserver/authorizer/delegating.go index eedfa182ce..43dca0e500 100644 --- a/pkg/genericapiserver/authorizer/delegating.go +++ b/pkg/genericapiserver/authorizer/delegating.go @@ -19,7 +19,7 @@ package authorizer import ( "time" - "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/apiserver/pkg/authorization/authorizer" authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" webhooksar "k8s.io/kubernetes/plugin/pkg/auth/authorizer/webhook" ) diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index ea7583e8a4..1cc51439cb 100644 --- a/pkg/genericapiserver/config.go +++ b/pkg/genericapiserver/config.go @@ -36,12 +36,13 @@ import ( "github.com/pborman/uuid" "gopkg.in/natefinch/lumberjack.v2" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/auth/authenticator" - "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/client/restclient" @@ -55,7 +56,6 @@ import ( openapicommon "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "k8s.io/kubernetes/pkg/genericapiserver/options" "k8s.io/kubernetes/pkg/genericapiserver/routes" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/runtime" certutil "k8s.io/kubernetes/pkg/util/cert" "k8s.io/kubernetes/pkg/util/sets" diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index 679b2fbe6b..197957bf95 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -30,6 +30,7 @@ import ( "github.com/emicklei/go-restful/swagger" "github.com/golang/glog" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" @@ -42,7 +43,6 @@ import ( genericmux "k8s.io/kubernetes/pkg/genericapiserver/mux" openapicommon "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "k8s.io/kubernetes/pkg/genericapiserver/routes" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" utilnet "k8s.io/kubernetes/pkg/util/net" diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go index 0d409bf985..659ddbea17 100644 --- a/pkg/genericapiserver/genericapiserver_test.go +++ b/pkg/genericapiserver/genericapiserver_test.go @@ -28,6 +28,7 @@ import ( "testing" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "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/apimachinery" "k8s.io/kubernetes/pkg/apis/extensions" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/auth/authorizer" openapigen "k8s.io/kubernetes/pkg/generated/openapi" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/genericapiserver/healthz.go b/pkg/genericapiserver/healthz.go index bdfa99dec3..1d642f9dde 100644 --- a/pkg/genericapiserver/healthz.go +++ b/pkg/genericapiserver/healthz.go @@ -19,7 +19,7 @@ package genericapiserver import ( "fmt" - "k8s.io/kubernetes/pkg/healthz" + "k8s.io/apiserver/pkg/healthz" ) // AddHealthzCheck allows you to add a HealthzCheck. diff --git a/pkg/genericapiserver/hooks.go b/pkg/genericapiserver/hooks.go index 4400c5ded1..985341df71 100644 --- a/pkg/genericapiserver/hooks.go +++ b/pkg/genericapiserver/hooks.go @@ -23,8 +23,8 @@ import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/pkg/client/restclient" - "k8s.io/kubernetes/pkg/healthz" utilruntime "k8s.io/kubernetes/pkg/util/runtime" ) diff --git a/pkg/kubeapiserver/admission/BUILD b/pkg/kubeapiserver/admission/BUILD index e5f23b1b3d..b0f404d88f 100644 --- a/pkg/kubeapiserver/admission/BUILD +++ b/pkg/kubeapiserver/admission/BUILD @@ -15,7 +15,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/admission:go_default_library", - "//pkg/auth/authorizer:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) @@ -25,8 +25,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/admission:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/controller/informers:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/kubeapiserver/admission/init_test.go b/pkg/kubeapiserver/admission/init_test.go index e06e0cd4ff..f1ff1f3ead 100644 --- a/pkg/kubeapiserver/admission/init_test.go +++ b/pkg/kubeapiserver/admission/init_test.go @@ -19,8 +19,8 @@ package admission import ( "testing" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/admission" - "k8s.io/kubernetes/pkg/auth/authorizer" ) // TestAuthorizer is a testing struct for testing that fulfills the authorizer interface. diff --git a/pkg/kubeapiserver/admission/initializer.go b/pkg/kubeapiserver/admission/initializer.go index 92fc7a0888..e878dd5c38 100644 --- a/pkg/kubeapiserver/admission/initializer.go +++ b/pkg/kubeapiserver/admission/initializer.go @@ -17,8 +17,8 @@ limitations under the License. package admission import ( + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/admission" - "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller/informers" ) diff --git a/pkg/kubeapiserver/authenticator/BUILD b/pkg/kubeapiserver/authenticator/BUILD index e3211fda53..2f43489836 100644 --- a/pkg/kubeapiserver/authenticator/BUILD +++ b/pkg/kubeapiserver/authenticator/BUILD @@ -12,7 +12,6 @@ go_library( srcs = ["config.go"], tags = ["automanaged"], deps = [ - "//pkg/auth/authenticator:go_default_library", "//pkg/auth/authenticator/bearertoken:go_default_library", "//pkg/auth/group:go_default_library", "//pkg/genericapiserver/authenticator:go_default_library", @@ -30,6 +29,7 @@ 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/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/kubeapiserver/authenticator/config.go b/pkg/kubeapiserver/authenticator/config.go index 141652c1ed..9515dab0fc 100644 --- a/pkg/kubeapiserver/authenticator/config.go +++ b/pkg/kubeapiserver/authenticator/config.go @@ -21,8 +21,8 @@ import ( "github.com/go-openapi/spec" + "k8s.io/apiserver/pkg/authentication/authenticator" "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" genericauthenticator "k8s.io/kubernetes/pkg/genericapiserver/authenticator" diff --git a/pkg/kubeapiserver/authorizer/BUILD b/pkg/kubeapiserver/authorizer/BUILD index 3d2df10831..886953e7ed 100644 --- a/pkg/kubeapiserver/authorizer/BUILD +++ b/pkg/kubeapiserver/authorizer/BUILD @@ -23,12 +23,12 @@ go_library( srcs = ["config.go"], tags = ["automanaged"], deps = [ - "//pkg/auth/authorizer:go_default_library", "//pkg/auth/authorizer/abac:go_default_library", "//pkg/auth/authorizer/union:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/genericapiserver/authorizer:go_default_library", "//plugin/pkg/auth/authorizer/rbac:go_default_library", "//plugin/pkg/auth/authorizer/webhook:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/kubeapiserver/authorizer/config.go b/pkg/kubeapiserver/authorizer/config.go index 1ebecdea3b..2edc2a7933 100644 --- a/pkg/kubeapiserver/authorizer/config.go +++ b/pkg/kubeapiserver/authorizer/config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/auth/authorizer/abac" "k8s.io/kubernetes/pkg/auth/authorizer/union" "k8s.io/kubernetes/pkg/controller/informers" diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 63179a65c6..3a460c497d 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -22,9 +22,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/api/v1/validation:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/authorizer:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/httplog:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", @@ -36,7 +33,6 @@ go_library( "//pkg/runtime/schema:go_default_library", "//pkg/types:go_default_library", "//pkg/util/configz:go_default_library", - "//pkg/util/flushwriter:go_default_library", "//pkg/util/limitwriter:go_default_library", "//pkg/util/runtime:go_default_library", "//pkg/util/term:go_default_library", @@ -46,7 +42,11 @@ 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/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", + "//vendor:k8s.io/apiserver/pkg/healthz", + "//vendor:k8s.io/apiserver/pkg/util/flushwriter", ], ) @@ -62,7 +62,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/auth/authorizer: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/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/kubelet/server/auth.go b/pkg/kubelet/server/auth.go index 16143af230..9f175fc440 100644 --- a/pkg/kubelet/server/auth.go +++ b/pkg/kubelet/server/auth.go @@ -21,9 +21,9 @@ import ( "strings" "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index bfc8dd4306..0db8a90249 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -35,14 +35,15 @@ import ( cadvisorapiv2 "github.com/google/cadvisor/info/v2" "github.com/prometheus/client_golang/prometheus" + "k8s.io/apiserver/pkg/authentication/authenticator" + "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/apiserver/pkg/healthz" + "k8s.io/apiserver/pkg/util/flushwriter" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/validation" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/authorizer" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/httplog" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -54,7 +55,6 @@ import ( "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/configz" - "k8s.io/kubernetes/pkg/util/flushwriter" "k8s.io/kubernetes/pkg/util/limitwriter" utilruntime "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/term" diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 5a2c4eb672..265f8029c3 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -39,10 +39,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "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/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainertesting "k8s.io/kubernetes/pkg/kubelet/container/testing" diff --git a/pkg/master/BUILD b/pkg/master/BUILD index eecbffe337..857c1454e7 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -52,7 +52,6 @@ go_library( "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/genericapiserver:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master/thirdparty:go_default_library", "//pkg/registry/apps/rest:go_default_library", @@ -82,6 +81,7 @@ go_library( "//pkg/util/wait:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/prometheus/client_golang/prometheus", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/pkg/master/master.go b/pkg/master/master.go index ee4776c4b2..bb3114f442 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -24,6 +24,7 @@ import ( "strconv" "time" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1" @@ -40,7 +41,6 @@ import ( corev1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/healthz" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/thirdparty" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/authentication/rest/BUILD b/pkg/registry/authentication/rest/BUILD index 1f84ca720a..a414d3a696 100644 --- a/pkg/registry/authentication/rest/BUILD +++ b/pkg/registry/authentication/rest/BUILD @@ -15,9 +15,9 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/authentication:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", - "//pkg/auth/authenticator:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/registry/authentication/tokenreview:go_default_library", "//pkg/registry/generic:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", ], ) diff --git a/pkg/registry/authentication/rest/storage_authentication.go b/pkg/registry/authentication/rest/storage_authentication.go index 397072d938..797ca4ee9f 100644 --- a/pkg/registry/authentication/rest/storage_authentication.go +++ b/pkg/registry/authentication/rest/storage_authentication.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/authentication" authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" - "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/registry/authentication/tokenreview" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/authentication/tokenreview/BUILD b/pkg/registry/authentication/tokenreview/BUILD index 67f7f5e8e9..e06fdb1add 100644 --- a/pkg/registry/authentication/tokenreview/BUILD +++ b/pkg/registry/authentication/tokenreview/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/apis/authentication:go_default_library", - "//pkg/auth/authenticator:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/runtime:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", ], ) diff --git a/pkg/registry/authentication/tokenreview/storage.go b/pkg/registry/authentication/tokenreview/storage.go index da4c3775fa..745c4dc48d 100644 --- a/pkg/registry/authentication/tokenreview/storage.go +++ b/pkg/registry/authentication/tokenreview/storage.go @@ -20,9 +20,9 @@ import ( "fmt" "net/http" + "k8s.io/apiserver/pkg/authentication/authenticator" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/apis/authentication" - "k8s.io/kubernetes/pkg/auth/authenticator" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/registry/authorization/localsubjectaccessreview/BUILD b/pkg/registry/authorization/localsubjectaccessreview/BUILD index de67326e6b..bb11353f3f 100644 --- a/pkg/registry/authorization/localsubjectaccessreview/BUILD +++ b/pkg/registry/authorization/localsubjectaccessreview/BUILD @@ -15,9 +15,9 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/validation:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/authorization/util:go_default_library", "//pkg/runtime:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/registry/authorization/localsubjectaccessreview/rest.go b/pkg/registry/authorization/localsubjectaccessreview/rest.go index 75aa6e9bee..9125e2add4 100644 --- a/pkg/registry/authorization/localsubjectaccessreview/rest.go +++ b/pkg/registry/authorization/localsubjectaccessreview/rest.go @@ -19,10 +19,10 @@ package localsubjectaccessreview import ( "fmt" + "k8s.io/apiserver/pkg/authorization/authorizer" kapierrors "k8s.io/kubernetes/pkg/api/errors" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation" - "k8s.io/kubernetes/pkg/auth/authorizer" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/authorization/rest/BUILD b/pkg/registry/authorization/rest/BUILD index 42dda58be6..75229f9e84 100644 --- a/pkg/registry/authorization/rest/BUILD +++ b/pkg/registry/authorization/rest/BUILD @@ -15,11 +15,11 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/registry/authorization/localsubjectaccessreview:go_default_library", "//pkg/registry/authorization/selfsubjectaccessreview:go_default_library", "//pkg/registry/authorization/subjectaccessreview:go_default_library", "//pkg/registry/generic:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/registry/authorization/rest/storage_authorization.go b/pkg/registry/authorization/rest/storage_authorization.go index 6c975fc358..9f70691fff 100644 --- a/pkg/registry/authorization/rest/storage_authorization.go +++ b/pkg/registry/authorization/rest/storage_authorization.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/authorization" authorizationv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/registry/authorization/localsubjectaccessreview" "k8s.io/kubernetes/pkg/registry/authorization/selfsubjectaccessreview" diff --git a/pkg/registry/authorization/selfsubjectaccessreview/BUILD b/pkg/registry/authorization/selfsubjectaccessreview/BUILD index de67326e6b..bb11353f3f 100644 --- a/pkg/registry/authorization/selfsubjectaccessreview/BUILD +++ b/pkg/registry/authorization/selfsubjectaccessreview/BUILD @@ -15,9 +15,9 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/validation:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/authorization/util:go_default_library", "//pkg/runtime:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/registry/authorization/selfsubjectaccessreview/rest.go b/pkg/registry/authorization/selfsubjectaccessreview/rest.go index 2059938f02..e6f00b5096 100644 --- a/pkg/registry/authorization/selfsubjectaccessreview/rest.go +++ b/pkg/registry/authorization/selfsubjectaccessreview/rest.go @@ -19,10 +19,10 @@ package selfsubjectaccessreview import ( "fmt" + "k8s.io/apiserver/pkg/authorization/authorizer" apierrors "k8s.io/kubernetes/pkg/api/errors" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation" - "k8s.io/kubernetes/pkg/auth/authorizer" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/authorization/subjectaccessreview/BUILD b/pkg/registry/authorization/subjectaccessreview/BUILD index de67326e6b..bb11353f3f 100644 --- a/pkg/registry/authorization/subjectaccessreview/BUILD +++ b/pkg/registry/authorization/subjectaccessreview/BUILD @@ -15,9 +15,9 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/validation:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/authorization/util:go_default_library", "//pkg/runtime:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/registry/authorization/subjectaccessreview/rest.go b/pkg/registry/authorization/subjectaccessreview/rest.go index 11650fc6c5..bbeb1dee75 100644 --- a/pkg/registry/authorization/subjectaccessreview/rest.go +++ b/pkg/registry/authorization/subjectaccessreview/rest.go @@ -19,10 +19,10 @@ package subjectaccessreview import ( "fmt" + "k8s.io/apiserver/pkg/authorization/authorizer" kapierrors "k8s.io/kubernetes/pkg/api/errors" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation" - "k8s.io/kubernetes/pkg/auth/authorizer" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/authorization/util/BUILD b/pkg/registry/authorization/util/BUILD index 1553d19092..8305ecd53c 100644 --- a/pkg/registry/authorization/util/BUILD +++ b/pkg/registry/authorization/util/BUILD @@ -13,7 +13,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/authorization:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/pkg/registry/authorization/util/helpers.go b/pkg/registry/authorization/util/helpers.go index a9bdc2d47e..38fac1b436 100644 --- a/pkg/registry/authorization/util/helpers.go +++ b/pkg/registry/authorization/util/helpers.go @@ -18,8 +18,8 @@ package util import ( "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" - "k8s.io/kubernetes/pkg/auth/authorizer" ) // ResourceAttributesFrom combines the API object information and the user.Info from the context to build a full authorizer.AttributesRecord for resource access diff --git a/pkg/serviceaccount/BUILD b/pkg/serviceaccount/BUILD index 2458baf4db..c3e4bef68b 100644 --- a/pkg/serviceaccount/BUILD +++ b/pkg/serviceaccount/BUILD @@ -8,6 +8,13 @@ load( "go_test", ) +go_test( + name = "go_default_test", + srcs = ["util_test.go"], + library = ":go_default_library", + tags = ["automanaged"], +) + go_library( name = "go_default_library", srcs = [ @@ -19,20 +26,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation/genericvalidation:go_default_library", - "//pkg/auth/authenticator:go_default_library", "//vendor:github.com/dgrijalva/jwt-go", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) -go_test( - name = "go_default_test", - srcs = ["util_test.go"], - library = ":go_default_library", - tags = ["automanaged"], -) - go_test( name = "go_default_xtest", srcs = ["jwt_test.go"], diff --git a/pkg/serviceaccount/jwt.go b/pkg/serviceaccount/jwt.go index dad09cee6b..51590fa946 100644 --- a/pkg/serviceaccount/jwt.go +++ b/pkg/serviceaccount/jwt.go @@ -26,9 +26,9 @@ import ( "fmt" "io/ioutil" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/auth/authenticator" jwt "github.com/dgrijalva/jwt-go" "github.com/golang/glog" diff --git a/plugin/cmd/kube-scheduler/app/BUILD b/plugin/cmd/kube-scheduler/app/BUILD index 1e39872996..b19d036417 100644 --- a/plugin/cmd/kube-scheduler/app/BUILD +++ b/plugin/cmd/kube-scheduler/app/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/client/record:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", - "//pkg/healthz:go_default_library", "//pkg/runtime:go_default_library", "//pkg/util/configz:go_default_library", "//plugin/cmd/kube-scheduler/app/options:go_default_library", @@ -33,5 +32,6 @@ go_library( "//vendor:github.com/prometheus/client_golang/prometheus", "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apiserver/pkg/healthz", ], ) diff --git a/plugin/cmd/kube-scheduler/app/server.go b/plugin/cmd/kube-scheduler/app/server.go index a9aaa4e720..ee9f249c98 100644 --- a/plugin/cmd/kube-scheduler/app/server.go +++ b/plugin/cmd/kube-scheduler/app/server.go @@ -27,6 +27,7 @@ import ( goruntime "runtime" "strconv" + "k8s.io/apiserver/pkg/healthz" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" @@ -35,7 +36,6 @@ import ( "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" - "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options" diff --git a/plugin/pkg/admission/gc/BUILD b/plugin/pkg/admission/gc/BUILD index d7a2f0ad83..d31727d412 100644 --- a/plugin/pkg/admission/gc/BUILD +++ b/plugin/pkg/admission/gc/BUILD @@ -16,8 +16,8 @@ go_library( "//pkg/admission:go_default_library", "//pkg/api:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/runtime:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) @@ -30,9 +30,9 @@ go_test( "//pkg/admission:go_default_library", "//pkg/api:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/plugin/pkg/admission/gc/gc_admission.go b/plugin/pkg/admission/gc/gc_admission.go index f797280349..241027e672 100644 --- a/plugin/pkg/admission/gc/gc_admission.go +++ b/plugin/pkg/admission/gc/gc_admission.go @@ -20,10 +20,10 @@ import ( "fmt" "io" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/plugin/pkg/admission/gc/gc_admission_test.go b/plugin/pkg/admission/gc/gc_admission_test.go index 39abedd230..70a95350f2 100644 --- a/plugin/pkg/admission/gc/gc_admission_test.go +++ b/plugin/pkg/admission/gc/gc_admission_test.go @@ -20,10 +20,10 @@ import ( "testing" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "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/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/plugin/pkg/admission/security/podsecuritypolicy/BUILD b/plugin/pkg/admission/security/podsecuritypolicy/BUILD index dac1b0e8b5..cccb947547 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/BUILD +++ b/plugin/pkg/admission/security/podsecuritypolicy/BUILD @@ -18,7 +18,6 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/auth/authorizer: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/watch:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) @@ -44,7 +44,6 @@ go_test( "//pkg/admission:go_default_library", "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/auth/authorizer: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/sets:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/plugin/pkg/admission/security/podsecuritypolicy/admission.go b/plugin/pkg/admission/security/podsecuritypolicy/admission.go index a05be5c540..62594ab0ab 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/admission.go +++ b/plugin/pkg/admission/security/podsecuritypolicy/admission.go @@ -24,12 +24,12 @@ import ( "github.com/golang/glog" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "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/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" diff --git a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go index dd49ec60ee..484e501d03 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go +++ b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" 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/client/cache" "k8s.io/kubernetes/pkg/security/apparmor" kpsp "k8s.io/kubernetes/pkg/security/podsecuritypolicy" diff --git a/plugin/pkg/auth/authenticator/password/allow/BUILD b/plugin/pkg/auth/authenticator/password/allow/BUILD index 98fb2e080f..0a81f89656 100644 --- a/plugin/pkg/auth/authenticator/password/allow/BUILD +++ b/plugin/pkg/auth/authenticator/password/allow/BUILD @@ -13,7 +13,7 @@ go_library( srcs = ["allow.go"], tags = ["automanaged"], deps = [ - "//pkg/auth/authenticator:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/password/allow/allow.go b/plugin/pkg/auth/authenticator/password/allow/allow.go index df5f0e8ef4..3ca0ee2345 100644 --- a/plugin/pkg/auth/authenticator/password/allow/allow.go +++ b/plugin/pkg/auth/authenticator/password/allow/allow.go @@ -17,8 +17,8 @@ limitations under the License. package allow import ( + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" ) type allowAuthenticator struct{} diff --git a/plugin/pkg/auth/authenticator/request/anonymous/BUILD b/plugin/pkg/auth/authenticator/request/anonymous/BUILD index eb8fa99c5c..fa3e525348 100644 --- a/plugin/pkg/auth/authenticator/request/anonymous/BUILD +++ b/plugin/pkg/auth/authenticator/request/anonymous/BUILD @@ -13,7 +13,7 @@ go_library( srcs = ["anonymous.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,8 +24,8 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/auth/authenticator:go_default_library", "//pkg/util/sets:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/request/anonymous/anonymous.go b/plugin/pkg/auth/authenticator/request/anonymous/anonymous.go index 3f7ac5954c..a6d22942a3 100644 --- a/plugin/pkg/auth/authenticator/request/anonymous/anonymous.go +++ b/plugin/pkg/auth/authenticator/request/anonymous/anonymous.go @@ -19,8 +19,8 @@ package anonymous import ( "net/http" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" ) const ( diff --git a/plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go b/plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go index ec6668973b..29193aafb0 100644 --- a/plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go +++ b/plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go @@ -19,8 +19,8 @@ package anonymous import ( "testing" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/plugin/pkg/auth/authenticator/request/basicauth/BUILD b/plugin/pkg/auth/authenticator/request/basicauth/BUILD index 2120f08852..f6ba7cec7f 100644 --- a/plugin/pkg/auth/authenticator/request/basicauth/BUILD +++ b/plugin/pkg/auth/authenticator/request/basicauth/BUILD @@ -13,7 +13,7 @@ go_library( srcs = ["basicauth.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", ], ) diff --git a/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go b/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go index 2d1712c99f..50ce3ac3ba 100644 --- a/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go +++ b/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go @@ -19,8 +19,8 @@ package basicauth import ( "net/http" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" ) // Authenticator authenticates requests using basic auth diff --git a/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go b/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go index d4168b0516..70a0ba3452 100644 --- a/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go +++ b/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/auth/authenticator" ) type testPassword struct { diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD b/plugin/pkg/auth/authenticator/request/headerrequest/BUILD index 204289ccc1..8dda2775a1 100644 --- a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD +++ b/plugin/pkg/auth/authenticator/request/headerrequest/BUILD @@ -21,8 +21,8 @@ go_library( srcs = ["requestheader.go"], tags = ["automanaged"], deps = [ - "//pkg/auth/authenticator:go_default_library", "//plugin/pkg/auth/authenticator/request/x509:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/client-go/pkg/util/cert", "//vendor:k8s.io/client-go/pkg/util/sets", diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go b/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go index d937fc6b3f..88400a1718 100644 --- a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go +++ b/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go @@ -23,10 +23,10 @@ import ( "net/http" "strings" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" utilcert "k8s.io/client-go/pkg/util/cert" "k8s.io/client-go/pkg/util/sets" - "k8s.io/kubernetes/pkg/auth/authenticator" x509request "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509" ) diff --git a/plugin/pkg/auth/authenticator/request/union/BUILD b/plugin/pkg/auth/authenticator/request/union/BUILD index b3e2450ffc..754070f717 100644 --- a/plugin/pkg/auth/authenticator/request/union/BUILD +++ b/plugin/pkg/auth/authenticator/request/union/BUILD @@ -21,7 +21,7 @@ go_library( srcs = ["union.go"], tags = ["automanaged"], deps = [ - "//pkg/auth/authenticator:go_default_library", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/client-go/pkg/util/errors", ], diff --git a/plugin/pkg/auth/authenticator/request/union/union.go b/plugin/pkg/auth/authenticator/request/union/union.go index 509233e136..e5b43ab05e 100644 --- a/plugin/pkg/auth/authenticator/request/union/union.go +++ b/plugin/pkg/auth/authenticator/request/union/union.go @@ -19,9 +19,9 @@ package union import ( "net/http" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" utilerrors "k8s.io/client-go/pkg/util/errors" - "k8s.io/kubernetes/pkg/auth/authenticator" ) // unionAuthRequestHandler authenticates requests using a chain of authenticator.Requests diff --git a/plugin/pkg/auth/authenticator/request/x509/BUILD b/plugin/pkg/auth/authenticator/request/x509/BUILD index bfba594c9f..52d4476bfc 100644 --- a/plugin/pkg/auth/authenticator/request/x509/BUILD +++ b/plugin/pkg/auth/authenticator/request/x509/BUILD @@ -15,7 +15,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", "//vendor:k8s.io/client-go/pkg/util/sets", ], @@ -29,8 +29,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/auth/authenticator:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/client-go/pkg/util/errors", "//vendor:k8s.io/client-go/pkg/util/sets", diff --git a/plugin/pkg/auth/authenticator/request/x509/x509.go b/plugin/pkg/auth/authenticator/request/x509/x509.go index cf75d1072c..00a701636f 100644 --- a/plugin/pkg/auth/authenticator/request/x509/x509.go +++ b/plugin/pkg/auth/authenticator/request/x509/x509.go @@ -25,10 +25,10 @@ import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" utilerrors "k8s.io/client-go/pkg/util/errors" "k8s.io/client-go/pkg/util/sets" - "k8s.io/kubernetes/pkg/auth/authenticator" ) // UserConversion defines an interface for extracting user info from a client certificate chain diff --git a/plugin/pkg/auth/authenticator/request/x509/x509_test.go b/plugin/pkg/auth/authenticator/request/x509/x509_test.go index c37c65f27d..5254e7a778 100644 --- a/plugin/pkg/auth/authenticator/request/x509/x509_test.go +++ b/plugin/pkg/auth/authenticator/request/x509/x509_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/client-go/pkg/util/sets" - "k8s.io/kubernetes/pkg/auth/authenticator" ) const ( diff --git a/plugin/pkg/auth/authenticator/token/webhook/BUILD b/plugin/pkg/auth/authenticator/token/webhook/BUILD index 5e93cc2879..dda33ce263 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/BUILD +++ b/plugin/pkg/auth/authenticator/token/webhook/BUILD @@ -15,11 +15,11 @@ go_library( deps = [ "//pkg/apis/authentication/install:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", - "//pkg/auth/authenticator: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/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook.go b/plugin/pkg/auth/authenticator/token/webhook/webhook.go index d5df8a560a..7fe61d3481 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook.go @@ -20,10 +20,10 @@ package webhook import ( "time" + "k8s.io/apiserver/pkg/authentication/authenticator" "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" authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/cache" diff --git a/plugin/pkg/auth/authorizer/rbac/BUILD b/plugin/pkg/auth/authorizer/rbac/BUILD index e34b7312c4..0bb083dffc 100644 --- a/plugin/pkg/auth/authorizer/rbac/BUILD +++ b/plugin/pkg/auth/authorizer/rbac/BUILD @@ -18,10 +18,10 @@ go_library( deps = [ "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/util/errors:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) @@ -37,7 +37,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/validation:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/plugin/pkg/auth/authorizer/rbac/rbac.go b/plugin/pkg/auth/authorizer/rbac/rbac.go index 75f162421e..3b07cda1fa 100644 --- a/plugin/pkg/auth/authorizer/rbac/rbac.go +++ b/plugin/pkg/auth/authorizer/rbac/rbac.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" - "k8s.io/kubernetes/pkg/auth/authorizer" ) type RequestToRuleMapper interface { diff --git a/plugin/pkg/auth/authorizer/rbac/rbac_test.go b/plugin/pkg/auth/authorizer/rbac/rbac_test.go index 447e7932c3..13b4d48b22 100644 --- a/plugin/pkg/auth/authorizer/rbac/rbac_test.go +++ b/plugin/pkg/auth/authorizer/rbac/rbac_test.go @@ -22,10 +22,10 @@ import ( "testing" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" - "k8s.io/kubernetes/pkg/auth/authorizer" ) func newRule(verbs, apiGroups, resources, nonResourceURLs string) rbac.PolicyRule { diff --git a/plugin/pkg/auth/authorizer/rbac/subject_locator.go b/plugin/pkg/auth/authorizer/rbac/subject_locator.go index 7e90b830d3..e07736ea17 100644 --- a/plugin/pkg/auth/authorizer/rbac/subject_locator.go +++ b/plugin/pkg/auth/authorizer/rbac/subject_locator.go @@ -19,9 +19,9 @@ package rbac import ( "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" - "k8s.io/kubernetes/pkg/auth/authorizer" utilerrors "k8s.io/kubernetes/pkg/util/errors" ) diff --git a/plugin/pkg/auth/authorizer/rbac/subject_locator_test.go b/plugin/pkg/auth/authorizer/rbac/subject_locator_test.go index 449a7f6b8d..c8e810f99d 100644 --- a/plugin/pkg/auth/authorizer/rbac/subject_locator_test.go +++ b/plugin/pkg/auth/authorizer/rbac/subject_locator_test.go @@ -21,9 +21,9 @@ import ( "testing" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/validation" - "k8s.io/kubernetes/pkg/auth/authorizer" ) func TestSubjectLocator(t *testing.T) { diff --git a/plugin/pkg/auth/authorizer/webhook/BUILD b/plugin/pkg/auth/authorizer/webhook/BUILD index 68245e31dc..65f2a61e71 100644 --- a/plugin/pkg/auth/authorizer/webhook/BUILD +++ b/plugin/pkg/auth/authorizer/webhook/BUILD @@ -15,12 +15,12 @@ go_library( deps = [ "//pkg/apis/authorization/install:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/client/clientset_generated/clientset/typed/authorization/v1beta1:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/util/cache:go_default_library", "//plugin/pkg/webhook:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) @@ -35,9 +35,9 @@ go_test( deps = [ "//pkg/apis/authorization/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/client/unversioned/clientcmd/api/v1:go_default_library", "//pkg/util/diff:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/plugin/pkg/auth/authorizer/webhook/webhook.go b/plugin/pkg/auth/authorizer/webhook/webhook.go index 82754581ac..ef3f1c6939 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook.go @@ -23,8 +23,8 @@ import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/authorization/authorizer" authorization "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - "k8s.io/kubernetes/pkg/auth/authorizer" authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/cache" diff --git a/plugin/pkg/auth/authorizer/webhook/webhook_test.go b/plugin/pkg/auth/authorizer/webhook/webhook_test.go index 2ac0dd165c..9f9d9eaec8 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook_test.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook_test.go @@ -33,9 +33,9 @@ import ( "time" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" "k8s.io/kubernetes/pkg/util/diff" ) diff --git a/staging/src/k8s.io/apiserver/pkg/util/flushwriter/doc.go b/staging/src/k8s.io/apiserver/pkg/util/flushwriter/doc.go index 2df7823628..f81e09a29c 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flushwriter/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flushwriter/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package flushwriter implements a wrapper for a writer that flushes on every // write if that writer implements the io.Flusher interface -package flushwriter // import "k8s.io/kubernetes/pkg/util/flushwriter" +package flushwriter // import "k8s.io/apiserver/pkg/util/flushwriter" diff --git a/test/integration/auth/accessreview_test.go b/test/integration/auth/accessreview_test.go index 74104cffe1..6710c36747 100644 --- a/test/integration/auth/accessreview_test.go +++ b/test/integration/auth/accessreview_test.go @@ -24,12 +24,12 @@ import ( "strings" "testing" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" - "k8s.io/kubernetes/pkg/auth/authenticator" - "k8s.io/kubernetes/pkg/auth/authorizer" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/plugin/pkg/admission/admit" diff --git a/test/integration/auth/auth_test.go b/test/integration/auth/auth_test.go index a52d75bf08..3227958fd6 100644 --- a/test/integration/auth/auth_test.go +++ b/test/integration/auth/auth_test.go @@ -36,16 +36,16 @@ import ( "testing" "time" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apimachinery/registered" authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" - "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/authorizer/abac" "k8s.io/kubernetes/pkg/auth/group" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" diff --git a/test/integration/auth/rbac_test.go b/test/integration/auth/rbac_test.go index 78dddcdf40..4fef04d254 100644 --- a/test/integration/auth/rbac_test.go +++ b/test/integration/auth/rbac_test.go @@ -30,13 +30,13 @@ import ( "github.com/golang/glog" + "k8s.io/apiserver/pkg/authentication/authenticator" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apimachinery/registered" rbacapi "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" - "k8s.io/kubernetes/pkg/auth/authorizer" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/transport" diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index a904d98ee7..cf5fc9befd 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -30,8 +30,6 @@ go_library( "//pkg/apis/policy/v1alpha1:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", - "//pkg/auth/authenticator:go_default_library", - "//pkg/auth/authorizer:go_default_library", "//pkg/auth/authorizer/union:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", @@ -62,6 +60,8 @@ go_library( "//vendor:github.com/go-openapi/spec", "//vendor:github.com/golang/glog", "//vendor:github.com/pborman/uuid", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], ) diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 229abe216a..b468aa324f 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -27,7 +27,9 @@ import ( "time" "github.com/golang/glog" + authauthenticator "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" + authauthorizer "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" @@ -41,8 +43,6 @@ import ( policy "k8s.io/kubernetes/pkg/apis/policy/v1alpha1" rbac "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" - authauthenticator "k8s.io/kubernetes/pkg/auth/authenticator" - authauthorizer "k8s.io/kubernetes/pkg/auth/authorizer" authorizerunion "k8s.io/kubernetes/pkg/auth/authorizer/union" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" diff --git a/test/integration/serviceaccount/service_account_test.go b/test/integration/serviceaccount/service_account_test.go index 0b09fc773f..546ae46ce0 100644 --- a/test/integration/serviceaccount/service_account_test.go +++ b/test/integration/serviceaccount/service_account_test.go @@ -31,15 +31,15 @@ import ( "testing" "time" + "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" - "k8s.io/kubernetes/pkg/auth/authorizer" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/vendor/BUILD b/vendor/BUILD index d94153e8ad..026c648a18 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -12256,3 +12256,49 @@ go_library( ], tags = ["automanaged"], ) + +go_test( + name = "k8s.io/apiserver/pkg/healthz_test", + srcs = ["k8s.io/apiserver/pkg/healthz/healthz_test.go"], + library = ":k8s.io/apiserver/pkg/healthz", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apiserver/pkg/healthz", + srcs = [ + "k8s.io/apiserver/pkg/healthz/doc.go", + "k8s.io/apiserver/pkg/healthz/healthz.go", + ], + tags = ["automanaged"], +) + +go_test( + name = "k8s.io/apiserver/pkg/util/flushwriter_test", + srcs = ["k8s.io/apiserver/pkg/util/flushwriter/writer_test.go"], + library = ":k8s.io/apiserver/pkg/util/flushwriter", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apiserver/pkg/util/flushwriter", + srcs = [ + "k8s.io/apiserver/pkg/util/flushwriter/doc.go", + "k8s.io/apiserver/pkg/util/flushwriter/writer.go", + ], + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apiserver/pkg/authentication/authenticator", + srcs = ["k8s.io/apiserver/pkg/authentication/authenticator/interfaces.go"], + tags = ["automanaged"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], +) + +go_library( + name = "k8s.io/apiserver/pkg/authorization/authorizer", + srcs = ["k8s.io/apiserver/pkg/authorization/authorizer/interfaces.go"], + tags = ["automanaged"], + deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"], +)