*: address review comments

Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 7ef3712dae367a3d9e2ca3c05c7a175711eee975

Author: stevekuznetsov

staging/operator-lifecycle-manager/pkg/controller/install/certresources.go

@@ -504,7 +504,7 @@ func (i *StrategyDeploymentInstaller) installCertRequirementsForDeployment(deplo
 			Name:     "extension-apiserver-authentication-reader",
 		},
 	}
-	authReaderRoleBinding.SetName(AuthReaderRolebindingName(service.GetName()))
+	authReaderRoleBinding.SetName(AuthReaderRoleBindingName(service.GetName()))
 	authReaderRoleBinding.SetNamespace(KubeSystem)
 	authReaderRoleBinding.SetLabels(map[string]string{OLMManagedLabelKey: OLMManagedLabelValue})
 
@@ -547,7 +547,7 @@ func AuthDelegatorClusterRoleBindingName(serviceName string) string {
 	return serviceName + "-system:auth-delegator"
 }
 
-func AuthReaderRolebindingName(serviceName string) string {
+func AuthReaderRoleBindingName(serviceName string) string {
 	return serviceName + "-auth-reader"
 }
 

staging/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go

@@ -180,8 +180,8 @@ func (a *Operator) checkAPIServiceResources(csv *v1alpha1.ClusterServiceVersion,
 			logger.WithError(err).Warnf("could not retrieve auth delegator cluster role binding %s", install.AuthDelegatorClusterRoleBindingName(service.GetName()))
 			errs = append(errs, err)
 		}
-		if _, err := a.lister.RbacV1().RoleBindingLister().RoleBindings(install.KubeSystem).Get(install.AuthReaderRolebindingName(service.GetName())); err != nil {
-			logger.WithError(err).Warnf("could not retrieve role binding %s/%s", install.KubeSystem, install.AuthReaderRolebindingName(service.GetName()))
+		if _, err := a.lister.RbacV1().RoleBindingLister().RoleBindings(install.KubeSystem).Get(install.AuthReaderRoleBindingName(service.GetName())); err != nil {
+			logger.WithError(err).Warnf("could not retrieve role binding %s/%s", install.KubeSystem, install.AuthReaderRoleBindingName(service.GetName()))
 			errs = append(errs, err)
 		}
 	}

staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go

@@ -106,7 +106,7 @@ type Operator struct {
 	informersFiltered            bool
 
 	ruleChecker     func(*v1alpha1.ClusterServiceVersion) *install.CSVRuleChecker
-	ruleCheckerLock *sync.RWMutex
+	ruleCheckerLock sync.RWMutex
 	resyncPeriod    func() time.Duration
 	ctx             context.Context
 }
@@ -218,7 +218,7 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
 		clientFactory:                clients.NewFactory(config.restConfig),
 		protectedCopiedCSVNamespaces: config.protectedCopiedCSVNamespaces,
 		resyncPeriod:                 config.resyncPeriod,
-		ruleCheckerLock:              &sync.RWMutex{},
+		ruleCheckerLock:              sync.RWMutex{},
 		ctx:                          ctx,
 		informersFiltered:            canFilter,
 	}

staging/operator-lifecycle-manager/pkg/controller/operators/olm/requirements.go

@@ -424,12 +424,7 @@ func permissionsPreviouslyCreated[T, U metav1.Object](
 	}
 	roleSelectorMap := ownerutil.OwnerLabel(csv, v1alpha1.ClusterServiceVersionKind)
 	roleSelectorMap[resolver.ContentHashLabelKey] = ruleHash
-	roleSelectorSet := labels.Set{}
-	for key, value := range roleSelectorMap {
-		roleSelectorSet[key] = value
-	}
-	roleSelector := labels.SelectorFromSet(roleSelectorSet)
-	roles, err := listRoles(roleSelector)
+	roles, err := listRoles(labels.SelectorFromSet(roleSelectorMap))
 	if err != nil {
 		return false, err
 	}