Skip to content

Commit

Permalink
build(deps): bump golang.org/x/crypto from 0.30.0 to 0.31.0 (#3465)
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
dependabot[bot] authored and Per Goncalves da Silva committed Jan 9, 2025
1 parent 45559bd commit 6c63d83
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions pkg/controller/registry/resolver/source_csvs.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,19 @@ func (s *csvSource) Snapshot(ctx context.Context) (*cache.Snapshot, error) {
continue
}

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

if failForwardEnabled {
replacementChainEndsInFailure, err := isReplacementChainThatEndsInFailure(csv, ReplacementMapping(csvs))
Expand Down

0 comments on commit 6c63d83

Please sign in to comment.