Skip to content

Commit 87be2e2

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

File tree

115 files changed

+7479
-5852
lines changed

Some content is hidden

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

115 files changed

+7479
-5852
lines changed

go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 22 additions & 2362 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/google.golang.org/grpc/CONTRIBUTING.md

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

vendor/google.golang.org/grpc/MAINTAINERS.md

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

vendor/google.golang.org/grpc/Makefile

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

vendor/google.golang.org/grpc/README.md

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

vendor/google.golang.org/grpc/SECURITY.md

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

vendor/google.golang.org/grpc/backoff/backoff.go

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

vendor/google.golang.org/grpc/balancer/balancer.go

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

vendor/google.golang.org/grpc/balancer/base/balancer.go

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

0 commit comments

Comments
 (0)