featuregate flip panic testing

Signed-off-by: Qi Wang <qiwan@redhat.com>
openshift · Feb 21, 2024 · 2092c9e · 2092c9e
1 parent fec7b41
commit 2092c9e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 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
@@ -213,7 +213,11 @@ func New(
 	ctrl.featureGateAccess = featureGateAccess
 
 	ctrl.configInformerFactory = configInformerFactory
-	if ctrl.sigstoreAPIEnabled() {
+
+	enabled, err := ctrl.sigstoreAPIEnabled()
+	klog.Infof("imageverification sigstore FeatureGates: %v, error: %v", enabled, err)
+
+	if enabled {
 		ctrl.enableClusterImagePolicyHandler()
 	}
 
@@ -227,7 +231,10 @@ func (ctrl *Controller) Run(workers int, stopCh <-chan struct{}) {
 	defer ctrl.imgQueue.ShutDown()
 	listerCaches := []cache.InformerSynced{ctrl.mcpListerSynced, ctrl.mccrListerSynced, ctrl.ccListerSynced,
 		ctrl.imgListerSynced, ctrl.icspListerSynced, ctrl.idmsListerSynced, ctrl.itmsListerSynced, ctrl.clusterVersionListerSynced}
-	if ctrl.sigstoreAPIEnabled() {
+	enabled, err := ctrl.sigstoreAPIEnabled()
+	klog.Infof("imageverification sigstore FeatureGates: %v, error: %v", enabled, err)
+
+	if enabled {
 		ctrl.enableClusterImagePolicyHandler()
 		listerCaches = append(listerCaches, ctrl.clusterImagePolicyListerSynced)
 	}
@@ -307,34 +314,40 @@ func (ctrl *Controller) itmsConfDeleted(_ interface{}) {
 }
 
 func (ctrl *Controller) clusterImagePolicyAdded(_ interface{}) {
-	if !ctrl.sigstoreAPIEnabled() {
+	enabled, err := ctrl.sigstoreAPIEnabled()
+	klog.Infof("imageverification sigstore FeatureGates: %v, error: %v", enabled, err)
+	if !enabled {
 		return
 	}
-	ctrl.imgQueue.Add("openshift-config")
+	ctrl.imgQueue.Add("enable-sigstore-api")
 }
 
 func (ctrl *Controller) clusterImagePolicyUpdated(_, _ interface{}) {
-	if !ctrl.sigstoreAPIEnabled() {
+	enabled, err := ctrl.sigstoreAPIEnabled()
+	klog.Infof("imageverification sigstore FeatureGates: %v, error: %v", enabled, err)
+	if !enabled {
 		return
 	}
-	ctrl.imgQueue.Add("openshift-config")
+	ctrl.imgQueue.Add("enable-sigstore-api")
 }
 
 func (ctrl *Controller) clusterImagePolicyDeleted(_ interface{}) {
-	if !ctrl.sigstoreAPIEnabled() {
+	enabled, err := ctrl.sigstoreAPIEnabled()
+	klog.Infof("imageverification sigstore FeatureGates: %v, error: %v", enabled, err)
+	if !enabled {
 		return
 	}
-	ctrl.imgQueue.Add("openshift-config")
+	ctrl.imgQueue.Add("enable-sigstore-api")
 }
 
-func (ctrl *Controller) sigstoreAPIEnabled() bool {
+func (ctrl *Controller) sigstoreAPIEnabled() (bool, error) {
 	featureGates, err := ctrl.featureGateAccess.CurrentFeatureGates()
 	if err != nil {
 		utilruntime.HandleError(fmt.Errorf("error getting current featuregates: %v", err))
-		return false
+		return false, err
 	}
-	klog.Infof("imageverification sigstore FeatureGates: %v", featureGates.Enabled(apicfgv1.FeatureGateSigstoreImageVerification))
-	return featureGates.Enabled(apicfgv1.FeatureGateSigstoreImageVerification)
+	// klog.Infof("imageverification sigstore FeatureGates: %v", featureGates.Enabled(apicfgv1.FeatureGateSigstoreImageVerification))
+	return featureGates.Enabled(apicfgv1.FeatureGateSigstoreImageVerification), nil
 }
 
 func (ctrl *Controller) enableClusterImagePolicyHandler() {
@@ -857,8 +870,10 @@ func (ctrl *Controller) syncImageConfig(key string) error {
 		clusterImagePolicies                          []*apicfgv1alpha1.ClusterImagePolicy
 		clusterScopePolicies                          map[string]signature.PolicyRequirements
 	)
-	if ctrl.sigstoreAPIEnabled() {
-		ctrl.enableClusterImagePolicyHandler()
+	enabled, err := ctrl.sigstoreAPIEnabled()
+	klog.Infof("imageverification sigstore FeatureGates: %v, error: %v, key: %v", enabled, err, key)
+
+	if enabled {
 		// Find all ClusterImagePolicy objects
 		clusterImagePolicies, err = ctrl.clusterImagePolicyLister.List(labels.Everything())
 		if err != nil && errors.IsNotFound(err) {

diff --git a/test/e2e-bootstrap/bootstrap_test.go b/test/e2e-bootstrap/bootstrap_test.go
@@ -40,6 +40,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 )
 
 const (
@@ -442,6 +443,10 @@ func newTestFixture(t *testing.T, cfg *rest.Config, objs []runtime.Object) *fixt
 
 	close(ctrlctx.InformersStarted)
 
+	klog.Infof("Starting controllers")
+	features, err := ctrlctx.FeatureGateAccess.CurrentFeatureGates()
+	klog.Infof("initial features: %v, error %v", features, err)
+
 	for _, c := range controllers {
 		go c.Run(2, ctrlctx.Stop)
 	}