github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-01-19 13:04:08 +01:00
parent 4077e0bba7
commit 4beba154b4
8 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/genericapiserver/authorizer/delegating.go
View File

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

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

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

0
plugin/pkg/auth/authorizer/webhook/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/BUILD
View File

0
plugin/pkg/auth/authorizer/webhook/certs_test.go → staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/certs_test.go
View File

0
plugin/pkg/auth/authorizer/webhook/gencerts.sh → staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/gencerts.sh
View File

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

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

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

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

2
test/test_owners.csv
View File

@@ -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/admission/storageclass/default,pmorie,1
k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac,rrati,0 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/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/gcp,jlowdermilk,0
k8s.io/kubernetes/plugin/pkg/client/auth/oidc,cjcullen,1 k8s.io/kubernetes/plugin/pkg/client/auth/oidc,cjcullen,1
k8s.io/kubernetes/plugin/pkg/scheduler,fgrzadkowski,0 k8s.io/kubernetes/plugin/pkg/scheduler,fgrzadkowski,0
1 name owner auto-assigned
956 k8s.io/kubernetes/plugin/pkg/admission/storageclass/default pmorie 1
957 k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac rrati 0
958 k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy mml 1
959 k8s.io/kubernetes/plugin/pkg/auth/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook rrati 0
960 k8s.io/kubernetes/plugin/pkg/client/auth/gcp jlowdermilk 0
961 k8s.io/kubernetes/plugin/pkg/client/auth/oidc cjcullen 1
962 k8s.io/kubernetes/plugin/pkg/scheduler fgrzadkowski 0