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

xds: migrate udpa proto to xds directory #8686

Merged
merged 8 commits into from
Nov 11, 2021
Merged

Conversation

YifeiZhuang
Copy link
Contributor

@YifeiZhuang YifeiZhuang commented Nov 10, 2021

fix #8631:

  1. import udpa protos form new git repo https://github.com/cncf/xds.git instead of https://github.com/cncf/udpa.git
  2. use proto from xds directory not udpa directory in https://github.com/cncf/xds.git, details was here Stable release of Go generated protos cncf/xds#2 (comment)
  3. support both versions of TypeStruct
  4. remove v1 orca service in old directory and use the new one v3, and refer to v3 in ORCA related area

@YifeiZhuang YifeiZhuang changed the title test test test xds: migrate udpa proto to xds directory Nov 10, 2021
@YifeiZhuang YifeiZhuang requested a review from ejona86 November 10, 2021 19:13
Copy link
Member

@ejona86 ejona86 left a comment

Choose a reason for hiding this comment

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

Seems like this is still a work in progress. It's not clear to me what you were wanting me to look at.

xds/src/main/java/io/grpc/xds/ClientXdsClient.java Outdated Show resolved Hide resolved
xds/src/main/java/io/grpc/xds/ClientXdsClient.java Outdated Show resolved Hide resolved
@YifeiZhuang
Copy link
Contributor Author

Seems like this is still a work in progress. It's not clear to me what you were wanting me to look at.

yea i was thinking of splitting the fix into two so i asked you to review, because my protoc generator is in another environment.
But then I changed my mind to put everything in this PR.

@YifeiZhuang YifeiZhuang requested a review from ejona86 November 10, 2021 23:28
Copy link
Member

@ejona86 ejona86 left a comment

Choose a reason for hiding this comment

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

Is a future change going to rename xds/third_party/udpa to xds/third_party/xds?

We need to make changes upstream to add java_package options. We don't have to block this PR on it, but it does need to happen. It seems we've gotten sloppy and haven't been doing that for many protos.

xds/src/test/java/io/grpc/xds/ClientXdsClientDataTest.java Outdated Show resolved Hide resolved
Copy link
Member

@ejona86 ejona86 left a comment

Choose a reason for hiding this comment

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

I'm still wondering when we'll rename xds/third_party/udpa to xds/third_party/xds.

@YifeiZhuang
Copy link
Contributor Author

I'm still wondering when we'll rename xds/third_party/udpa to xds/third_party/xds.

it looks only little changes needed in order to rename the directory. so let's include it here.

@YifeiZhuang YifeiZhuang requested a review from ejona86 November 11, 2021 16:44
@YifeiZhuang YifeiZhuang merged commit 881747a into grpc:master Nov 11, 2021
@YifeiZhuang YifeiZhuang deleted the udpa_2 branch November 11, 2021 18:07
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 10, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

udpa to xds proto migration
2 participants