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

Make echo able to use cert files for call. #31561

Merged
merged 1 commit into from Mar 18, 2021
Merged

Make echo able to use cert files for call. #31561

merged 1 commit into from Mar 18, 2021

Conversation

bianpengyuan
Copy link
Contributor

In prep to add test for proxy provisioned certs: #28256, #31531

@bianpengyuan bianpengyuan requested a review from a team as a code owner March 18, 2021 20:38
@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 Mar 18, 2021
@istio-testing istio-testing added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 18, 2021
@bianpengyuan bianpengyuan added the release-notes-none Indicates a PR that does not require release notes. label Mar 18, 2021
@bianpengyuan
Copy link
Contributor Author

/retest

@bianpengyuan
Copy link
Contributor Author

/retest

@istio-testing istio-testing merged commit 671807b into istio:master Mar 18, 2021
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #31561 failed to apply on top of branch "release-1.9":

Applying: Make echo able to use cert files for call.
Using index info to reconstruct a base tree...
M	pkg/test/echo/cmd/client/main.go
M	pkg/test/echo/proto/echo.pb.go
M	pkg/test/echo/proto/echo.proto
M	pkg/test/echo/server/endpoint/grpc.go
M	pkg/test/echo/server/forwarder/protocol.go
M	pkg/test/framework/components/echo/call.go
M	pkg/test/framework/components/echo/common/call.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/test/framework/components/echo/common/call.go
Auto-merging pkg/test/framework/components/echo/call.go
Auto-merging pkg/test/echo/server/forwarder/protocol.go
Auto-merging pkg/test/echo/server/endpoint/grpc.go
Auto-merging pkg/test/echo/proto/echo.proto
Auto-merging pkg/test/echo/proto/echo.pb.go
CONFLICT (content): Merge conflict in pkg/test/echo/proto/echo.pb.go
Auto-merging pkg/test/echo/cmd/client/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Make echo able to use cert files for call.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #31564

@istio-testing istio-testing mentioned this pull request Mar 18, 2021
Closed
bianpengyuan added a commit to bianpengyuan/istio that referenced this pull request Mar 19, 2021
@bianpengyuan
Make echo able to use cert files for call. (istio#31561)
dde272d
istio-testing pushed a commit that referenced this pull request Mar 19, 2021
@bianpengyuan
[release-1.9] echo fixes for cert file and non-root user. (#31582)
28bbe29 
* Run echo as non root. (#31568)

* Run echo as non root.

* fix

* fix

* test

* Make echo able to use cert files for call. (#31561)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@howardjohn howardjohn howardjohn approved these changes

Assignees
No one assigned
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/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.

None yet
3 participants
@bianpengyuan @istio-testing @howardjohn