Thanks to visit codestin.com
Credit goes to github.com

Skip to content

(release 1-14) Cherrypick #3834 #3964

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.

Sign up for GitHub

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

Jump to bottom
Merged
skriss merged 2 commits into from
Aug 25, 2021
Merged

(release 1-14) Cherrypick #3834 #3964

skriss merged 2 commits into from
Aug 25, 2021

Conversation

@stevesloka
Copy link
Member

@stevesloka stevesloka commented Aug 24, 2021

Move to Envoy Admin over unix socket to mitigate security issues with external name services.

Signed-off-by: Steve Sloka [email protected]

@stevesloka
Cherrypick projectcontour#3834
982988f 
Move to Envoy Admin over unix socket to mitigate security issues with external name services.

Signed-off-by: Steve Sloka <[email protected]>
@stevesloka stevesloka requested a review from a team as a code owner August 24, 2021 20:31
@stevesloka stevesloka requested review from skriss and youngnick and removed request for a team August 24, 2021 20:31
@stevesloka stevesloka mentioned this pull request Aug 24, 2021
Closed
@stevesloka stevesloka changed the title Cherrypick #3834 Cherrypick #3834 to Contour v1.14 Aug 24, 2021
@stevesloka stevesloka mentioned this pull request Aug 24, 2021
Closed
@codecov
Copy link

codecov bot commented Aug 24, 2021 •
edited
Loading

Codecov Report

Merging #3964 (efa0290) into release-1.14 (78d000e) will increase coverage by 0.14%.
The diff coverage is 84.00%.

❗ Current head efa0290 differs from pull request most recent head 7994b51. Consider uploading reports for the commit 7994b51 to get more accurate results
Impacted file tree graph

@@               Coverage Diff                @@
##           release-1.14    #3964      +/-   ##
================================================
+ Coverage         76.13%   76.28%   +0.14%     
================================================
  Files               100      100              
  Lines              7815     7919     +104     
================================================
+ Hits               5950     6041      +91     
- Misses             1743     1756      +13     
  Partials            122      122
Impacted Files Coverage Δ
cmd/contour/bootstrap.go 0.00% <0.00%> (ø)
cmd/contour/contour.go 0.00% <0.00%> (ø)
cmd/contour/serve.go 0.00% <0.00%> (ø)
cmd/contour/shutdownmanager.go 29.57% <0.00%> (-2.74%) ⬇️
internal/envoy/bootstrap.go 55.88% <100.00%> (+5.88%) ⬆️
internal/envoy/v3/bootstrap.go 91.90% <100.00%> (ø)
internal/envoy/v3/listener.go 98.38% <100.00%> (+0.03%) ⬆️
internal/envoy/v3/stats.go 100.00% <100.00%> (ø)
internal/featuretests/v3/envoy.go 100.00% <100.00%> (ø)
internal/featuretests/v3/featuretests.go 86.81% <100.00%> (+0.18%) ⬆️
... and 1 more

@skriss
Copy link
Member

skriss commented Aug 24, 2021 •
edited
Loading

@stevesloka I know the E2E stuff didn't cherry-pick cleanly at all, what about the rest of the code? Any files to focus on for review?

@stevesloka
Copy link
Member Author

stevesloka commented Aug 24, 2021

@skriss there are a couple places that are the main bits to look at:

  1. Bootstrap to use the socket instead of an ip address
  2. Shutdown manager uses socket mapped through volume
  3. Static listener gets created in Contour xDS to expose read-only endpoints in Envoy
  4. Example yaml changes to use the socket & volumes

skriss
skriss approved these changes Aug 24, 2021
View reviewed changes
Copy link
Member

@skriss skriss left a comment

Choose a reason for hiding this comment

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

LGTM (looked at the diffs of all non-test files compared to #3934)

@sunjayBhatia
Copy link
Member

sunjayBhatia commented Aug 24, 2021 •
edited
Loading

One issue is that on this branch, the manifests have contour image tag v1.14.1, had to manually change that locally to actually test the image in this pr

  • envoy listening on port 9001, admin pages accessible via port forward, no writeable pages available
  • envoy listening on socket all that seems to be working 👍🏽
  • yamls look good other than the image tag

@sunjayBhatia
Copy link
Member

sunjayBhatia commented Aug 24, 2021

made a PR for debugging: #3971

@skriss
Copy link
Member

skriss commented Aug 24, 2021

FYI saw what I think are the same CI issues in my Envoy PRs against release-1.15 and release-1.14: https://github.com/projectcontour/contour/pull/3969/checks?check_run_id=3416335030 and https://github.com/projectcontour/contour/pull/3970/checks?check_run_id=3416341477

youngnick
youngnick approved these changes Aug 25, 2021
View reviewed changes
Copy link
Member

@youngnick youngnick left a comment

Choose a reason for hiding this comment

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

This LGTM, let's wait for a report from @sunjayBhatia as to if there are any fixes for the CI failures before merging though.

@stevesloka stevesloka changed the title Cherrypick #3834 to Contour v1.14 (release 1-14) Cherrypick #3834 Aug 25, 2021
@skriss
Copy link
Member

skriss commented Aug 25, 2021

Alright, CI issues have been fixed on this branch and this is all green 🎉

@skriss skriss merged commit 2770d9a into projectcontour:release-1.14 Aug 25, 2021
sunjayBhatia pushed a commit to sunjayBhatia/contour that referenced this pull request Aug 25, 2021
@stevesloka @sunjayBhatia
Cherrypick projectcontour#3834 (projectcontour#3964)
6844da6 
Move to Envoy Admin over unix socket to mitigate security issues
with external name services.

Signed-off-by: Sunjay Bhatia <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@skriss skriss skriss approved these changes

+1 more reviewer

@youngnick youngnick youngnick approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@stevesloka @skriss @sunjayBhatia @youngnick