From e3b1d628c734e9bb820e763235edb3aeb50846ed Mon Sep 17 00:00:00 2001 From: "Benjamin A. Petersen" Date: Tue, 8 Oct 2019 10:42:38 -0400 Subject: [PATCH] Reorganize args to NewConsoleOperator to fit client/informer sets together --- pkg/console/operator/operator.go | 27 +++++++++++++++------------ pkg/console/starter/starter.go | 28 +++++++++++++++++----------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/pkg/console/operator/operator.go b/pkg/console/operator/operator.go index ca295c337..3a3b1483a 100644 --- a/pkg/console/operator/operator.go +++ b/pkg/console/operator/operator.go @@ -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 { diff --git a/pkg/console/starter/starter.go b/pkg/console/starter/starter.go index 139dc6885..0534c901a 100644 --- a/pkg/console/starter/starter.go +++ b/pkg/console/starter/starter.go @@ -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,