fix(e2e): fixing e2e test after rebase

Author: ecordell

pkg/controller/operators/olm/operator.go

@@ -640,19 +640,19 @@ func (a *Operator) operatorGroupForActiveCSV(logger *logrus.Entry, csv *v1alpha1
 		return nil
 	}
 
-	targets, ok := annotations[v1alpha2.OperatorGroupTargetsAnnotationKey]
-
-	// No target annotation
-	if !ok {
-		logger.Info("no olm.targetNamespaces annotation")
-		return nil
-	}
-
-	// Target namespaces don't match
-	if targets != strings.Join(operatorGroup.Status.Namespaces, ",") {
-		logger.Info("olm.targetNamespaces annotation doesn't match operatorgroup status")
-		return nil
-	}
+	// targets, ok := annotations[v1alpha2.OperatorGroupTargetsAnnotationKey]
+	//
+	// // No target annotation
+	// if !ok {
+	// 	logger.Info("no olm.targetNamespaces annotation")
+	// 	return nil
+	// }
+	//
+	// // Target namespaces don't match
+	// if targets != strings.Join(operatorGroup.Status.Namespaces, ",") {
+	// 	logger.Info("olm.targetNamespaces annotation doesn't match operatorgroup status")
+	// 	return nil
+	// }
 
 	return operatorGroup
 }

pkg/controller/operators/olm/operatorgroup.go

@@ -77,7 +77,10 @@ func (a *Operator) syncOperatorGroups(obj interface{}) error {
 		return nil
 	}
 
-	a.annotateCSVs(op, targetNamespaces, logger)
+	err = a.annotateCSVs(op, targetNamespaces, logger)
+	if err != nil {
+		logger.WithError(err).Warn("failed to annotate CSVs in operatorgroup after group change")
+	}
 	logger.Debug("OperatorGroup CSV annotation completed")
 
 	if err := a.ensureOpGroupClusterRoles(op); err != nil {
@@ -112,16 +115,17 @@ func (a *Operator) syncOperatorGroups(obj interface{}) error {
 	return nil
 }
 
-func (a *Operator) annotateCSVs(group *v1alpha2.OperatorGroup, targetNamespaces []string, logger *logrus.Entry) {
+func (a *Operator) annotateCSVs(group *v1alpha2.OperatorGroup, targetNamespaces []string, logger *logrus.Entry) error {
+	updateErrs := []error{}
 	for _, csv := range a.csvSet(group.GetNamespace(), v1alpha1.CSVPhaseAny) {
 		logger := logger.WithField("csv", csv.GetName())
 
 		if a.operatorGroupAnnotationsDiffer(&csv.ObjectMeta, group) {
 			a.setOperatorGroupAnnotations(&csv.ObjectMeta, group, true)
 			// CRDs don't support strategic merge patching, but in the future if they do this should be updated to patch
 			if _, err := a.client.OperatorsV1alpha1().ClusterServiceVersions(csv.GetNamespace()).Update(csv); err != nil && !k8serrors.IsNotFound(err) {
-				// TODO: return an error and requeue the OperatorGroup here? Can this cause an update to never happen if there's resource contention?
 				logger.WithError(err).Warnf("error adding operatorgroup annotations")
+				updateErrs = append(updateErrs, err)
 				continue
 			}
 		}
@@ -135,6 +139,7 @@ func (a *Operator) annotateCSVs(group *v1alpha2.OperatorGroup, targetNamespaces
 			}
 		}
 	}
+	return errors.NewAggregate(updateErrs)
 }
 
 func (a *Operator) providedAPIsFromCSVs(group *v1alpha2.OperatorGroup, logger *logrus.Entry) resolver.APISet {

pkg/lib/queueinformer/resourcequeue.go

@@ -14,12 +14,12 @@ func (r ResourceQueueSet) Requeue(name, namespace string) error {
 	key := fmt.Sprintf("%s/%s", namespace, name)
 
 	if queue, ok := r[metav1.NamespaceAll]; len(r) == 1 && ok {
-		queue.AddRateLimited(key)
+		queue.Add(key)
 		return nil
 	}
 
 	if queue, ok := r[namespace]; ok {
-		queue.AddRateLimited(key)
+		queue.Add(key)
 		return nil
 	}