fix: remove priority class gc code to reduce feature scope to match epic

Author: exdx

pkg/controller/operators/olm/operator.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	schedulingv1 "k8s.io/api/scheduling/v1"
 	"strings"
 	"time"
 
@@ -396,21 +395,6 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
 		return nil, err
 	}
 
-	priorityClassInformer := k8sInformerFactory.Scheduling().V1().PriorityClasses()
-	op.lister.SchedulingV1().RegisterPriorityClassLister(priorityClassInformer.Lister())
-	priorityClassQueueInformer, err := queueinformer.NewQueueInformer(
-		ctx,
-		queueinformer.WithLogger(op.logger),
-		queueinformer.WithInformer(priorityClassInformer.Informer()),
-		queueinformer.WithSyncer(k8sSyncer),
-	)
-	if err != nil {
-		return nil, err
-	}
-	if err := op.RegisterQueueInformer(priorityClassQueueInformer); err != nil {
-		return nil, err
-	}
-
 	// register namespace queueinformer
 	namespaceInformer := k8sInformerFactory.Core().V1().Namespaces()
 	op.lister.CoreV1().RegisterNamespaceLister(namespaceInformer.Lister())
@@ -718,7 +702,7 @@ func (a *Operator) syncObject(obj interface{}) (syncError error) {
 			a.requeueOwnerCSVs(metaObj)
 		} else {
 			switch metaObj.(type) {
-			case *rbacv1.ClusterRole, *rbacv1.ClusterRoleBinding, *admissionregistrationv1.MutatingWebhookConfiguration, *admissionregistrationv1.ValidatingWebhookConfiguration, *schedulingv1.PriorityClass:
+			case *rbacv1.ClusterRole, *rbacv1.ClusterRoleBinding, *admissionregistrationv1.MutatingWebhookConfiguration, *admissionregistrationv1.ValidatingWebhookConfiguration:
 				resourceEvent := kubestate.NewResourceEvent(
 					kubestate.ResourceUpdated,
 					metaObj,
@@ -1006,17 +990,6 @@ func (a *Operator) handleClusterServiceVersionDeletion(obj interface{}) {
 			logger.WithError(err).Warnf("failed to requeue gc event: %v", webhook)
 		}
 	}
-
-	priorityClasses, err := a.opClient.KubernetesInterface().SchedulingV1().PriorityClasses().List(context.TODO(), metav1.ListOptions{LabelSelector: webhookSelector})
-	if err != nil {
-		logger.WithError(err).Warn("cannot list priority classes")
-	}
-	for _, priorityClass := range priorityClasses.Items {
-		pc := priorityClass
-		if err := a.objGCQueueSet.RequeueEvent("", kubestate.NewResourceEvent(kubestate.ResourceUpdated, &pc)); err != nil {
-			logger.WithError(err).Warnf("failed to requeue gc event: %v", priorityClass)
-		}
-	}
 }
 
 func (a *Operator) removeDanglingChildCSVs(csv *v1alpha1.ClusterServiceVersion) error {

pkg/lib/operatorlister/lister.go

@@ -5,7 +5,6 @@ import (
 	appsv1 "k8s.io/client-go/listers/apps/v1"
 	corev1 "k8s.io/client-go/listers/core/v1"
 	rbacv1 "k8s.io/client-go/listers/rbac/v1"
-	scheduling "k8s.io/client-go/listers/scheduling/v1"
 	aregv1 "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1"
 
 	v1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1"
@@ -20,7 +19,6 @@ type OperatorLister interface {
 	RbacV1() RbacV1Lister
 	APIRegistrationV1() APIRegistrationV1Lister
 	APIExtensionsV1() APIExtensionsV1Lister
-	SchedulingV1() SchedulingV1Lister
 
 	OperatorsV1alpha1() OperatorsV1alpha1Lister
 	OperatorsV1() OperatorsV1Lister
@@ -76,12 +74,6 @@ type APIExtensionsV1Lister interface {
 	CustomResourceDefinitionLister() aextv1.CustomResourceDefinitionLister
 }
 
-//go:generate counterfeiter . SchedulingV1Lister
-type SchedulingV1Lister interface {
-	RegisterPriorityClassLister(lister scheduling.PriorityClassLister)
-	PriorityClassLister() scheduling.PriorityClassLister
-}
-
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OperatorsV1alpha1Lister
 type OperatorsV1alpha1Lister interface {
 	RegisterClusterServiceVersionLister(namespace string, lister v1alpha1.ClusterServiceVersionLister)
@@ -168,16 +160,6 @@ func newAPIExtensionsV1Lister() *apiExtensionsV1Lister {
 	}
 }
 
-type schedulingV1Lister struct {
-	priorityClassLister *UnionPriorityClassLister
-}
-
-func newSchedulingV1Lister() *schedulingV1Lister {
-	return &schedulingV1Lister{
-		priorityClassLister: &UnionPriorityClassLister{},
-	}
-}
-
 type operatorsV1alpha1Lister struct {
 	clusterServiceVersionLister *UnionClusterServiceVersionLister
 	catalogSourceLister         *UnionCatalogSourceLister
@@ -213,7 +195,6 @@ type lister struct {
 	rbacV1Lister            *rbacV1Lister
 	apiRegistrationV1Lister *apiRegistrationV1Lister
 	apiExtensionsV1Lister   *apiExtensionsV1Lister
-	schedulingV1Lister      *schedulingV1Lister
 	operatorsV1alpha1Lister *operatorsV1alpha1Lister
 	operatorsV1Lister       *operatorsV1Lister
 }
@@ -238,10 +219,6 @@ func (l *lister) APIExtensionsV1() APIExtensionsV1Lister {
 	return l.apiExtensionsV1Lister
 }
 
-func (l *lister) SchedulingV1() SchedulingV1Lister {
-	return l.schedulingV1Lister
-}
-
 func (l *lister) OperatorsV1alpha1() OperatorsV1alpha1Lister {
 	return l.operatorsV1alpha1Lister
 }
@@ -258,7 +235,6 @@ func NewLister() OperatorLister {
 		rbacV1Lister:            newRbacV1Lister(),
 		apiRegistrationV1Lister: newAPIRegistrationV1Lister(),
 		apiExtensionsV1Lister:   newAPIExtensionsV1Lister(),
-		schedulingV1Lister:      newSchedulingV1Lister(),
 		operatorsV1alpha1Lister: newOperatorsV1alpha1Lister(),
 		operatorsV1Lister:       newOperatorsV1Lister(),
 	}