Skip to content

Commit a8886c7

Browse files
(fix dependencies) - remove no longer required grpc replace (issue: #3284)
1 parent d055f28 commit a8886c7

File tree

162 files changed

+10278
-6272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+10278
-6272
lines changed

go.mod

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require (
3636
golang.org/x/net v0.41.0
3737
golang.org/x/sync v0.15.0
3838
golang.org/x/time v0.12.0
39-
google.golang.org/grpc v1.72.1
39+
google.golang.org/grpc v1.73.0
4040
gopkg.in/yaml.v2 v2.4.0
4141
k8s.io/api v0.32.3
4242
k8s.io/apiextensions-apiserver v0.32.3
@@ -149,12 +149,12 @@ require (
149149
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
150150
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
151151
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
152-
go.opentelemetry.io/otel v1.34.0 // indirect
152+
go.opentelemetry.io/otel v1.35.0 // indirect
153153
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
154154
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
155-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
156-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
157-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
155+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
156+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
157+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
158158
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
159159
go.uber.org/automaxprocs v1.6.0 // indirect
160160
go.uber.org/multierr v1.11.0 // indirect
@@ -169,8 +169,8 @@ require (
169169
golang.org/x/tools v0.33.0 // indirect
170170
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
171171
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
172-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
173-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
172+
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
173+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
174174
google.golang.org/protobuf v1.36.6 // indirect
175175
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
176176
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -185,10 +185,6 @@ require (
185185
sigs.k8s.io/yaml v1.4.0 // indirect
186186
)
187187

188-
// v1.64.0 brings in go1.23, which we aren't ready to go to just yet
189-
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284
190-
replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
191-
192188
// cel-go v0.23.0 upgrade causes errors raised from the vendor source which lead to think in
193189
// incompatibilities scenarios. After upgrade to use the latest versions of k8s/api v0.33+
194190
// we should try to see if we could fix this one and remove this replace

go.sum

Lines changed: 36 additions & 2376 deletions
Large diffs are not rendered by default.

pkg/controller/registry/grpc/source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func grpcConnection(address string) (*grpc.ClientConn, error) {
163163
}))
164164
}
165165

166-
return grpc.Dial(address, dialOptions...)
166+
return grpc.NewClient(address, dialOptions...)
167167
}
168168

169169
func (s *SourceStore) Add(key registry.CatalogKey, address string) (*SourceConn, error) {

pkg/package-server/provider/registry_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2067,7 +2067,7 @@ func TestRegistryProviderListLabels(t *testing.T) {
20672067
}
20682068

20692069
func newTestRegistryClient(t *testing.T, catsrc *operatorsv1alpha1.CatalogSource) *registryClient {
2070-
conn, err := grpc.Dial(address+catsrc.Status.RegistryServiceStatus.Port, grpc.WithTransportCredentials(insecure.NewCredentials()))
2070+
conn, err := grpc.NewClient(address+catsrc.Status.RegistryServiceStatus.Port, grpc.WithTransportCredentials(insecure.NewCredentials()))
20712071
require.NoError(t, err, "could not set up test grpc connection")
20722072
return newRegistryClient(catsrc, conn)
20732073
}

vendor/go.opentelemetry.io/otel/.gitignore

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/otel/.golangci.yml

Lines changed: 15 additions & 88 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/otel/CHANGELOG.md

Lines changed: 43 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/otel/CONTRIBUTING.md

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)