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

update grpc go and remove v2 workarounds #30546

Merged
merged 5 commits into from
Feb 1, 2021

Conversation

ramaraochavali
Copy link
Contributor

This PR updates the grpc-go to latest released version and removes the workarounds for v2.

[ ] Configuration Infrastructure
[ ] Docs
[ ] Installation
[ X] Networking
[ ] Performance and Scalability
[ ] Policies and Telemetry
[ ] Security
[ ] Test and Release
[ ] User Experience
[ ] Developer Infrastructure

Pull Request Attributes

Please check any characteristics that apply to this pull request.

[X ] Does not have any changes that may affect Istio users.

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
@google-cla google-cla bot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Feb 1, 2021
@istio-testing istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 1, 2021
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
@ramaraochavali ramaraochavali added the release-notes-none Indicates a PR that does not require release notes. label Feb 1, 2021
@ramaraochavali
Copy link
Contributor Author

/test release-notes_istio

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
@@ -2,10 +2,10 @@
"xds_servers": [
{
"server_uri": "localhost:14057",
"channel_creds": [{"type": "insecure"}]
"channel_creds": [{"type": "insecure"}],
"server_features" : ["xds_v3"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is needed because the new grpc-go expects server_features to be child of xds_servers grpc/grpc-go#4087

@ramaraochavali
Copy link
Contributor Author

/test integ-telemetry-mc-k8s-tests_istio

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
@ramaraochavali ramaraochavali requested a review from a team as a code owner February 1, 2021 08:59
@@ -29,6 +29,7 @@ run:
skip-files:
- ".*\\.pb\\.go"
- ".*\\.gen\\.go"
- pilot/pkg/networking/grpcgen/grpcgen_test.go
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to skip import order check. Otherwise we will have to set those env vars in the build file

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, thats annoying. Ok, SGTM. I have a bug with GRPC to make this reasonable to configure

@@ -26,12 +25,16 @@ import (
"google.golang.org/grpc/resolver"
"google.golang.org/grpc/serviceconfig"

// To setup the env vars needed for grpc-go. Should be loaded before grpc/xds is loaded.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is golang initialization order based on import order or something?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is based on import ordering

@istio-testing istio-testing merged commit 4463209 into istio:master Feb 1, 2021
@ramaraochavali ramaraochavali deleted the fix/update_grpc branch February 2, 2021 04:34
domcyrus pushed a commit to domcyrus/istio that referenced this pull request Feb 4, 2021
* wip

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

* fix bootstrap

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

* remove unnecessary go.sum change

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

* add go.sum change

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

* make gen

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. release-notes-none Indicates a PR that does not require release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants