Skip to content

Commit 66a4ed7

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 79844a0 commit 66a4ed7

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ require (
157157
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
158158
go.uber.org/multierr v1.11.0 // indirect
159159
go.uber.org/zap v1.26.0 // indirect
160-
golang.org/x/crypto v0.30.0 // indirect
160+
golang.org/x/crypto v0.31.0 // indirect
161161
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
162162
golang.org/x/mod v0.21.0 // indirect
163163
golang.org/x/oauth2 v0.24.0 // indirect

Diff for: go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -2046,8 +2046,8 @@ golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq
20462046
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
20472047
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
20482048
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
2049-
golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
2050-
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
2049+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
2050+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
20512051
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
20522052
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
20532053
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=

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

Diff for: vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ go.uber.org/zap/internal/pool
744744
go.uber.org/zap/internal/stacktrace
745745
go.uber.org/zap/zapcore
746746
go.uber.org/zap/zapgrpc
747-
# golang.org/x/crypto v0.30.0
747+
# golang.org/x/crypto v0.31.0
748748
## explicit; go 1.20
749749
golang.org/x/crypto/cryptobyte
750750
golang.org/x/crypto/cryptobyte/asn1

0 commit comments

Comments
 (0)