refactor: extract config informer factory prep

OTA-1531 will need the config.openshift.io group lister early in the CVO
execution and outside of the `Context` structure, so this commit moves
the necessary preparation code outside of `NewControllerContext` and
passes these factories into it as parameters. Constructing factories at
separate places is a little awkward but for now I try keeping the change
small instead of trying to invent some centralized informer factory
management. I think it is reasonable to treat config.openshift.io
informers separately if they are actually used separately.

Author: petr-muller

pkg/start/start.go

@@ -214,8 +214,10 @@ func (o *Options) Run(ctx context.Context) error {
 		klog.Infof("Determined OCP version for this CVO: %q", cvoOcpVersion)
 	}
 
+	clusterVersionConfigInformerFactory, configInformerFactory := o.prepareConfigInformerFactories(cb)
+
 	// initialize the controllers and attempt to load the payload information
-	controllerCtx, err := o.NewControllerContext(cb)
+	controllerCtx, err := o.NewControllerContext(cb, clusterVersionConfigInformerFactory, configInformerFactory)
 	if err != nil {
 		return err
 	}
@@ -224,6 +226,16 @@ func (o *Options) Run(ctx context.Context) error {
 	return nil
 }
 
+func (o *Options) prepareConfigInformerFactories(cb *ClientBuilder) (configinformers.SharedInformerFactory, configinformers.SharedInformerFactory) {
+	client := cb.ClientOrDie("shared-informer")
+	clusterVersionConfigInformerFactory := configinformers.NewFilteredSharedInformerFactory(client, resyncPeriod(o.ResyncInterval), "", func(opts *metav1.ListOptions) {
+		opts.FieldSelector = fmt.Sprintf("metadata.name=%s", o.Name)
+	})
+	configInformerFactory := configinformers.NewSharedInformerFactory(client, resyncPeriod(o.ResyncInterval))
+
+	return clusterVersionConfigInformerFactory, configInformerFactory
+}
+
 // run launches a number of goroutines to handle manifest application,
 // metrics serving, etc.  It continues operating until ctx.Done(),
 // and then attempts a clean shutdown limited by an internal context
@@ -510,22 +522,17 @@ type Context struct {
 
 // NewControllerContext initializes the default Context for the current Options. It does
 // not start any background processes.
-func (o *Options) NewControllerContext(cb *ClientBuilder) (*Context, error) {
-	client := cb.ClientOrDie("shared-informer")
+func (o *Options) NewControllerContext(cb *ClientBuilder, clusterVersionConfigInformerFactory, configInformerFactory configinformers.SharedInformerFactory) (*Context, error) {
 	kubeClient := cb.KubeClientOrDie(internal.ConfigNamespace, useProtobuf)
 	openshiftConfigInformerFactory := coreinformers.NewSharedInformerFactoryWithOptions(kubeClient, resyncPeriod(o.ResyncInterval), coreinformers.WithNamespace(internal.ConfigNamespace))
 	openshiftConfigManagedInformerFactory := coreinformers.NewSharedInformerFactoryWithOptions(kubeClient, resyncPeriod(o.ResyncInterval), coreinformers.WithNamespace(internal.ConfigManagedNamespace))
 
-	clusterVersionConfigInformerFactory := configinformers.NewFilteredSharedInformerFactory(client, resyncPeriod(o.ResyncInterval), "", func(opts *metav1.ListOptions) {
-		opts.FieldSelector = fmt.Sprintf("metadata.name=%s", o.Name)
-	})
-	configInformerFactory := configinformers.NewSharedInformerFactory(client, resyncPeriod(o.ResyncInterval))
-
 	operatorClient := cb.OperatorClientOrDie("operator-client")
 	filterByName := func(opts *metav1.ListOptions) {
 		opts.FieldSelector = fields.OneTermEqualSelector("metadata.name", configuration.ClusterVersionOperatorConfigurationName).String()
 	}
 	operatorInformerFactory := operatorinformers.NewSharedInformerFactoryWithOptions(operatorClient, o.ResyncInterval, operatorinformers.WithTweakListOptions(filterByName))
+
 	coInformer := configInformerFactory.Config().V1().ClusterOperators()
 
 	cvoKubeClient := cb.KubeClientOrDie(o.Namespace, useProtobuf)

pkg/start/start_integration_test.go

@@ -188,7 +188,9 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
 	if err := options.ValidateAndComplete(); err != nil {
 		t.Fatalf("incorrectly initialized options: %v", err)
 	}
-	controllers, err := options.NewControllerContext(cb)
+
+	cvif, cif := options.prepareConfigInformerFactories(cb)
+	controllers, err := options.NewControllerContext(cb, cvif, cif)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -323,7 +325,9 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
 	if err := options.ValidateAndComplete(); err != nil {
 		t.Fatalf("incorrectly initialized options: %v", err)
 	}
-	controllers, err := options.NewControllerContext(cb)
+
+	cvif, cif := options.prepareConfigInformerFactories(cb)
+	controllers, err := options.NewControllerContext(cb, cvif, cif)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -520,7 +524,9 @@ metadata:
 	if err := options.ValidateAndComplete(); err != nil {
 		t.Fatalf("incorrectly initialized options: %v", err)
 	}
-	controllers, err := options.NewControllerContext(cb)
+
+	cvif, cif := options.prepareConfigInformerFactories(cb)
+	controllers, err := options.NewControllerContext(cb, cvif, cif)
 	if err != nil {
 		t.Fatal(err)
 	}