feat: support new bundle object types

Author: exdx

pkg/controller/operators/catalog/operator.go

@@ -1906,16 +1906,23 @@ func (o *Operator) apiresourceFromGVK(gvk schema.GroupVersionKind) (metav1.APIRe
 }
 
 const (
-	PrometheusRuleKind = "PrometheusRule"
-	ServiceMonitorKind = "ServiceMonitor"
+	PrometheusRuleKind        = "PrometheusRule"
+	ServiceMonitorKind        = "ServiceMonitor"
+	PodDisruptionBudgetKind   = "PodDisruptionBudget"
+	PriorityClassKind         = "PriorityClass"
+	VerticalPodAutoscalerKind = "VerticalPodAutoscaler"
 )
 
+var supportedKinds = map[string]struct{}{
+	PrometheusRuleKind:        {},
+	ServiceMonitorKind:        {},
+	PodDisruptionBudgetKind:   {},
+	PriorityClassKind:         {},
+	VerticalPodAutoscalerKind: {},
+}
+
 // isSupported returns true if OLM supports this type of CustomResource.
 func isSupported(kind string) bool {
-	switch kind {
-	case PrometheusRuleKind, ServiceMonitorKind:
-		return true
-	default:
-		return false
-	}
+	_, ok := supportedKinds[kind]
+	return ok
 }

pkg/controller/operators/olm/operator.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	schedulingv1 "k8s.io/api/scheduling/v1"
 	"strings"
 	"time"
 
@@ -395,6 +396,21 @@ 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())
@@ -702,7 +718,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:
+			case *rbacv1.ClusterRole, *rbacv1.ClusterRoleBinding, *admissionregistrationv1.MutatingWebhookConfiguration, *admissionregistrationv1.ValidatingWebhookConfiguration, *schedulingv1.PriorityClass:
 				resourceEvent := kubestate.NewResourceEvent(
 					kubestate.ResourceUpdated,
 					metaObj,
@@ -990,6 +1006,17 @@ 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,6 +5,7 @@ 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"
@@ -19,6 +20,7 @@ type OperatorLister interface {
 	RbacV1() RbacV1Lister
 	APIRegistrationV1() APIRegistrationV1Lister
 	APIExtensionsV1() APIExtensionsV1Lister
+	SchedulingV1() SchedulingV1Lister
 
 	OperatorsV1alpha1() OperatorsV1alpha1Lister
 	OperatorsV1() OperatorsV1Lister
@@ -74,6 +76,12 @@ 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)
@@ -160,6 +168,16 @@ func newAPIExtensionsV1Lister() *apiExtensionsV1Lister {
 	}
 }
 
+type schedulingV1Lister struct {
+	priorityClassLister *UnionPriorityClassLister
+}
+
+func newSchedulingV1Lister() *schedulingV1Lister {
+	return &schedulingV1Lister{
+		priorityClassLister: &UnionPriorityClassLister{},
+	}
+}
+
 type operatorsV1alpha1Lister struct {
 	clusterServiceVersionLister *UnionClusterServiceVersionLister
 	catalogSourceLister         *UnionCatalogSourceLister
@@ -190,13 +208,14 @@ func newOperatorsV1Lister() *operatorsV1Lister {
 var _ OperatorLister = &lister{}
 
 type lister struct {
-	appsV1Lister               *appsV1Lister
-	coreV1Lister               *coreV1Lister
-	rbacV1Lister               *rbacV1Lister
-	apiRegistrationV1Lister    *apiRegistrationV1Lister
-	apiExtensionsV1Lister      *apiExtensionsV1Lister
-	operatorsV1alpha1Lister    *operatorsV1alpha1Lister
-	operatorsV1Lister          *operatorsV1Lister
+	appsV1Lister            *appsV1Lister
+	coreV1Lister            *coreV1Lister
+	rbacV1Lister            *rbacV1Lister
+	apiRegistrationV1Lister *apiRegistrationV1Lister
+	apiExtensionsV1Lister   *apiExtensionsV1Lister
+	schedulingV1Lister      *schedulingV1Lister
+	operatorsV1alpha1Lister *operatorsV1alpha1Lister
+	operatorsV1Lister       *operatorsV1Lister
 }
 
 func (l *lister) AppsV1() AppsV1Lister {
@@ -219,6 +238,10 @@ func (l *lister) APIExtensionsV1() APIExtensionsV1Lister {
 	return l.apiExtensionsV1Lister
 }
 
+func (l *lister) SchedulingV1() SchedulingV1Lister {
+	return l.schedulingV1Lister
+}
+
 func (l *lister) OperatorsV1alpha1() OperatorsV1alpha1Lister {
 	return l.operatorsV1alpha1Lister
 }
@@ -230,12 +253,13 @@ func (l *lister) OperatorsV1() OperatorsV1Lister {
 func NewLister() OperatorLister {
 	// TODO: better initialization
 	return &lister{
-		appsV1Lister:               newAppsV1Lister(),
-		coreV1Lister:               newCoreV1Lister(),
-		rbacV1Lister:               newRbacV1Lister(),
-		apiRegistrationV1Lister:    newAPIRegistrationV1Lister(),
-		apiExtensionsV1Lister:      newAPIExtensionsV1Lister(),
-		operatorsV1alpha1Lister:    newOperatorsV1alpha1Lister(),
-		operatorsV1Lister:          newOperatorsV1Lister(),
+		appsV1Lister:            newAppsV1Lister(),
+		coreV1Lister:            newCoreV1Lister(),
+		rbacV1Lister:            newRbacV1Lister(),
+		apiRegistrationV1Lister: newAPIRegistrationV1Lister(),
+		apiExtensionsV1Lister:   newAPIExtensionsV1Lister(),
+		schedulingV1Lister:      newSchedulingV1Lister(),
+		operatorsV1alpha1Lister: newOperatorsV1alpha1Lister(),
+		operatorsV1Lister:       newOperatorsV1Lister(),
 	}
 }