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.

Sign up for GitHub

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

Jump to bottom

fix open telemetry doc #11732

Merged
merged 7 commits into from
Aug 30, 2022
Merged

fix open telemetry doc #11732

merged 7 commits into from
Aug 30, 2022

Conversation

zirain
Copy link
Member

@zirain zirain commented Aug 23, 2022

Please provide a description for what this PR is for.

follow istio/istio#40606

And to help us figure out who should review this PR, please
put an X in all the areas that this PR affects.

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

@zirain zirain requested review from a team as code owners August 23, 2022 02:59
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 23, 2022
@zirain zirain force-pushed the otel-doc branch 2 times, most recently from 1b6d757 to 5312d27 Compare August 23, 2022 03:25
@istio-testing istio-testing added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 23, 2022
zirain
zirain commented Aug 23, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@zirain zirain added the do-not-merge Block automatic merging of a PR. label Aug 23, 2022
@ericvn
Copy link
Contributor

ericvn commented Aug 23, 2022

@zirain Is istio/istio#40606 going to be merged to 1.15? The current istio.io branch is for 1.15 only, until 1.15 is released when it will revert to work for 1.16. If this is for 1.16 only, we will wait to merge this PR after we do the branch cut (on 1.15.0 release day).

@zirain
Copy link
Member Author

zirain commented Aug 23, 2022

@zirain Is istio/istio#40606 going to be merged to 1.15? The current istio.io branch is for 1.15 only, until 1.15 is released when it will revert to work for 1.16. If this is for 1.16 only, we will wait to merge this PR after we do the branch cut (on 1.15.0 release day).

I perfer not merge to 1.15, let's keep DNM.

@zirain
fix gen
cd7be0e 
Signed-off-by: hejianpeng <hejianpeng2@huawei.com>
zirain
zirain commented Aug 27, 2022
View reviewed changes
go.mod Show resolved Hide resolved
@zirain zirain removed the do-not-merge Block automatic merging of a PR. label Aug 27, 2022
@zirain
Copy link
Member Author

zirain commented Aug 27, 2022

cc @ericvn , this PR is ready for review.

ericvn
ericvn requested changes Aug 28, 2022
View reviewed changes
go.mod
istio.io/pkg v0.0.0-20220815202617-8f42645c6e49
k8s.io/apimachinery v0.24.2
k8s.io/client-go v0.24.2
istio.io/istio v0.0.0-20220826204218-8f0fc3e2d673
Copy link
Contributor

Choose a reason for hiding this comment

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

There are a number of extra changes in the go.* files. #11754 has a smaller set of changes. It looks like these changes match the main istio/istio branch while we are testing against the 1.15 branch. If you would remove the extra changes.

Copy link
Contributor

Choose a reason for hiding this comment

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

The additional changes will come in as part of the istio/istio.io branch cut to release-1.15 when 1.15.0 is released.

Copy link
Member Author

Choose a reason for hiding this comment

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

remove extra changes base on #11754 .

@istio-testing istio-testing added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 29, 2022
@ericvn
Copy link
Contributor

ericvn commented Aug 30, 2022

Thanks for the changes. This will get our one test working again.

@istio-testing istio-testing merged commit 4830422 into istio:master Aug 30, 2022
@ericvn ericvn mentioned this pull request Aug 30, 2022
Closed
@zirain zirain deleted the otel-doc branch August 31, 2022 02:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ericvn ericvn ericvn approved these changes

Assignees
No one assigned
Labels
kind/docs size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zirain @ericvn @istio-testing @istio-policy-bot