Update addEventHandler return values

Signed-off-by: jaellio <[email protected]>

Author: jaellio

pkg/k8s/informers/informers.go

@@ -184,7 +184,9 @@ func (ic *InformerCollection) AddEventHandler(informerKey InformerKey, handler c
 		return
 	}
 
-	i.AddEventHandler(handler)
+	if _, err := i.AddEventHandler(handler); err != nil {
+		log.Error().Err(err).Msgf("Error adding event handler for informer %s", informerKey)
+	}
 }
 
 // GetByKey retrieves an item (based on the given index) from the store of the informer indexed by the given InformerKey

pkg/reconciler/client.go

@@ -29,7 +29,7 @@ func NewReconcilerClient(kubeClient kubernetes.Interface, apiServerClient client
 	}
 
 	// Initialize informers
-	informerInitHandlerMap := map[k8s.InformerKey]func(){
+	informerInitHandlerMap := map[k8s.InformerKey]func() error{
 		CrdInformerKey:               c.initCustomResourceDefinitionMonitor,
 		MutatingWebhookInformerKey:   c.initMutatingWebhookConfigurationMonitor,
 		ValidatingWebhookInformerKey: c.initValidatingWebhookConfigurationMonitor,
@@ -46,7 +46,10 @@ func NewReconcilerClient(kubeClient kubernetes.Interface, apiServerClient client
 	}
 
 	for _, informer := range selectInformers {
-		informerInitHandlerMap[informer]()
+		if err := informerInitHandlerMap[informer](); err != nil {
+			log.Error().Err(err).Msgf("Error initializing informer %s", informer)
+			return err
+		}
 	}
 
 	if err := c.run(stop); err != nil {
@@ -59,7 +62,7 @@ func NewReconcilerClient(kubeClient kubernetes.Interface, apiServerClient client
 }
 
 // Initializes CustomResourceDefinition monitoring
-func (c *client) initCustomResourceDefinitionMonitor() {
+func (c *client) initCustomResourceDefinitionMonitor() error {
 	// Use the OSM version as the selector for reconciliation
 	osmCrdsLabel := map[string]string{constants.OSMAppNameLabelKey: constants.OSMAppNameLabelValue, constants.ReconcileLabel: c.osmVersion}
 
@@ -74,11 +77,15 @@ func (c *client) initCustomResourceDefinitionMonitor() {
 	c.informers[CrdInformerKey] = informerFactory
 
 	// Add event handler to informer
-	c.informers[CrdInformerKey].AddEventHandler(c.crdEventHandler())
+	if _, err := c.informers[CrdInformerKey].AddEventHandler(c.crdEventHandler()); err != nil {
+		log.Error().Err(err).Msgf("Error adding event handler to informer %s", CrdInformerKey)
+		return err
+	}
+	return nil
 }
 
 // Initializes mutating webhook monitoring
-func (c *client) initMutatingWebhookConfigurationMonitor() {
+func (c *client) initMutatingWebhookConfigurationMonitor() error {
 	osmMwhcLabel := map[string]string{constants.OSMAppNameLabelKey: constants.OSMAppNameLabelValue, constants.OSMAppInstanceLabelKey: c.meshName, constants.ReconcileLabel: strconv.FormatBool(true)}
 	labelSelector := fields.SelectorFromSet(osmMwhcLabel).String()
 	option := informers.WithTweakListOptions(func(opt *metav1.ListOptions) {
@@ -91,11 +98,15 @@ func (c *client) initMutatingWebhookConfigurationMonitor() {
 	c.informers[MutatingWebhookInformerKey] = informerFactory.Admissionregistration().V1().MutatingWebhookConfigurations().Informer()
 
 	// Add event handler to informer
-	c.informers[MutatingWebhookInformerKey].AddEventHandler(c.mutatingWebhookEventHandler())
+	if _, err := c.informers[MutatingWebhookInformerKey].AddEventHandler(c.mutatingWebhookEventHandler()); err != nil {
+		log.Error().Err(err).Msgf("Error adding event handler to informer %s", MutatingWebhookInformerKey)
+		return err
+	}
+	return nil
 }
 
 // Initializes validating webhook monitoring
-func (c *client) initValidatingWebhookConfigurationMonitor() {
+func (c *client) initValidatingWebhookConfigurationMonitor() error {
 	osmVwhcLabel := map[string]string{constants.OSMAppNameLabelKey: constants.OSMAppNameLabelValue, constants.OSMAppInstanceLabelKey: c.meshName, constants.ReconcileLabel: strconv.FormatBool(true)}
 	labelSelector := fields.SelectorFromSet(osmVwhcLabel).String()
 	option := informers.WithTweakListOptions(func(opt *metav1.ListOptions) {
@@ -108,7 +119,10 @@ func (c *client) initValidatingWebhookConfigurationMonitor() {
 	c.informers[ValidatingWebhookInformerKey] = informerFactory.Admissionregistration().V1().ValidatingWebhookConfigurations().Informer()
 
 	// Add event handler to informer
-	c.informers[ValidatingWebhookInformerKey].AddEventHandler(c.validatingWebhookEventHandler())
+	if _, err := c.informers[ValidatingWebhookInformerKey].AddEventHandler(c.validatingWebhookEventHandler()); err != nil {
+		log.Error().Err(err).Msgf("Error adding event handler to informer %s", ValidatingWebhookInformerKey)
+	}
+	return nil
 }
 
 func (c *client) run(stop <-chan struct{}) error {