Skip to content

Commit 7435520

Browse files
dependabot[bot]Per Goncalves da Silva
authored and
Per Goncalves da Silva
committed
build(deps): bump golang.org/x/crypto from 0.30.0 to 0.31.0 (operator-framework#3465)
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.30.0 to 0.31.0. - [Commits](golang/crypto@v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent b7aa493 commit 7435520

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Diff for: pkg/controller/registry/resolver/source_csvs.go

+13-13
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)