Skip to content

[release-1.5] Cherrypick #20923#20964

Merged
istio-testing merged 5 commits intoistio:release-1.5from
stewartbutler:release15-cherrypick-20923
Feb 13, 2020
Merged

[release-1.5] Cherrypick #20923#20964
istio-testing merged 5 commits intoistio:release-1.5from
stewartbutler:release15-cherrypick-20923

Conversation

@stewartbutler
Copy link
Copy Markdown
Contributor

@stewartbutler stewartbutler commented Feb 8, 2020

Cherrypicking #20923 into release 1.5, since the automated cherrypick failed due to the generated code.

* Templating the cni validation container name

* Adding changed proto with new field

* gencheck

* Updating golden yaml

* More gencheck

(cherry picked from commit ddf3c69)
@stewartbutler stewartbutler requested review from a team and fpesce February 8, 2020 00:23
@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Feb 8, 2020
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 8, 2020
@stewartbutler
Copy link
Copy Markdown
Contributor Author

/test e2e-bookInfoTests-envoyv2-v1alpha3_istio_release-1.5

@istio-testing istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Feb 13, 2020
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Feb 13, 2020
@istio-testing istio-testing merged commit 22e6647 into istio:release-1.5 Feb 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/config area/networking cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants