start only when feature is enabled

openshift · Jun 9, 2023 · 86109d3 · 86109d3
1 parent d29ea61
commit 86109d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/pkg/config/configobserver/insighgtsdatagather_observer.go b/pkg/config/configobserver/insighgtsdatagather_observer.go
@@ -28,13 +28,11 @@ type insightsDataGatherController struct {
 	listeners         map[chan *v1alpha1.GatherConfig]struct{}
 	configV1Alpha1Cli *configCliv1alpha1.ConfigV1alpha1Client
 	gatherConfig      *v1alpha1.GatherConfig
-	featureEnabled    bool
 }
 
 func NewInsightsDataGatherObserver(kubeConfig *rest.Config,
 	eventRecorder events.Recorder,
-	configInformer configinformers.SharedInformerFactory,
-	featureEnabled bool) (InsightsDataGatherObserver, error) {
+	configInformer configinformers.SharedInformerFactory) (InsightsDataGatherObserver, error) {
 	inf := configInformer.Config().V1alpha1().InsightsDataGathers().Informer()
 	configV1Alpha1Cli, err := configCliv1alpha1.NewForConfig(kubeConfig)
 	if err != nil {
@@ -43,7 +41,6 @@ func NewInsightsDataGatherObserver(kubeConfig *rest.Config,
 	c := &insightsDataGatherController{
 		configV1Alpha1Cli: configV1Alpha1Cli,
 		listeners:         make(map[chan *v1alpha1.GatherConfig]struct{}),
-		featureEnabled:    featureEnabled,
 	}
 
 	insightDataGatherConf, err := c.configV1Alpha1Cli.InsightsDataGathers().Get(context.Background(), "cluster", metav1.GetOptions{})
@@ -60,12 +57,6 @@ func NewInsightsDataGatherObserver(kubeConfig *rest.Config,
 }
 
 func (i *insightsDataGatherController) sync(ctx context.Context, scx factory.SyncContext) error {
-	if !i.featureEnabled {
-		klog.Infof("Shutting down the queue and the event recorder for %s", i.Name())
-		scx.Queue().ShutDown()
-		scx.Recorder().Shutdown()
-		return nil
-	}
 	insightDataGatherConf, err := i.configV1Alpha1Cli.InsightsDataGathers().Get(ctx, "cluster", metav1.GetOptions{})
 	if err != nil {
 		return err

diff --git a/pkg/controller/operator.go b/pkg/controller/operator.go
@@ -120,14 +120,17 @@ func (s *Operator) Run(ctx context.Context, controller *controllercmd.Controller
 			return fmt.Errorf("can't create --path: %v", err)
 		}
 	}
-	apiConfigObserver, err := configobserver.NewInsightsDataGatherObserver(gatherKubeConfig,
-		controller.EventRecorder, configInformers, insightsConfigAPIEnabled)
-	if err != nil {
-		return err
-	}
+	var apiConfigObserver configobserver.InsightsDataGatherObserver
+	if insightsConfigAPIEnabled {
+		apiConfigObserver, err = configobserver.NewInsightsDataGatherObserver(gatherKubeConfig,
+			controller.EventRecorder, configInformers)
+		if err != nil {
+			return err
+		}
 
-	go apiConfigObserver.Run(ctx, 1)
-	go configInformers.Start(ctx.Done())
+		go apiConfigObserver.Run(ctx, 1)
+		go configInformers.Start(ctx.Done())
+	}
 
 	// secretConfigObserver synthesizes all config into the status reporter controller
 	secretConfigObserver := configobserver.New(s.Controller, kubeClient)