@@ -24,6 +24,8 @@ import (
2424 utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2525 "k8s.io/client-go/informers"
2626 k8sscheme "k8s.io/client-go/kubernetes/scheme"
27+ "k8s.io/client-go/metadata/metadatainformer"
28+ "k8s.io/client-go/metadata/metadatalister"
2729 "k8s.io/client-go/tools/cache"
2830 "k8s.io/client-go/tools/record"
2931 "k8s.io/client-go/util/workqueue"
@@ -35,12 +37,10 @@ import (
3537 "github.com/operator-framework/api/pkg/operators/v1alpha1"
3638 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
3739 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/informers/externalversions"
38- operatorsv1alpha1listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
3940 "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/certs"
4041 "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
41- "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/internal/pruning"
4242 "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/overrides"
43- resolver "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver"
43+ "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver"
4444 "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/clients"
4545 csvutility "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/csv"
4646 "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/event"
@@ -75,7 +75,7 @@ type Operator struct {
7575 client versioned.Interface
7676 lister operatorlister.OperatorLister
7777 protectedCopiedCSVNamespaces map [string ]struct {}
78- copiedCSVLister operatorsv1alpha1listers. ClusterServiceVersionLister
78+ copiedCSVLister metadatalister. Lister
7979 ogQueueSet * queueinformer.ResourceQueueSet
8080 csvQueueSet * queueinformer.ResourceQueueSet
8181 olmConfigQueue workqueue.RateLimitingInterface
@@ -211,51 +211,28 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
211211 // A separate informer solely for CSV copies. Fields
212212 // are pruned from local copies of the objects managed
213213 // by this informer in order to reduce cached size.
214- copiedCSVInformer := cache .NewSharedIndexInformer (
215- pruning .NewListerWatcher (
216- op .client ,
217- namespace ,
218- func (opts * metav1.ListOptions ) {
219- opts .LabelSelector = v1alpha1 .CopiedLabelKey
220- },
221- pruning .PrunerFunc (func (csv * v1alpha1.ClusterServiceVersion ) {
222- nonstatus , status := copyableCSVHash (csv )
223- * csv = v1alpha1.ClusterServiceVersion {
224- TypeMeta : csv .TypeMeta ,
225- ObjectMeta : csv .ObjectMeta ,
226- Status : v1alpha1.ClusterServiceVersionStatus {
227- Phase : csv .Status .Phase ,
228- Reason : csv .Status .Reason ,
229- },
230- }
231- if csv .Annotations == nil {
232- csv .Annotations = make (map [string ]string , 2 )
233- }
234- // These annotation keys are
235- // intentionally invalid -- all writes
236- // to copied CSVs are regenerated from
237- // the corresponding non-copied CSV,
238- // so it should never be transmitted
239- // back to the API server.
240- csv .Annotations ["$copyhash-nonstatus" ] = nonstatus
241- csv .Annotations ["$copyhash-status" ] = status
242- }),
243- ),
244- & v1alpha1.ClusterServiceVersion {},
214+ gvr := v1alpha1 .SchemeGroupVersion .WithResource ("clusterserviceversions" )
215+ copiedCSVInformer := metadatainformer .NewFilteredMetadataInformer (
216+ config .metadataClient ,
217+ gvr ,
218+ namespace ,
245219 config .resyncPeriod (),
246220 cache.Indexers {cache .NamespaceIndex : cache .MetaNamespaceIndexFunc },
221+ func (options * metav1.ListOptions ) {
222+ options .LabelSelector = v1alpha1 .CopiedLabelKey
223+ },
247224 )
248- op .copiedCSVLister = operatorsv1alpha1listers . NewClusterServiceVersionLister (copiedCSVInformer .GetIndexer ())
225+ op .copiedCSVLister = metadatalister . New (copiedCSVInformer .Informer (). GetIndexer (), gvr )
249226
250227 // Register separate queue for gcing copied csvs
251228 copiedCSVGCQueue := workqueue .NewNamedRateLimitingQueue (workqueue .DefaultControllerRateLimiter (), fmt .Sprintf ("%s/csv-gc" , namespace ))
252229 op .copiedCSVGCQueueSet .Set (namespace , copiedCSVGCQueue )
253230 copiedCSVGCQueueInformer , err := queueinformer .NewQueueInformer (
254231 ctx ,
255- queueinformer .WithInformer (copiedCSVInformer ),
232+ queueinformer .WithInformer (copiedCSVInformer . Informer () ),
256233 queueinformer .WithLogger (op .logger ),
257234 queueinformer .WithQueue (copiedCSVGCQueue ),
258- queueinformer .WithIndexer (copiedCSVInformer .GetIndexer ()),
235+ queueinformer .WithIndexer (copiedCSVInformer .Informer (). GetIndexer ()),
259236 queueinformer .WithSyncer (queueinformer .LegacySyncHandler (op .syncGcCsv ).ToSyncer ()),
260237 )
261238 if err != nil {
@@ -1195,17 +1172,16 @@ func (a *Operator) handleClusterServiceVersionDeletion(obj interface{}) {
11951172 }
11961173}
11971174
1198- func (a * Operator ) removeDanglingChildCSVs (csv * v1alpha1. ClusterServiceVersion ) error {
1175+ func (a * Operator ) removeDanglingChildCSVs (csv * metav1. PartialObjectMetadata ) error {
11991176 logger := a .logger .WithFields (logrus.Fields {
12001177 "id" : queueinformer .NewLoopID (),
12011178 "csv" : csv .GetName (),
12021179 "namespace" : csv .GetNamespace (),
1203- "phase" : csv .Status .Phase ,
12041180 "labels" : csv .GetLabels (),
12051181 "annotations" : csv .GetAnnotations (),
12061182 })
12071183
1208- if ! csv . IsCopied () {
1184+ if ! IsCopied (csv ) {
12091185 logger .Warning ("removeDanglingChild called on a parent. this is a no-op but should be avoided." )
12101186 return nil
12111187 }
@@ -1244,7 +1220,7 @@ func (a *Operator) removeDanglingChildCSVs(csv *v1alpha1.ClusterServiceVersion)
12441220 return nil
12451221}
12461222
1247- func (a * Operator ) deleteChild (csv * v1alpha1. ClusterServiceVersion , logger * logrus.Entry ) error {
1223+ func (a * Operator ) deleteChild (csv * metav1. PartialObjectMetadata , logger * logrus.Entry ) error {
12481224 logger .Debug ("gcing csv" )
12491225 return a .client .OperatorsV1alpha1 ().ClusterServiceVersions (csv .GetNamespace ()).Delete (context .TODO (), csv .GetName (), metav1.DeleteOptions {})
12501226}
@@ -1683,18 +1659,23 @@ func (a *Operator) createCSVCopyingDisabledEvent(csv *v1alpha1.ClusterServiceVer
16831659}
16841660
16851661func (a * Operator ) syncGcCsv (obj interface {}) (syncError error ) {
1686- clusterServiceVersion , ok := obj .(* v1alpha1. ClusterServiceVersion )
1662+ clusterServiceVersion , ok := obj .(* metav1. PartialObjectMetadata )
16871663 if ! ok {
16881664 a .logger .Debugf ("wrong type: %#v" , obj )
16891665 return fmt .Errorf ("casting ClusterServiceVersion failed" )
16901666 }
1691- if clusterServiceVersion . IsCopied () {
1667+ if IsCopied (clusterServiceVersion ) {
16921668 syncError = a .removeDanglingChildCSVs (clusterServiceVersion )
16931669 return
16941670 }
16951671 return
16961672}
16971673
1674+ func IsCopied (o metav1.Object ) bool {
1675+ _ , ok := o .GetLabels ()[v1alpha1 .CopiedLabelKey ]
1676+ return ok
1677+ }
1678+
16981679// operatorGroupFromAnnotations returns the OperatorGroup for the CSV only if the CSV is active one in the group
16991680func (a * Operator ) operatorGroupFromAnnotations (logger * logrus.Entry , csv * v1alpha1.ClusterServiceVersion ) * operatorsv1.OperatorGroup {
17001681 annotations := csv .GetAnnotations ()
0 commit comments