github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update delegating auth to include front-proxy

Browse Source
This commit is contained in:
deads2k
2016-12-05 13:46:25 -05:00
parent 4f625db133
commit fbb35b72ed
5 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/kube-apiserver/app/server.go
View File

@@ -96,14 +96,14 @@ func Run(s *options.ServerRunOptions) error {
genericapiserver.DefaultAndValidateRunOptions(s.GenericServerRunOptions)
genericConfig, err := genericapiserver.NewConfig(). // create the new config
ApplyOptions(s.GenericServerRunOptions). // apply the options selected
ApplyInsecureServingOptions(s.InsecureServing).
ApplyAuthenticationOptions(s.Authentication).
ApplySecureServingOptions(s.SecureServing)
if err != nil {
genericConfig := genericapiserver.NewConfig(). // create the new config
ApplyOptions(s.GenericServerRunOptions). // apply the options selected
ApplyInsecureServingOptions(s.InsecureServing)
if _, err := genericConfig.ApplySecureServingOptions(s.SecureServing); err != nil {
return fmt.Errorf("failed to configure https: %s", err)
}
genericConfig.ApplyAuthenticationOptions(s.Authentication)
capabilities.Initialize(capabilities.Capabilities{
AllowPrivileged: s.AllowPrivileged,