Skip to content

Commit 01a99e7

Browse files
committed
Rename pruning to listerwatcher
Signed-off-by: Todd Short <[email protected]>
1 parent f5e4c64 commit 01a99e7

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

pkg/controller/operators/catalog/operator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import (
6464
olmerrors "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/errors"
6565
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
6666
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription"
67-
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/internal/pruning"
67+
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/internal/listerwatcher"
6868
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry"
6969
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/grpc"
7070
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler"
@@ -231,7 +231,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo
231231
// Fields are pruned from local copies of the objects managed
232232
// by this informer in order to reduce cached size.
233233
prunedCSVInformer := cache.NewSharedIndexInformerWithOptions(
234-
pruning.NewListerWatcher(
234+
listerwatcher.NewListerWatcher(
235235
op.client,
236236
metav1.NamespaceAll,
237237
func(options *metav1.ListOptions) {

pkg/controller/operators/internal/pruning/listerwatcher.go renamed to pkg/controller/operators/internal/listerwatcher/listerwatcher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package pruning
1+
package listerwatcher
22

33
import (
44
"context"

pkg/controller/operators/olm/operator.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646
operatorsv1alpha1listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
4747
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/certs"
4848
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
49-
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/internal/pruning"
49+
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/internal/listerwatcher"
5050
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/labeller"
5151
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/overrides"
5252
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/plugins"
@@ -307,8 +307,9 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
307307
// A separate informer solely for CSV copies. Fields
308308
// are pruned from local copies of the objects managed
309309
// by this informer in order to reduce cached size.
310+
310311
copiedCSVInformer := cache.NewSharedIndexInformerWithOptions(
311-
pruning.NewListerWatcher(
312+
listerwatcher.NewListerWatcher(
312313
op.client,
313314
namespace,
314315
func(opts *metav1.ListOptions) {

0 commit comments

Comments
 (0)