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.

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

backport to 1.16: aggregate cluster: fix TLS init issue #14456

Merged
merged 3 commits into from
Jan 15, 2021
Merged

backport to 1.16: aggregate cluster: fix TLS init issue #14456

merged 3 commits into from
Jan 15, 2021

Conversation

tbarrella
Copy link
Contributor

Commit Message:

backport to 1.16: aggregate cluster: fix TLS init issue

Signed-off-by: Taylor Barrella tabarr@google.com

Additional Description: Based on #14388
Risk Level: Low
Testing: Build and run the repro from #14119 without crashing, bazel test test/extensions/clusters/aggregate:cluster_test
Docs Changes: N/A
Release Notes:
#14119

Signed-off-by: Taylor Barrella <tabarr@google.com>
Signed-off-by: Taylor Barrella <tabarr@google.com>
@lizan
Copy link
Member

lizan commented Dec 17, 2020

@tbarrella can you take the config from #14119 and make it to an integration test? That PR should go to master though.

@tbarrella
Copy link
Contributor Author

I see why that would be useful, although should that block fixing this? In particular, I'm about to take a break for the rest of the year so I wouldn't likely have that done soon

Copy link
Member

@lizan lizan left a comment

Choose a reason for hiding this comment

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

No that isn't a requirement for this, as I said that should go to master branch.

@tbarrella
Copy link
Contributor Author

I don't think the test failure is real (see #14047)

Would #14046 need to be backported and merged into this before this can be merged?

@lizan
Copy link
Member

lizan commented Jan 13, 2021

No we don't need #14046, can you fix the conflict then I can merge?

@tbarrella
Copy link
Contributor Author

Ok cool, fixed

@tbarrella
Copy link
Contributor Author

/retest

@repokitteh-read-only
Copy link

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #14456 (comment) was created by @tbarrella.

see: more, trace.

@tbarrella
Copy link
Contributor Author

This macos test is failing when installing dependencies, and it was passing after the previous commit, so I don't think it's related to this PR (I also noticed that it failed in another 1.16 backport PR)

@lizan is it ok for this to be merged?

@lizan lizan merged commit 08c9c49 into envoyproxy:release/v1.16 Jan 15, 2021
@tbarrella tbarrella deleted the aggregate-cluster-backport branch January 15, 2021 18:46
istio-testing pushed a commit to istio/envoy that referenced this pull request Feb 5, 2021
* backport to 1.16: http: fixing a bug with IPv6 hosts (envoyproxy#14238)

Fixing a bug where HTTP parser offsets for IPv6 hosts did not include [] and Envoy assumed it did.
This results in mis-parsing addresses for IPv6 CONNECT requests and IPv6 hosts in fully URLs over HTTP/1.1

Risk Level: low
Testing: new unit, integration tests
Docs Changes: n/a
Release Notes: inline
Signed-off-by: Shikugawa <rei@tetrate.io>
Co-authored-by: alyssawilk <alyssar@chromium.org>

* backport to 1.16: vrp: allow supervisord to open its log file (envoyproxy#14066) (envoyproxy#14279)

Commit Message: Allow supervisord to open its log file
Additional Description:
Change the default location of the log file and give supervisord
permissions to write to it.

Risk Level: low
Testing: built image locally
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a

Signed-off-by: Alex Konradi <akonradi@google.com>
Signed-off-by: Christoph Pakulski <christoph@tetrate.io>

* Closing release 1.16.2. (envoyproxy#14308)

Signed-off-by: Christoph Pakulski <christoph@tetrate.io>

* Kick-off rel 1.16.3. (envoyproxy#14321)

Signed-off-by: Christoph Pakulski <christoph@tetrate.io>

* lua: reset downstream_ssl_connection in StreamInfoWrapper when object is marked dead by Lua GC (envoyproxy#14092) (envoyproxy#14449)

Co-authored-by: Marcin Falkowski <marcin.falkowski@allegro.pl>

* backport to 1.16: tls: fix detection of the upstream connection close event. (envoyproxy#13858) (envoyproxy#14452)

Fixes envoyproxy#13856.

This change also contains the following backports:
- build: Fix some unused variable warnings (envoyproxy#13987)
- test: Check in all TLS test certs (envoyproxy#13702)

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Christoph Pakulski <christoph@tetrate.io>

* backport to 1.16: aggregate cluster: fix TLS init issue (envoyproxy#14456)

Additional Description: Based on envoyproxy#14388
Risk Level: Low
Testing: Build and run the repro from envoyproxy#14119 without crashing, `bazel test test/extensions/clusters/aggregate:cluster_test`
Docs Changes: N/A
Release Notes:
envoyproxy#14119

Signed-off-by: Taylor Barrella <tabarr@google.com>

Co-authored-by: Rei Shimizu <rei@tetrate.io>
Co-authored-by: Christoph Pakulski <christoph@tetrate.io>
Co-authored-by: Marcin Falkowski <marcin.falkowski@allegro.pl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants