Skip to content

Commit bb2540d

Browse files
committed
don't watch unlabelled secrets in the operator controller
this is likely not backportable, requires newer controller-runtime Signed-off-by: Evan <[email protected]>
1 parent 8694c6c commit bb2540d

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

cmd/olm/manager.go

+14-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ package main
22

33
import (
44
"context"
5+
"k8s.io/apimachinery/pkg/labels"
56

7+
corev1 "k8s.io/api/core/v1"
68
ctrl "sigs.k8s.io/controller-runtime"
9+
"sigs.k8s.io/controller-runtime/pkg/cache"
710
"sigs.k8s.io/controller-runtime/pkg/log/zap"
811

12+
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
913
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators"
1014
"github.com/operator-framework/operator-lifecycle-manager/pkg/feature"
1115
)
@@ -16,7 +20,16 @@ func Manager(ctx context.Context, debug bool) (ctrl.Manager, error) {
1620

1721
// Setup a Manager
1822
setupLog.Info("configuring manager")
19-
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{MetricsBindAddress: "0"}) // TODO(njhale): Enable metrics on non-conflicting port (not 8080)
23+
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
24+
MetricsBindAddress: "0", // TODO(njhale): Enable metrics on non-conflicting port (not 8080)
25+
NewCache: cache.BuilderWithOptions(cache.Options{
26+
SelectorsByObject: cache.SelectorsByObject{
27+
&corev1.Secret{}: {
28+
Label: labels.SelectorFromValidatedSet(map[string]string{install.OLMManagedLabelKey: install.OLMManagedLabelValue}),
29+
},
30+
},
31+
}),
32+
})
2033
if err != nil {
2134
return nil, err
2235
}

0 commit comments

Comments
 (0)