genericapiserver: move authz webhook plugins into k8s.io/apiserver

pkg/genericapiserver/authorizer/delegating.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1"
 
-	webhooksar "k8s.io/kubernetes/plugin/pkg/auth/authorizer/webhook"
+	"k8s.io/apiserver/plugin/pkg/authorizer/webhook"
 )
 
 // DelegatingAuthorizerConfig is the minimal configuration needed to create an authenticator
@@ -39,7 +39,7 @@ type DelegatingAuthorizerConfig struct {
 }
 
 func (c DelegatingAuthorizerConfig) New() (authorizer.Authorizer, error) {
-	return webhooksar.NewFromInterface(
+	return webhook.NewFromInterface(
 		c.SubjectAccessReviewClient,
 		c.AllowCacheTTL,
 		c.DenyCacheTTL,

pkg/kubeapiserver/authorizer/config.go

@@ -23,11 +23,11 @@ import (
 
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/authorization/union"
+	"k8s.io/apiserver/plugin/pkg/authorizer/webhook"
 	"k8s.io/kubernetes/pkg/auth/authorizer/abac"
 	"k8s.io/kubernetes/pkg/controller/informers"
 	genericauthorizer "k8s.io/kubernetes/pkg/genericapiserver/authorizer"
 	"k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac"
-	"k8s.io/kubernetes/plugin/pkg/auth/authorizer/webhook"
 )
 
 const (

plugin/pkg/auth/authorizer/webhook/webhook.go → staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go

@@ -32,7 +32,6 @@ import (
 	"k8s.io/apiserver/pkg/util/webhook"
 
 	_ "k8s.io/client-go/pkg/apis/authorization/install"
-	_ "k8s.io/kubernetes/pkg/apis/authorization/install"
 )
 
 var (

plugin/pkg/auth/authorizer/webhook/webhook_test.go → staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook_test.go

@@ -36,8 +36,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/client-go/pkg/apis/authorization/v1beta1"
 	"k8s.io/client-go/tools/clientcmd/api/v1"
-	"k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
 )
 
 func TestNewFromConfig(t *testing.T) {

test/test_owners.csv

@@ -956,7 +956,7 @@ k8s.io/kubernetes/plugin/pkg/admission/serviceaccount,liggitt,0
 k8s.io/kubernetes/plugin/pkg/admission/storageclass/default,pmorie,1
 k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac,rrati,0
 k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy,mml,1
-k8s.io/kubernetes/plugin/pkg/auth/authorizer/webhook,rrati,0
+k8s.io/apiserver/plugin/pkg/authorizer/webhook,rrati,0
 k8s.io/kubernetes/plugin/pkg/client/auth/gcp,jlowdermilk,0
 k8s.io/kubernetes/plugin/pkg/client/auth/oidc,cjcullen,1
 k8s.io/kubernetes/plugin/pkg/scheduler,fgrzadkowski,0