Skip to content

Commit c334aaa

Browse files
committed
fix(olm): don't requeue operatorgroups for deleted copied csvs
1 parent 819cc9c commit c334aaa

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

pkg/controller/operators/olm/operator.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,14 @@ func (a *Operator) handleClusterServiceVersionDeletion(obj interface{}) {
396396

397397
defer func(csv v1alpha1.ClusterServiceVersion) {
398398
logger.Debug("removing csv from queue set")
399-
a.csvQueueSet.Remove(csv.GetName(), csv.GetNamespace())
399+
if err := a.csvQueueSet.Remove(csv.GetName(), csv.GetNamespace()); err != nil {
400+
logger.WithError(err).Debug("error removing from queue")
401+
}
402+
403+
if clusterServiceVersion.IsCopied() {
404+
logger.Debug("deleted csv is copied. skipping operatorgroup requeue")
405+
return
406+
}
400407

401408
// Requeue all OperatorGroups in the namespace
402409
logger.Debug("requeueing operatorgroups in namespace")

0 commit comments

Comments
 (0)