Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: 🌱 remove no longer required grpc replace (issue: #3284) #3529

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,6 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

// v1.64.0 brings in go1.23, which we aren't ready to go to just yet
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284
replace google.golang.org/grpc => google.golang.org/grpc v1.63.2

replace (
// controller runtime
github.com/openshift/api => github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 // release-4.12
Expand Down
2,384 changes: 22 additions & 2,362 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controller/registry/grpc/source.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func grpcConnection(address string) (*grpc.ClientConn, error) {
}))
}

return grpc.Dial(address, dialOptions...)
return grpc.NewClient(address, dialOptions...)
}

func (s *SourceStore) Add(key registry.CatalogKey, address string) (*SourceConn, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/package-server/provider/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2067,7 +2067,7 @@ func TestRegistryProviderListLabels(t *testing.T) {
}

func newTestRegistryClient(t *testing.T, catsrc *operatorsv1alpha1.CatalogSource) *registryClient {
conn, err := grpc.Dial(address+catsrc.Status.RegistryServiceStatus.Port, grpc.WithTransportCredentials(insecure.NewCredentials()))
conn, err := grpc.NewClient(address+catsrc.Status.RegistryServiceStatus.Port, grpc.WithTransportCredentials(insecure.NewCredentials()))
require.NoError(t, err, "could not set up test grpc connection")
return newRegistryClient(catsrc, conn)
}
18 changes: 9 additions & 9 deletions vendor/google.golang.org/grpc/CONTRIBUTING.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 21 additions & 13 deletions vendor/google.golang.org/grpc/MAINTAINERS.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions vendor/google.golang.org/grpc/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/google.golang.org/grpc/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/google.golang.org/grpc/SECURITY.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/google.golang.org/grpc/backoff/backoff.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 7 additions & 74 deletions vendor/google.golang.org/grpc/balancer/balancer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/google.golang.org/grpc/balancer/base/balancer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading