Skip to content

Commit

Permalink
Wire up OAuth shared informer
Browse files Browse the repository at this point in the history
This change wires up the OAuth informer to allow performant lookups
to be made for the OAuth resources.

Signed-off-by: Monis Khan <[email protected]>
  • Loading branch information
enj committed Dec 5, 2017
1 parent 10d7f6a commit 5b379e3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/cmd/server/origin/master_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
imageadmission "github.com/openshift/origin/pkg/image/admission"
imageapi "github.com/openshift/origin/pkg/image/apis/image"
imageinformer "github.com/openshift/origin/pkg/image/generated/informers/internalversion"
oauthinformer "github.com/openshift/origin/pkg/oauth/generated/informers/internalversion"
projectauth "github.com/openshift/origin/pkg/project/auth"
projectcache "github.com/openshift/origin/pkg/project/cache"
"github.com/openshift/origin/pkg/quota/controller/clusterquotamapping"
Expand Down Expand Up @@ -99,6 +100,7 @@ type InformerAccess interface {
GetClientGoKubeInformers() kubeclientgoinformers.SharedInformerFactory
GetAuthorizationInformers() authorizationinformer.SharedInformerFactory
GetImageInformers() imageinformer.SharedInformerFactory
GetOauthInformers() oauthinformer.SharedInformerFactory
GetQuotaInformers() quotainformer.SharedInformerFactory
GetSecurityInformers() securityinformer.SharedInformerFactory
GetUserInformers() userinformer.SharedInformerFactory
Expand Down
12 changes: 12 additions & 0 deletions pkg/cmd/server/start/informers.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import (
configapi "github.com/openshift/origin/pkg/cmd/server/api"
imageinformer "github.com/openshift/origin/pkg/image/generated/informers/internalversion"
imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
oauthinformer "github.com/openshift/origin/pkg/oauth/generated/informers/internalversion"
oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset"
quotainformer "github.com/openshift/origin/pkg/quota/generated/informers/internalversion"
quotaclient "github.com/openshift/origin/pkg/quota/generated/internalclientset"
securityinformer "github.com/openshift/origin/pkg/security/generated/informers/internalversion"
Expand All @@ -43,6 +45,7 @@ type informers struct {
authorizationInformers authorizationinformer.SharedInformerFactory
buildInformers buildinformer.SharedInformerFactory
imageInformers imageinformer.SharedInformerFactory
oauthInformers oauthinformer.SharedInformerFactory
quotaInformers quotainformer.SharedInformerFactory
securityInformers securityinformer.SharedInformerFactory
templateInformers templateinformer.SharedInformerFactory
Expand Down Expand Up @@ -72,6 +75,10 @@ func NewInformers(options configapi.MasterConfig) (*informers, error) {
if err != nil {
return nil, err
}
oauthClient, err := oauthclient.NewForConfig(clientConfig)
if err != nil {
return nil, err
}
quotaClient, err := quotaclient.NewForConfig(clientConfig)
if err != nil {
return nil, err
Expand Down Expand Up @@ -105,6 +112,7 @@ func NewInformers(options configapi.MasterConfig) (*informers, error) {
authorizationInformers: authorizationinformer.NewSharedInformerFactory(authorizationClient, defaultInformerResyncPeriod),
buildInformers: buildinformer.NewSharedInformerFactory(buildClient, defaultInformerResyncPeriod),
imageInformers: imageinformer.NewSharedInformerFactory(imageClient, defaultInformerResyncPeriod),
oauthInformers: oauthinformer.NewSharedInformerFactory(oauthClient, defaultInformerResyncPeriod),
quotaInformers: quotainformer.NewSharedInformerFactory(quotaClient, defaultInformerResyncPeriod),
securityInformers: securityinformer.NewSharedInformerFactory(securityClient, defaultInformerResyncPeriod),
templateInformers: templateinformer.NewSharedInformerFactory(templateClient, defaultInformerResyncPeriod),
Expand Down Expand Up @@ -133,6 +141,9 @@ func (i *informers) GetBuildInformers() buildinformer.SharedInformerFactory {
func (i *informers) GetImageInformers() imageinformer.SharedInformerFactory {
return i.imageInformers
}
func (i *informers) GetOauthInformers() oauthinformer.SharedInformerFactory {
return i.oauthInformers
}
func (i *informers) GetQuotaInformers() quotainformer.SharedInformerFactory {
return i.quotaInformers
}
Expand All @@ -155,6 +166,7 @@ func (i *informers) Start(stopCh <-chan struct{}) {
i.authorizationInformers.Start(stopCh)
i.buildInformers.Start(stopCh)
i.imageInformers.Start(stopCh)
i.oauthInformers.Start(stopCh)
i.quotaInformers.Start(stopCh)
i.securityInformers.Start(stopCh)
i.templateInformers.Start(stopCh)
Expand Down

0 comments on commit 5b379e3

Please sign in to comment.