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

Make master take authenticator.Request interface instead of tokenfile

Browse Source
This commit is contained in:
Jordan Liggitt
2014-11-19 10:31:43 -05:00
parent 57ec3a720b
commit c895331277
7 changed files with 102 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/master/master.go
View File

@@ -34,8 +34,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta2"
"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator"
"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator/bearertoken"
"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator/tokenfile"
"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer"
"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/handlers"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
@@ -73,7 +71,7 @@ type Config struct {
EnableUISupport bool
APIPrefix string
CorsAllowedOriginList util.StringList
TokenAuthFile string
Authenticator authenticator.Request
Authorizer authorizer.Authorizer
// Number of masters running; all masters must be started with the
@@ -111,7 +109,7 @@ type Master struct {
enableUISupport bool
apiPrefix string
corsAllowedOriginList util.StringList
tokenAuthFile string
authenticator authenticator.Request
authorizer authorizer.Authorizer
masterCount int
@@ -242,7 +240,7 @@ func New(c *Config) *Master {
enableUISupport: c.EnableUISupport,
apiPrefix: c.APIPrefix,
corsAllowedOriginList: c.CorsAllowedOriginList,
tokenAuthFile: c.TokenAuthFile,
authenticator: c.Authenticator,
authorizer: c.Authorizer,
masterCount: c.MasterCount,
@@ -309,14 +307,7 @@ func (m *Master) init(c *Config) {
go util.Forever(func() { podCache.UpdateAllContainers() }, time.Second*30)
var userContexts = handlers.NewUserRequestContext()
var authenticator authenticator.Request
if len(c.TokenAuthFile) != 0 {
tokenAuthenticator, err := tokenfile.New(c.TokenAuthFile)
if err != nil {
glog.Fatalf("Unable to load the token authentication file '%s': %v", c.TokenAuthFile, err)
}
authenticator = bearertoken.New(tokenAuthenticator)
}
var authenticator = c.Authenticator
// TODO: Factor out the core API registration
m.storage = map[string]apiserver.RESTStorage{