Skip to content

Commit 6771690

Browse files
committed
UPSTREAM: <carry>: Add object cache for psm resource queries
Signed-off-by: kevinrizza <[email protected]>
1 parent 3ea925f commit 6771690

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

cmd/package-server-manager/main.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ import (
1111
"k8s.io/apimachinery/pkg/fields"
1212
_ "k8s.io/client-go/plugin/pkg/client/auth"
1313

14+
corev1 "k8s.io/api/core/v1"
15+
rbacv1 "k8s.io/api/rbac/v1"
16+
1417
ctrl "sigs.k8s.io/controller-runtime"
1518
"sigs.k8s.io/controller-runtime/pkg/cache"
1619
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -80,6 +83,9 @@ func run(cmd *cobra.Command, args []string) error {
8083
le := leaderelection.GetLeaderElectionConfig(setupLog, restConfig, !disableLeaderElection)
8184

8285
packageserverCSVFields := fields.Set{"metadata.name": name}
86+
serviceaccountFields := fields.Set{"metadata.name": "olm-operator-serviceaccount"}
87+
clusterroleFields := fields.Set{"metadata.name": "system:controller:operator-lifecycle-manager"}
88+
clusterrolebindingFields := fields.Set{"metadata.name": "olm-operator-binding-openshift-operator-lifecycle-manager"}
8389
mgr, err := ctrl.NewManager(restConfig, manager.Options{
8490
Scheme: setupScheme(),
8591
Metrics: metricsserver.Options{BindAddress: metricsAddr},
@@ -100,6 +106,15 @@ func run(cmd *cobra.Command, args []string) error {
100106
&olmv1alpha1.ClusterServiceVersion{}: {
101107
Field: packageserverCSVFields.AsSelector(),
102108
},
109+
&corev1.ServiceAccount{}: {
110+
Field: serviceaccountFields.AsSelector(),
111+
},
112+
&rbacv1.ClusterRole{}: {
113+
Field: clusterroleFields.AsSelector(),
114+
},
115+
&rbacv1.ClusterRoleBinding{}: {
116+
Field: clusterrolebindingFields.AsSelector(),
117+
},
103118
},
104119
},
105120
})

0 commit comments

Comments
 (0)