Skip to content

Update Envoy#261

Merged
mum4k merged 8 commits intoenvoyproxy:masterfrom
oschaaf:envoy-dep-update-8
Jan 10, 2020
Merged

Update Envoy#261
mum4k merged 8 commits intoenvoyproxy:masterfrom
oschaaf:envoy-dep-update-8

Conversation

@oschaaf
Copy link
Copy Markdown
Member

@oschaaf oschaaf commented Jan 9, 2020

Update Envoy to 29b30911dbfb3f9760efeb28238ceac36e1a1a23

It is worth noting this upgrades Envoy proto api usage to v3alpha

Brings in the structured versioning API, which we need in #226

Signed-off-by: Otto van der Schaaf oschaaf@we-amp.com

Update Envoy to 29b30911dbfb3f9760efeb28238ceac36e1a1a23
Brings in the structured versioning API

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf oschaaf changed the title [WIP] Update Envoy Update Envoy Jan 9, 2020
@oschaaf oschaaf marked this pull request as ready for review January 9, 2020 09:02
@oschaaf oschaaf added P0 Highest priority waiting-for-review A PR waiting for a review. labels Jan 9, 2020
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf oschaaf mentioned this pull request Jan 9, 2020
3 tasks
Copy link
Copy Markdown
Collaborator

@mum4k mum4k left a comment

Choose a reason for hiding this comment

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

Can we hold off this PR for about a day? Eric is trying to import Nighthawk into our internal codebase. We are hoping to import just Nighthawk, not all of Envoy and this PR might break / delay that effort. We should be done with the import by tomorrow end of day.


Where:

--disable-extensions <string>
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Are these changes related to this PR?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yeah, this is auto generated and originates from the updated Envoy version which apparently has a new cli arg. As ‘nighthawk_test_server’ basically is Envoy + a static extension we may see this when updating the dependency.

}

std::string name() override { return "test-server"; }
std::string name() const override { return "test-server"; }
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Similar question here, not sure I follow if this is related to updating Envoy. Do we want a separate PR with description that would explain these additional changes?

Alternatively, please help me understand why they are necessary here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Can we hold off this PR for about a day? Eric is trying to import Nighthawk into our internal codebase. We are hoping to import just Nighthawk, not all of Envoy and this PR might break / delay that effort. We should be done with the import by tomorrow end of day.

Sure no problem

@mum4k mum4k added waiting-for-changes A PR waiting for comments to be resolved and changes to be applied. and removed waiting-for-review A PR waiting for a review. labels Jan 9, 2020
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@mum4k
Copy link
Copy Markdown
Collaborator

mum4k commented Jan 10, 2020

This is now ready to go, we have completed the import internally. Please help by resolving the merge conflict.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Copy link
Copy Markdown
Member Author

oschaaf commented Jan 10, 2020

Done in 23dc8ae

@oschaaf oschaaf added waiting-for-review A PR waiting for a review. and removed waiting-for-changes A PR waiting for comments to be resolved and changes to be applied. labels Jan 10, 2020
@mum4k mum4k merged commit 713d423 into envoyproxy:master Jan 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

P0 Highest priority waiting-for-review A PR waiting for a review.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants