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.

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

remove contour xDS server implementation #6568

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

remove contour xDS server implementation #6568

wants to merge 3 commits into from
+24 −1,945

Conversation

skriss
Copy link
Member

@skriss skriss commented Jul 19, 2024 •
edited
Loading

Closes #2134.

@skriss skriss added this to the 1.31.0 milestone Jul 19, 2024
@codecov Codecov
Copy link

codecov bot commented Jul 19, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 50.00000% with 5 lines in your changes missing coverage. Please review.

Project coverage is 80.70%. Comparing base (3cac9fc) to head (57a6c34).
Report is 12 commits behind head on main.

Files with missing lines Patch % Lines
cmd/contour/serve.go 0.00% 5 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #6568      +/-   ##
==========================================
- Coverage   81.05%   80.70%   -0.36%     
==========================================
  Files         133      130       -3     
  Lines       20026    19738     -288     
==========================================
- Hits        16232    15929     -303     
- Misses       3500     3519      +19     
+ Partials      294      290       -4
Files with missing lines Coverage Δ
cmd/contour/servecontext.go 84.34% <ø> (-0.18%) ⬇️
internal/contourconfig/contourconfiguration.go 98.17% <ø> (-0.02%) ⬇️
internal/xds/v3/callbacks.go 100.00% <100.00%> (ø)
internal/xdscache/v3/cluster.go 100.00% <ø> (ø)
internal/xdscache/v3/endpointslicetranslator.go 74.51% <ø> (-7.27%) ⬇️
internal/xdscache/v3/endpointstranslator.go 87.45% <ø> (-1.68%) ⬇️
internal/xdscache/v3/listener.go 91.54% <ø> (-0.45%) ⬇️
internal/xdscache/v3/route.go 96.90% <ø> (-0.56%) ⬇️
internal/xdscache/v3/runtime.go 97.43% <ø> (-2.57%) ⬇️
internal/xdscache/v3/secret.go 66.66% <ø> (-10.70%) ⬇️
... and 2 more

... and 2 files with indirect coverage changes

@skriss skriss force-pushed the pr-rm-contour-xds branch 2 times, most recently from 0a90610 to 70b2eff Compare August 1, 2024 14:36
@skriss skriss force-pushed the pr-rm-contour-xds branch from 70b2eff to 88cf463 Compare January 8, 2025 17:22
skriss added 2 commits January 8, 2025 12:32
@skriss
remove contour xDS server implementation
1ffde8b 
Closes projectcontour#2134.

Signed-off-by: Steve Kriss <[email protected]>
@skriss
changelog
cef7058 
Signed-off-by: Steve Kriss <[email protected]>
@skriss skriss force-pushed the pr-rm-contour-xds branch from 88cf463 to cef7058 Compare January 8, 2025 17:37
@skriss skriss added the release-note/deprecation A deprecation or removal that needs about a paragraph of explanation in the release notes. label Jan 8, 2025
@skriss skriss marked this pull request as ready for review January 8, 2025 17:39
@skriss skriss requested a review from a team as a code owner January 8, 2025 17:39
@skriss skriss requested review from tsaarni and sunjayBhatia and removed request for a team January 8, 2025 17:39
@skriss
Copy link
Member Author

skriss commented Jan 8, 2025

Calling this one ready for review, are others comfortable moving forward with this cleanup?

@sunjayBhatia sunjayBhatia requested review from a team, rajatvig and clayton-gonsalves and removed request for a team January 8, 2025 17:54
@sunjayBhatia sunjayBhatia removed this from the 1.31.0 milestone Jan 13, 2025
@sunjayBhatia
Copy link
Member

Calling this one ready for review, are others comfortable moving forward with this cleanup?

yep I'll take a look!

sunjayBhatia
sunjayBhatia reviewed Jan 13, 2025
View reviewed changes
pkg/config/parameters.go
// the `contour` xDS server implementation is removed.
XDSServerType ServerType `yaml:"xds-server-type,omitempty"`
}
type ServerParameters struct{}
Copy link
Member

@sunjayBhatia sunjayBhatia Jan 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

this is now empty but maybe useful in the future? for migrating to ADS/Delta?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I think that's why I left it in place, may be useful to hold future server-level params.

@skriss
code review
57a6c34 
Signed-off-by: Steve Kriss <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sunjayBhatia sunjayBhatia sunjayBhatia left review comments

@tsaarni tsaarni Awaiting requested review from tsaarni tsaarni is a code owner automatically assigned from projectcontour/maintainers

@rajatvig rajatvig Awaiting requested review from rajatvig rajatvig was automatically assigned from projectcontour/contour-reviewers

@clayton-gonsalves clayton-gonsalves Awaiting requested review from clayton-gonsalves clayton-gonsalves was automatically assigned from projectcontour/contour-reviewers

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
release-note/deprecation A deprecation or removal that needs about a paragraph of explanation in the release notes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Replace GRPC server with envoy's go-control-plane
2 participants
@skriss @sunjayBhatia