Skip to content

Commit b04bce3

Browse files
author
Per Goncalves da Silva
committed
revert source_csvs
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 29c2f81 commit b04bce3

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

pkg/controller/registry/resolver/source_csvs.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ func (s *csvSource) Snapshot(ctx context.Context) (*cache.Snapshot, error) {
9393
continue
9494
}
9595

96-
//if cachedSubscription, ok := csvSubscriptions[csv]; !ok || cachedSubscription == nil {
97-
// // we might be in an incoherent state, so let's check with live clients to make sure
98-
// realSubscriptions, err := s.listSubscriptions(ctx)
99-
// if err != nil {
100-
// return nil, fmt.Errorf("failed to list subscriptions: %w", err)
101-
// }
102-
// for _, realSubscription := range realSubscriptions.Items {
103-
// if realSubscription.Status.InstalledCSV == csv.Name {
104-
// // oops, live cluster state is coherent
105-
// return nil, fmt.Errorf("lister caches incoherent for CSV %s/%s - found owning Subscription %s/%s", csv.Namespace, csv.Name, realSubscription.Namespace, realSubscription.Name)
106-
// }
107-
// }
108-
//}
96+
if cachedSubscription, ok := csvSubscriptions[csv]; !ok || cachedSubscription == nil {
97+
// we might be in an incoherent state, so let's check with live clients to make sure
98+
realSubscriptions, err := s.listSubscriptions(ctx)
99+
if err != nil {
100+
return nil, fmt.Errorf("failed to list subscriptions: %w", err)
101+
}
102+
for _, realSubscription := range realSubscriptions.Items {
103+
if realSubscription.Status.InstalledCSV == csv.Name {
104+
// oops, live cluster state is coherent
105+
return nil, fmt.Errorf("lister caches incoherent for CSV %s/%s - found owning Subscription %s/%s", csv.Namespace, csv.Name, realSubscription.Namespace, realSubscription.Name)
106+
}
107+
}
108+
}
109109

110110
if failForwardEnabled {
111111
replacementChainEndsInFailure, err := isReplacementChainThatEndsInFailure(csv, ReplacementMapping(csvs))

0 commit comments

Comments
 (0)