Merge missing commits from master to release-1.1#705
Merge missing commits from master to release-1.1#705rshriram merged 14 commits intoistio:release-1.1from
Conversation
* Add Protolock. Move the protoc docker files to tools/protoc. Add docker files for protolock image. Update Makefile precommit hook and prow presubmit check to run protolock. * Add combined image to be used on CircleCI * Update proto.lock for policy_check_fail_open in mesh config. * Updade circle config.
* Merge mixer protos. * Remove renamed generated files. * Regen mixer files * Remove mixer lint exception.
This commit adds a TcpClusterRewrite proto to be used in the upcoming TCP cluster rewrite filter on istio/proxy. Signed-off-by: Venil Noronha <veniln@vmware.com>
in the latest envoyproxy.io (1.9) api-v1 was removed
* add trust domain to meshconfig * fix build * add comment
Merge release-1.1 to master
|
We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google. |
Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: frankbu, rshriram The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Some PRs that affected both branches (such as tcp cluster rewrite,
trust domains etc.) went only into master but not release-1.1.
Since we are trying to pin down istio/istio:release-1.1 to istio/api:release-1.1,
we need the branches to be in sync (till date, istio/istio:release-1.1 was pointing
to istio/api:master).
24f6a07 (Shriram Rajagopalan, 6 days ago)
Update protolock
079096f (Shriram Rajagopalan, 6 days ago)
proto lock update
11e496c (Quanjie Lin, 7 days ago)
add trust domain to meshconfig (#697)
3215746 (Vadim Eisenberg, 9 days ago)
remove references to envoyproxy.io api-v1 (#694)
6b9e3a5 (Venil Noronha, 12 days ago)
Add TcpClusterRewrite config proto (#693)
bac7f54 (Jeff Mendoza, 12 days ago)
Merge mixer protos (#691)
d2dcf00 (Jeff Mendoza, 2 weeks ago)
Add prototool for linting, precommit, Circle, Prow. (#685)
011906d (Jeff Mendoza, 2 weeks ago)
Add Protolock. (#675)
4a0e55e (Pengyuan Bian, 3 weeks ago)
add stdduration annotation. (#673)