Skip to content

disable the oauth server in kubeapiserver #22054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deads2k merged 1 commit into from
Feb 19, 2019
Merged

disable the oauth server in kubeapiserver #22054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions pkg/cmd/openshift-kube-apiserver/openshiftkubeapiserver/patch_handlerchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,17 @@ func BuildHandlerChain(genericConfig *genericapiserver.Config, oauthConfig *osin

extraPostStartHooks := map[string]genericapiserver.PostStartHookFunc{}

oauthServerHandler, newPostStartHooks, err := NewOAuthServerHandler(genericConfig, oauthConfig)
if err != nil {
return nil, nil, err
}
for name, fn := range newPostStartHooks {
extraPostStartHooks[name] = fn
var oauthServerHandler http.Handler
if oauthConfig != nil {
var newPostStartHooks map[string]genericapiserver.PostStartHookFunc
var err error
oauthServerHandler, newPostStartHooks, err = NewOAuthServerHandler(genericConfig, oauthConfig)
if err != nil {
return nil, nil, err
}
for name, fn := range newPostStartHooks {
extraPostStartHooks[name] = fn
}
}

return func(apiHandler http.Handler, genericConfig *genericapiserver.Config) http.Handler {
Expand All @@ -57,9 +62,11 @@ func BuildHandlerChain(genericConfig *genericapiserver.Config, oauthConfig *osin
// redirects from / and /console to consolePublicURL if you're using a browser
handler = withConsoleRedirect(handler, consolePublicURL)

// these handlers are actually separate API servers which have their own handler chains.
// our server embeds these
handler = withOAuthRedirection(oauthConfig, handler, oauthServerHandler)
if oauthConfig != nil {
// these handlers are actually separate API servers which have their own handler chains.
// our server embeds these
handler = withOAuthRedirection(oauthConfig, handler, oauthServerHandler)
}

return handler
},
Expand Down