Skip to content

Reorganize args to NewConsoleOperator func #310

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
openshift-merge-robot merged 1 commit into from
Oct 9, 2019
Merged

Reorganize args to NewConsoleOperator func #310

Show file tree
Hide file tree
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
27 changes: 15 additions & 12 deletions pkg/console/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,28 @@ type consoleOperator struct {
}

func NewConsoleOperator(
// informers
operatorConfigInformer operatorinformerv1.ConsoleInformer,
// top level config
configClient configclientv1.ConfigV1Interface,
configInformer configinformer.SharedInformerFactory,

coreV1 corev1.Interface,
managedCoreV1 corev1.Interface,
deployments appsinformersv1.DeploymentInformer,
routes routesinformersv1.RouteInformer,
oauthClients oauthinformersv1.OAuthClientInformer,

// clients
// operator
operatorConfigClient operatorclientv1.OperatorV1Interface,
configClient configclientv1.ConfigV1Interface,
operatorConfigInformer operatorinformerv1.ConsoleInformer,
// core resources
corev1Client coreclientv1.CoreV1Interface,
coreV1 corev1.Interface,
// deployments
deploymentClient appsv1.DeploymentsGetter,
deployments appsinformersv1.DeploymentInformer,
// routes
routev1Client routeclientv1.RoutesGetter,
routes routesinformersv1.RouteInformer,
// oauth
oauthv1Client oauthclientv1.OAuthClientsGetter,
oauthClients oauthinformersv1.OAuthClientInformer,
// openshift managed
managedCoreV1 corev1.Interface,
// event handling
versionGetter status.VersionGetter,
// recorder
recorder events.Recorder,
resourceSyncer resourcesynccontroller.ResourceSyncer,
) operator.Runner {
Expand Down
28 changes: 17 additions & 11 deletions pkg/console/starter/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,22 +131,28 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {

// TODO: rearrange these into informer,client pairs, NOT separated.
consoleOperator := operator.NewConsoleOperator(
// informers
operatorConfigInformers.Operator().V1().Consoles(), // OperatorConfig
configInformers, // ConsoleConfig
kubeInformersNamespaced.Core().V1(), // Secrets, ConfigMaps, Service
kubeInformersManagedNamespaced.Core().V1(), // Managed ConfigMaps
kubeInformersNamespaced.Apps().V1().Deployments(), // Deployments
routesInformersNamespaced.Route().V1().Routes(), // Route
oauthInformers.Oauth().V1().OAuthClients(), // OAuth clients
// clients
operatorConfigClient.OperatorV1(),
// top level config
configClient.ConfigV1(),
configInformers,
// operator
operatorConfigClient.OperatorV1(),
operatorConfigInformers.Operator().V1().Consoles(), // OperatorConfig

kubeClient.CoreV1(), // Secrets, ConfigMaps, Service
// core resources
kubeClient.CoreV1(), // Secrets, ConfigMaps, Service
kubeInformersNamespaced.Core().V1(), // Secrets, ConfigMaps, Service
// deployments
kubeClient.AppsV1(),
kubeInformersNamespaced.Apps().V1().Deployments(), // Deployments
// routes
routesClient.RouteV1(),
routesInformersNamespaced.Route().V1().Routes(), // Route
// oauth
oauthClient.OauthV1(),
oauthInformers.Oauth().V1().OAuthClients(), // OAuth clients
// openshift managed
kubeInformersManagedNamespaced.Core().V1(), // Managed ConfigMaps
// event handling
versionGetter,
recorder,
resourceSyncer,
Expand Down