From 2cc6e6d79db828f14d5d932100aa721550f73eae Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Thu, 15 Feb 2024 16:17:22 -0500 Subject: [PATCH] boootstrap_unit test --- .../container_runtime_config_controller.go | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 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 index 4e4fa9f433..fe7f47f050 100644 --- 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) {