boootstrap_unit test

openshift · Feb 15, 2024 · c2c80dc · c2c80dc
1 parent a905d3f
commit c2c80dc
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/pkg/controller/container-runtime-config/container_runtime_config_controller.go b/pkg/controller/container-runtime-config/container_runtime_config_controller.go
@@ -214,13 +214,7 @@ func New(
 
 	ctrl.configInformerFactory = configInformerFactory
 	if ctrl.sigstoreAPIEnabled() {
-		configInformerFactory.Config().V1alpha1().ClusterImagePolicies().Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
-			AddFunc:    ctrl.clusterImagePolicyAdded,
-			UpdateFunc: ctrl.clusterImagePolicyUpdated,
-			DeleteFunc: ctrl.clusterImagePolicyDeleted,
-		})
-		ctrl.clusterImagePolicyLister = ctrl.configInformerFactory.Config().V1alpha1().ClusterImagePolicies().Lister()
-		ctrl.clusterImagePolicyListerSynced = ctrl.configInformerFactory.Config().V1alpha1().ClusterImagePolicies().Informer().HasSynced
+		ctrl.enableSigstoreAPIHandler()
 	}
 
 	return ctrl
@@ -234,8 +228,7 @@ func (ctrl *Controller) Run(workers int, stopCh <-chan struct{}) {
 	listerCaches := []cache.InformerSynced{ctrl.mcpListerSynced, ctrl.mccrListerSynced, ctrl.ccListerSynced,
 		ctrl.imgListerSynced, ctrl.icspListerSynced, ctrl.idmsListerSynced, ctrl.itmsListerSynced, ctrl.clusterVersionListerSynced}
 	if ctrl.sigstoreAPIEnabled() {
-		ctrl.clusterImagePolicyLister = ctrl.configInformerFactory.Config().V1alpha1().ClusterImagePolicies().Lister()
-		ctrl.clusterImagePolicyListerSynced = ctrl.configInformerFactory.Config().V1alpha1().ClusterImagePolicies().Informer().HasSynced
+		ctrl.enableSigstoreAPIHandler()
 		listerCaches = append(listerCaches, ctrl.clusterImagePolicyListerSynced)
 	}
 	if !cache.WaitForCacheSync(stopCh, listerCaches...) {
@@ -344,6 +337,16 @@ func (ctrl *Controller) sigstoreAPIEnabled() bool {
 	return featureGates.Enabled(apicfgv1.FeatureGateSigstoreImageVerification)
 }
 
+func (ctrl *Controller) enableSigstoreAPIHandler() {
+	ctrl.configInformerFactory.Config().V1alpha1().ClusterImagePolicies().Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+		AddFunc:    ctrl.clusterImagePolicyAdded,
+		UpdateFunc: ctrl.clusterImagePolicyUpdated,
+		DeleteFunc: ctrl.clusterImagePolicyDeleted,
+	})
+	ctrl.clusterImagePolicyLister = ctrl.configInformerFactory.Config().V1alpha1().ClusterImagePolicies().Lister()
+	ctrl.clusterImagePolicyListerSynced = ctrl.configInformerFactory.Config().V1alpha1().ClusterImagePolicies().Informer().HasSynced
+}
+
 func (ctrl *Controller) deleteImagePolicyMachineConfig() {
 	pools, err := ctrl.mcpLister.List(labels.Everything())
 	if err != nil {
@@ -868,6 +871,7 @@ func (ctrl *Controller) syncImageConfig(key string) error {
 		clusterScopePolicies                          map[string]signature.PolicyRequirements
 	)
 	if ctrl.sigstoreAPIEnabled() {
+		ctrl.enableSigstoreAPIHandler()
 		// Find all ClusterImagePolicy objects
 		clusterImagePolicies, err = ctrl.clusterImagePolicyLister.List(labels.Everything())
 		if err != nil && errors.IsNotFound(err) {