Merge pull request #675 from ankitathomas/OCPBUGS-27314

[release-4.14] OCPBUGS-27314: Don't sync namespaces that have no subscriptions
openshift · Feb 7, 2024 · 1a03f4b · 1a03f4b
2 parents b831504 + 1a1264f
commit 1a03f4b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go b/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
@@ -938,6 +938,12 @@ func (o *Operator) syncResolvingNamespace(obj interface{}) error {
 		return err
 	}
 
+	// If there are no subscriptions, don't attempt to sync the namespace.
+	if len(subs) == 0 {
+		logger.Debug(fmt.Sprintf("No subscriptions were found in namespace %v", namespace))
+		return nil
+	}
+
 	ogLister := o.lister.OperatorsV1().OperatorGroupLister().OperatorGroups(namespace)
 	failForwardEnabled, err := resolver.IsFailForwardEnabled(ogLister)
 	if err != nil {

diff --git a/...perator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go b/...perator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go