CCXDEV-12194: read configmap during configmap observer init (openshif…

…t#864) * read configmap during configmap observer init * fix logging
rluders · Nov 29, 2023 · 29f4f36 · 29f4f36
1 parent 0116d3e
commit 29f4f36
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/pkg/config/configobserver/configmapobserver.go b/pkg/config/configobserver/configmapobserver.go
@@ -40,7 +40,7 @@ type ConfigMapObserver struct {
 	listeners      map[chan struct{}]struct{}
 }
 
-func NewConfigMapObserver(kubeConfig *rest.Config,
+func NewConfigMapObserver(ctx context.Context, kubeConfig *rest.Config,
 	eventRecorder events.Recorder,
 	kubeInformer v1helpers.KubeInformersForNamespaces) (ConfigMapInformer, error) {
 	cmInformer := kubeInformer.InformersFor(insightsNamespaceName).Core().V1().ConfigMaps().Informer()
@@ -60,6 +60,17 @@ func NewConfigMapObserver(kubeConfig *rest.Config,
 		ToController("ConfigController", eventRecorder)
 
 	ctrl.Controller = factoryCtrl
+	cm, err := getConfigMap(ctx, kubeClient)
+	if err != nil {
+		klog.Warningf("Cannot get the configuration config map: %v. Default configuration is used.", err)
+		return ctrl, nil
+	}
+	insightsConfig, err := readConfigAndDecode(cm)
+	if err != nil {
+		klog.Warningf("Failed to read the configuration during start: %v. Default configuration is used.", err)
+		return ctrl, nil
+	}
+	ctrl.insightsConfig = insightsConfig
 	return ctrl, nil
 }
 

diff --git a/pkg/controller/operator.go b/pkg/controller/operator.go
@@ -152,7 +152,7 @@ func (s *Operator) Run(ctx context.Context, controller *controllercmd.Controller
 	}
 
 	kubeInf := v1helpers.NewKubeInformersForNamespaces(kubeClient, "openshift-insights")
-	configMapObserver, err := configobserver.NewConfigMapObserver(gatherKubeConfig, controller.EventRecorder, kubeInf)
+	configMapObserver, err := configobserver.NewConfigMapObserver(ctx, gatherKubeConfig, controller.EventRecorder, kubeInf)
 	if err != nil {
 		return err
 	}