test hassynced

Signed-off-by: Qi Wang <qiwan@redhat.com>
openshift · Feb 24, 2024 · 02086b8 · 02086b8
1 parent a8dbd61
commit 02086b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/cmd/machine-config-controller/start.go b/cmd/machine-config-controller/start.go
@@ -172,7 +172,7 @@ func createControllers(ctx *ctrlcommon.ControllerContext) []ctrlcommon.Controlle
 			ctx.ConfigInformerFactory.Config().V1().Images(),
 			ctx.ConfigInformerFactory.Config().V1().ImageDigestMirrorSets(),
 			ctx.ConfigInformerFactory.Config().V1().ImageTagMirrorSets(),
-			ctx.ConfigInformerFactory,
+			ctx.ConfigInformerFactory.Config().V1alpha1(),
 			ctx.OperatorInformerFactory.Operator().V1alpha1().ImageContentSourcePolicies(),
 			ctx.ConfigInformerFactory.Config().V1().ClusterVersions(),
 			ctx.ClientBuilder.KubeClientOrDie("container-runtime-config-controller"),

diff --git a/pkg/controller/container-runtime-config/container_runtime_config_controller.go b/pkg/controller/container-runtime-config/container_runtime_config_controller.go
@@ -15,7 +15,6 @@ import (
 	apicfgv1alpha1 "github.com/openshift/api/config/v1alpha1"
 	apioperatorsv1alpha1 "github.com/openshift/api/operator/v1alpha1"
 	configclientset "github.com/openshift/client-go/config/clientset/versioned"
-	configinformers "github.com/openshift/client-go/config/informers/externalversions"
 	cligoinformersv1 "github.com/openshift/client-go/config/informers/externalversions/config/v1"
 	cligoinformersv1alpha1 "github.com/openshift/client-go/config/informers/externalversions/config/v1alpha1"
 	cligolistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -107,7 +106,7 @@ type Controller struct {
 	itmsLister       cligolistersv1.ImageTagMirrorSetLister
 	itmsListerSynced cache.InformerSynced
 
-	configInformerFactory          configinformers.SharedInformerFactory
+	configInformerFactory          cligoinformersv1alpha1.Interface
 	clusterImagePolicyInformer     cligoinformersv1alpha1.ClusterImagePolicyInformer
 	clusterImagePolicyLister       cligolistersv1alpha1.ClusterImagePolicyLister
 	clusterImagePolicyListerSynced cache.InformerSynced
@@ -133,7 +132,7 @@ func New(
 	imgInformer cligoinformersv1.ImageInformer,
 	idmsInformer cligoinformersv1.ImageDigestMirrorSetInformer,
 	itmsInformer cligoinformersv1.ImageTagMirrorSetInformer,
-	configInformerFactory configinformers.SharedInformerFactory,
+	configInformerFactory cligoinformersv1alpha1.Interface,
 	icspInformer operatorinformersv1alpha1.ImageContentSourcePolicyInformer,
 	clusterVersionInformer cligoinformersv1.ClusterVersionInformer,
 	kubeClient clientset.Interface,
@@ -318,11 +317,11 @@ func (ctrl *Controller) itmsConfDeleted(_ interface{}) {
 }
 
 func (ctrl *Controller) clusterImagePolicyAdded(_ interface{}) {
-	enabled, err := ctrl.sigstoreAPIEnabled()
-	klog.Infof("imageverification sigstore FeatureGates: %v, error: %v", enabled, err)
-	if !enabled {
-		return
-	}
+	// enabled, err := ctrl.sigstoreAPIEnabled()
+	// klog.Infof("imageverification sigstore FeatureGates: %v, error: %v", enabled, err)
+	// if !enabled {
+	// 	return
+	// }
 	ctrl.imgQueue.Add("openshift-config")
 }
 
@@ -355,7 +354,7 @@ func (ctrl *Controller) sigstoreAPIEnabled() (bool, error) {
 }
 
 func (ctrl *Controller) enableClusterImagePolicyHandler() {
-	ctrl.clusterImagePolicyInformer = ctrl.configInformerFactory.Config().V1alpha1().ClusterImagePolicies()
+	ctrl.clusterImagePolicyInformer = ctrl.configInformerFactory.ClusterImagePolicies()
 	ctrl.clusterImagePolicyInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc:    ctrl.clusterImagePolicyAdded,
 		UpdateFunc: ctrl.clusterImagePolicyUpdated,

diff --git a/pkg/controller/container-runtime-config/container_runtime_config_controller_test.go b/pkg/controller/container-runtime-config/container_runtime_config_controller_test.go
@@ -249,7 +249,7 @@ func (f *fixture) newController() *Controller {
 		ci.Config().V1().Images(),
 		ci.Config().V1().ImageDigestMirrorSets(),
 		ci.Config().V1().ImageTagMirrorSets(),
-		ci,
+		ci.Config().V1alpha1(),
 		oi.Operator().V1alpha1().ImageContentSourcePolicies(),
 		ci.Config().V1().ClusterVersions(),
 		k8sfake.NewSimpleClientset(), f.client, f.imgClient,