github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

genericapiserver: move authn plugins into k8s.io/apiserver

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-01-19 11:33:15 +01:00
parent f36a3d8e0c
commit 4077e0bba7
36 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,10 +31,9 @@ import (
unionauth "k8s.io/apiserver/pkg/authentication/request/union"
"k8s.io/apiserver/pkg/authentication/request/x509"
"k8s.io/apiserver/pkg/authentication/user"
webhooktoken "k8s.io/apiserver/plugin/pkg/authenticator/token/webhook"
authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1"
"k8s.io/client-go/util/cert"
webhooktoken "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook"
)
// DelegatingAuthenticatorConfig is the minimal configuration needed to create an authenticator

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

@ -30,15 +30,15 @@ import (
"k8s.io/apiserver/pkg/authentication/request/x509"
"k8s.io/apiserver/pkg/authentication/token/tokenfile"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/plugin/pkg/authenticator/password/keystone"
"k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile"
"k8s.io/apiserver/plugin/pkg/authenticator/request/basicauth"
"k8s.io/apiserver/plugin/pkg/authenticator/token/anytoken"
"k8s.io/apiserver/plugin/pkg/authenticator/token/oidc"
"k8s.io/apiserver/plugin/pkg/authenticator/token/webhook"
certutil "k8s.io/client-go/util/cert"
genericauthenticator "k8s.io/kubernetes/pkg/genericapiserver/authenticator"
"k8s.io/kubernetes/pkg/serviceaccount"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/keystone"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/passwordfile"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/basicauth"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/anytoken"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook"
// Initialize all known client auth plugins.
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

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

2
plugin/pkg/auth/authenticator/doc.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/doc.go
View File

@ -15,4 +15,4 @@ limitations under the License.
*/
// Package authenticator contains implementations for pkg/auth/authenticator interfaces
package authenticator // import "k8s.io/kubernetes/plugin/pkg/auth/authenticator"
package authenticator // import "k8s.io/apiserver/plugin/pkg/authenticator"

0
plugin/pkg/auth/authenticator/password/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/BUILD
View File

0
plugin/pkg/auth/authenticator/password/allow/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/BUILD
View File

0
plugin/pkg/auth/authenticator/password/allow/allow.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow.go
View File

0
plugin/pkg/auth/authenticator/password/allow/allow_test.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow_test.go
View File

2
plugin/pkg/auth/authenticator/password/doc.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/doc.go
View File

@ -15,4 +15,4 @@ limitations under the License.
*/
// Package password contains authenticator.Password implementations
package password // import "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password"
package password // import "k8s.io/apiserver/plugin/pkg/authenticator/password"

0
plugin/pkg/auth/authenticator/password/keystone/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/keystone/BUILD
View File

2
plugin/pkg/auth/authenticator/password/keystone/doc.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/keystone/doc.go
View File

@ -17,4 +17,4 @@ limitations under the License.
// Package keystone provides authentication via keystone.
// For details about keystone and how to use the plugin, refer to
// https://github.com/kubernetes/kubernetes.github.io/blob/master/docs/admin/authentication.md
package keystone // import "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/keystone"
package keystone // import "k8s.io/apiserver/plugin/pkg/authenticator/password/keystone"

1
plugin/pkg/auth/authenticator/password/keystone/keystone.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/keystone/keystone.go
View File

@ -25,6 +25,7 @@ import (
"github.com/golang/glog"
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/openstack"
netutil "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apiserver/pkg/authentication/user"
certutil "k8s.io/client-go/util/cert"

0
plugin/pkg/auth/authenticator/password/passwordfile/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile/BUILD
View File

1
plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile/passwordfile.go
View File

@ -24,6 +24,7 @@ import (
"strings"
"github.com/golang/glog"
"k8s.io/apiserver/pkg/authentication/user"
)

0
plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile/passwordfile_test.go
View File

0
plugin/pkg/auth/authenticator/request/basicauth/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/request/basicauth/BUILD
View File

0
plugin/pkg/auth/authenticator/request/basicauth/basicauth.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/request/basicauth/basicauth.go
View File

0
plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/request/basicauth/basicauth_test.go
View File

0
plugin/pkg/auth/authenticator/token/anytoken/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/anytoken/BUILD
View File

0
plugin/pkg/auth/authenticator/token/anytoken/anytoken.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/anytoken/anytoken.go
View File

0
plugin/pkg/auth/authenticator/token/anytoken/anytoken_test.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/anytoken/anytoken_test.go
View File

0
plugin/pkg/auth/authenticator/token/oidc/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc/BUILD
View File

0
plugin/pkg/auth/authenticator/token/oidc/OWNERS → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc/OWNERS
View File

0
plugin/pkg/auth/authenticator/token/oidc/oidc.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc/oidc.go
View File

2
plugin/pkg/auth/authenticator/token/oidc/oidc_test.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc/oidc_test.go
View File

@ -30,7 +30,7 @@ import (
"github.com/coreos/go-oidc/oidc"
"k8s.io/apiserver/pkg/authentication/user"
oidctesting "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc/testing"
oidctesting "k8s.io/apiserver/plugin/pkg/authenticator/token/oidc/testing"
)
func generateToken(t *testing.T, op *oidctesting.OIDCProvider, iss, sub, aud string, usernameClaim, value, groupsClaim string, groups interface{}, iat, exp time.Time, emailVerified bool) string {

0
plugin/pkg/auth/authenticator/token/oidc/testing/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc/testing/BUILD
View File

0
plugin/pkg/auth/authenticator/token/oidc/testing/provider.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc/testing/provider.go
View File

0
plugin/pkg/auth/authenticator/token/tokentest/BUILD → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/tokentest/BUILD
View File

0
plugin/pkg/auth/authenticator/token/tokentest/tokentest.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/tokentest/tokentest.go
View File

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

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

4
plugin/pkg/auth/authenticator/token/webhook/webhook.go → staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go
View File

@ -24,13 +24,11 @@ import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/util/cache"
"k8s.io/apiserver/pkg/util/webhook"
authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1"
authentication "k8s.io/client-go/pkg/apis/authentication/v1beta1"
"k8s.io/apiserver/pkg/util/webhook"
_ "k8s.io/client-go/pkg/apis/authentication/install"
_ "k8s.io/kubernetes/pkg/apis/authentication/install"
)
var (

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

@ -32,8 +32,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/client-go/pkg/apis/authentication/v1beta1"
"k8s.io/client-go/tools/clientcmd/api/v1"
"k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
)
// Service mocks a remote authentication service.

4
test/integration/auth/auth_test.go
View File

@ -43,6 +43,8 @@ import (
"k8s.io/apiserver/pkg/authentication/serviceaccount"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/plugin/pkg/authenticator/token/tokentest"
"k8s.io/apiserver/plugin/pkg/authenticator/token/webhook"
"k8s.io/client-go/tools/clientcmd/api/v1"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
@ -52,8 +54,6 @@ import (
"k8s.io/kubernetes/pkg/auth/authorizer/abac"
apiserverauthorizer "k8s.io/kubernetes/pkg/genericapiserver/authorizer"
"k8s.io/kubernetes/plugin/pkg/admission/admit"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokentest"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook"
"k8s.io/kubernetes/test/integration"
"k8s.io/kubernetes/test/integration/framework"
)

2
test/integration/auth/rbac_test.go
View File

@ -36,6 +36,7 @@ import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/request/bearertoken"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/plugin/pkg/authenticator/token/anytoken"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/transport"
"k8s.io/kubernetes/pkg/api"
@ -52,7 +53,6 @@ import (
rolestore "k8s.io/kubernetes/pkg/registry/rbac/role/storage"
"k8s.io/kubernetes/pkg/registry/rbac/rolebinding"
rolebindingstore "k8s.io/kubernetes/pkg/registry/rbac/rolebinding/storage"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/anytoken"
"k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac"
"k8s.io/kubernetes/test/integration/framework"
)

22
test/test_owners.csv
View File

@ -513,6 +513,17 @@ Volumes GlusterFS should be mountable,eparis,1
Volumes NFS should be mountable,rrati,0
Volumes PD should be mountable,caesarxuchao,1
Volumes iSCSI should be mountable,jsafrane,1
k8s.io/apiserver/plugin/pkg/authenticator/password/allow,liggitt,0
k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile,liggitt,0
k8s.io/apiserver/plugin/pkg/authenticator/request/anonymous,justinsb,1
k8s.io/apiserver/plugin/pkg/authenticator/request/basicauth,liggitt,0
k8s.io/apiserver/plugin/pkg/authenticator/request/headerrequest,deads2k,0
k8s.io/apiserver/plugin/pkg/authenticator/request/union,liggitt,0
k8s.io/apiserver/plugin/pkg/authenticator/request/x509,liggitt,0
k8s.io/apiserver/plugin/pkg/authenticator/token/anytoken,krousey,1
k8s.io/apiserver/plugin/pkg/authenticator/token/oidc,brendandburns,1
k8s.io/apiserver/plugin/pkg/authenticator/token/tokenfile,liggitt,0
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook,rrati,0
k8s.io/kubernetes/cmd/genutils,rmmh,1
k8s.io/kubernetes/cmd/hyperkube,jbeda,0
k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver,brendandburns,0
@ -943,17 +954,6 @@ k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy,maisem,1
k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny,rrati,0
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/authenticator/password/allow,liggitt,0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/passwordfile,liggitt,0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/anonymous,justinsb,1
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/basicauth,liggitt,0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/headerrequest,deads2k,0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union,liggitt,0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509,liggitt,0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/anytoken,krousey,1
k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc,brendandburns,1
k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile,liggitt,0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook,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/webhook,rrati,0

1 name owner auto-assigned
513 Volumes NFS should be mountable rrati 0
514 Volumes PD should be mountable caesarxuchao 1
515 Volumes iSCSI should be mountable jsafrane 1
516 k8s.io/apiserver/plugin/pkg/authenticator/password/allow liggitt 0
517 k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile liggitt 0
518 k8s.io/apiserver/plugin/pkg/authenticator/request/anonymous justinsb 1
519 k8s.io/apiserver/plugin/pkg/authenticator/request/basicauth liggitt 0
520 k8s.io/apiserver/plugin/pkg/authenticator/request/headerrequest deads2k 0
521 k8s.io/apiserver/plugin/pkg/authenticator/request/union liggitt 0
522 k8s.io/apiserver/plugin/pkg/authenticator/request/x509 liggitt 0
523 k8s.io/apiserver/plugin/pkg/authenticator/token/anytoken krousey 1
524 k8s.io/apiserver/plugin/pkg/authenticator/token/oidc brendandburns 1
525 k8s.io/apiserver/plugin/pkg/authenticator/token/tokenfile liggitt 0
526 k8s.io/apiserver/plugin/pkg/authenticator/token/webhook rrati 0
527 k8s.io/kubernetes/cmd/genutils rmmh 1
528 k8s.io/kubernetes/cmd/hyperkube jbeda 0
529 k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver brendandburns 0
954 k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny rrati 0
955 k8s.io/kubernetes/plugin/pkg/admission/serviceaccount liggitt 0
956 k8s.io/kubernetes/plugin/pkg/admission/storageclass/default pmorie 1
k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/allow liggitt 0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/passwordfile liggitt 0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/anonymous justinsb 1
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/basicauth liggitt 0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/headerrequest deads2k 0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union liggitt 0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509 liggitt 0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/anytoken krousey 1
k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc brendandburns 1
k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile liggitt 0
k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook rrati 0
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 rrati 0