simplify sigstore featurgate logs

Signed-off-by: Qi Wang <qiwan@redhat.com>

pkg/controller/container-runtime-config/container_runtime_config_controller.go

@@ -3,6 +3,7 @@ package containerruntimeconfig
 import (
 	"context"
 	"fmt"
+	"os"
 	"reflect"
 	"strconv"
 	"strings"
@@ -217,15 +218,6 @@ func New(
 
 	ctrl.configInformerFactory = configInformerFactory
 
-	enabled, err := ctrl.sigstoreAPIEnabled()
-	if enabled {
-		if err := ctrl.addImagePolicyObservers(); err != nil {
-			klog.Infof("skipping error adding image policy observers: %v", err)
-		}
-	} else {
-		klog.Infof("skipping adding image policy observers with SigstoreImageVerification Featuregate value: %v, error: %v", enabled, err)
-	}
-
 	return ctrl
 }
 
@@ -238,17 +230,20 @@ func (ctrl *Controller) Run(workers int, stopCh <-chan struct{}) {
 		ctrl.imgListerSynced, ctrl.icspListerSynced, ctrl.idmsListerSynced, ctrl.itmsListerSynced, ctrl.clusterVersionListerSynced}
 
 	enabled, err := ctrl.sigstoreAPIEnabled()
+	if err != nil {
+		klog.Errorf("error getting sigstore image verification featuregate value: %v", err)
+		os.Exit(1)
+	}
 	if enabled {
-		err = ctrl.addImagePolicyObservers()
-		if err != nil {
-			klog.Infof("skipping error adding image policy observers: %v", err)
-		} else {
-			klog.Info("addded image policy observers")
+		if !ctrl.addedPolicyObservers {
+			ctrl.addImagePolicyObservers()
+			klog.Info("addded image policy observers with sigstore featuregate enabled")
 			ctrl.configInformerFactory.Start(stopCh)
+			ctrl.addedPolicyObservers = true
+		}
+		if ctrl.addedPolicyObservers {
 			listerCaches = append(listerCaches, ctrl.clusterImagePolicyListerSynced)
 		}
-	} else {
-		klog.Infof("skipping adding image policy observers with SigstoreImageVerification Featuregate value: %v, error: %v", enabled, err)
 	}
 
 	if !cache.WaitForCacheSync(stopCh, listerCaches...) {
@@ -326,22 +321,15 @@ func (ctrl *Controller) itmsConfDeleted(_ interface{}) {
 	ctrl.imgQueue.Add("openshift-config")
 }
 
-func (ctrl *Controller) addImagePolicyObservers() error {
-	if ctrl.addedPolicyObservers {
-		return fmt.Errorf("already added policy observers")
-	}
+func (ctrl *Controller) addImagePolicyObservers() {
 	ctrl.clusterImagePolicyInformer = ctrl.configInformerFactory.Config().V1alpha1().ClusterImagePolicies()
-	if _, err := ctrl.clusterImagePolicyInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+	ctrl.clusterImagePolicyInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc:    ctrl.clusterImagePolicyAdded,
 		UpdateFunc: ctrl.clusterImagePolicyUpdated,
 		DeleteFunc: ctrl.clusterImagePolicyDeleted,
-	}); err != nil {
-		return fmt.Errorf("error adding clusterImagePolicyInformer event handler: %v", err)
-	}
+	})
 	ctrl.clusterImagePolicyLister = ctrl.clusterImagePolicyInformer.Lister()
 	ctrl.clusterImagePolicyListerSynced = ctrl.clusterImagePolicyInformer.Informer().HasSynced
-	ctrl.addedPolicyObservers = true
-	return nil
 }
 
 func (ctrl *Controller) clusterImagePolicyAdded(_ interface{}) {
@@ -877,7 +865,9 @@ func (ctrl *Controller) syncImageConfig(key string) error {
 	)
 	enabled, err := ctrl.sigstoreAPIEnabled()
 	if err != nil {
-		klog.Infof("error getting SigstoreImageVerification Featuregate value: %v", err)
+		// This err should not happen in practice as the featuregate should be checked in the controller Run() method
+		klog.Errorf("error getting SigstoreImageVerification Featuregate value: %v", err)
+		return err
 	}
 	if enabled && ctrl.addedPolicyObservers {
 		// Find all ClusterImagePolicy objects