Skip to content

Update Envoy SHA to 436946bb9d (2021-06-04).#3381

Merged
istio-testing merged 1 commit intoistio:masterfrom
PiotrSikora:envoy-20210604
Jun 17, 2021
Merged

Update Envoy SHA to 436946bb9d (2021-06-04).#3381
istio-testing merged 1 commit intoistio:masterfrom
PiotrSikora:envoy-20210604

Conversation

@PiotrSikora
Copy link
Copy Markdown
Contributor

Signed-off-by: Piotr Sikora piotrsikora@google.com

@istio-testing istio-testing added the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Jun 16, 2021
@istio-testing
Copy link
Copy Markdown
Collaborator

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@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 Jun 16, 2021
@istio-testing istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 16, 2021
@PiotrSikora
Copy link
Copy Markdown
Contributor Author

/test all

@PiotrSikora
Copy link
Copy Markdown
Contributor Author

/test all

@lambdai
Copy link
Copy Markdown
Contributor

lambdai commented Jun 16, 2021

dup of #3378 ?

Or the plan is to address dedicated breakage ?

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
@PiotrSikora PiotrSikora marked this pull request as ready for review June 16, 2021 23:39
@PiotrSikora PiotrSikora requested review from a team June 16, 2021 23:39
@istio-testing istio-testing removed the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Jun 16, 2021
@PiotrSikora
Copy link
Copy Markdown
Contributor Author

dup of #3378 ?

Or the plan is to address dedicated breakage ?

Oops, I've started working on this yesterday, and I didn't notice #3378 before opening this PR. Thanks for the heads up!

It's not exactly a duplicate, since my plan was to split the update into mutliple PRs, since there is a lot of breaking changes:

  • update from 2021-05-18 to 2021-06-04 and fix 2 easy breaking changes (V8 update and include paths),
  • solve absl vs std types mismatch - this is a messy change, and I didn't want to mix it with all the trivial fixes, since it definitely requires a proper review,
  • update from 2021-06-04 to 2021-06-15 and fix 2 easy breaking changes (protobuf dependency and well_know_names removal).

The abseil issue might be non-trivial, because of use of absl in Envoy and std in Proxy-Wasm, which messes up with the Null Plugins, so I think it might sense to roll forward until 2021-06-04 before solving this issue.

cc @bianpengyuan @kyessenov

@bianpengyuan
Copy link
Copy Markdown
Contributor

dup of #3378 ?
Or the plan is to address dedicated breakage ?

Oops, I've started working on this yesterday, and I didn't notice #3378 before opening this PR. Thanks for the heads up!

It's not exactly a duplicate, since my plan was to split the update into mutliple PRs, since there is a lot of breaking changes:

  • update from 2021-05-18 to 2021-06-04 and fix 2 easy breaking changes (V8 update and include paths),
  • solve absl vs std types mismatch - this is a messy change, and I didn't want to mix it with all the trivial fixes, since it definitely requires a proper review,
  • update from 2021-06-04 to 2021-06-15 and fix 2 easy breaking changes (protobuf dependency and well_know_names removal).

The abseil issue might be non-trivial, because of use of absl in Envoy and std in Proxy-Wasm, which messes up with the Null Plugins, so I think it might sense to roll forward until 2021-06-04 before solving this issue.

cc @bianpengyuan @kyessenov

@PiotrSikora Yeah looks like quite a lot. I struggled a bit now on absl vs std string_view and luckily I've not yet put many efforts on fixing it. So feel free to take over, I will close mine :).

@PiotrSikora
Copy link
Copy Markdown
Contributor Author

/test release-centos-test_proxy

@PiotrSikora
Copy link
Copy Markdown
Contributor Author

@PiotrSikora Yeah looks like quite a lot. I struggled a bit now on absl vs std string_view and luckily I've not yet put many efforts on fixing it. So feel free to take over, I will close mine :).

@bianpengyuan I have fixes for the first 2 breaking changes (include paths in this PR and CentOS build in istio/tools#1578 and istio/test-infra#3387), so that we can roll forward to 2021-06-04... but that's all I have. I don't have a fix for absl vs std, and I'm unlikely to have more time this week to look into it, so I probably shouldn't be taking over the whole thing.

@bianpengyuan
Copy link
Copy Markdown
Contributor

@bianpengyuan I have fixes for the first 2 breaking changes (include paths in this PR and CentOS build in istio/tools#1578 and istio/test-infra#3387), so that we can roll forward to 2021-06-04... but that's all I have. I don't have a fix for absl vs std, and I'm unlikely to have more time this week to look into it, so I probably shouldn't be taking over the whole thing.

Ok that's fine. Let's get this in I will take a stab to fix the other breaking changes.

@PiotrSikora
Copy link
Copy Markdown
Contributor Author

/test release-centos-test_proxy

@istio-testing istio-testing merged commit 7f12a61 into istio:master Jun 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants