-
Notifications
You must be signed in to change notification settings - Fork 702
internal: Drop support for v2 xDS resource version #3111
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
Conversation
Codecov Report
@@ Coverage Diff @@
## main #3111 +/- ##
==========================================
- Coverage 73.69% 73.26% -0.43%
==========================================
Files 103 102 -1
Lines 6382 6184 -198
==========================================
- Hits 4703 4531 -172
+ Misses 1577 1552 -25
+ Partials 102 101 -1
|
We should update https://github.com/projectcontour/contour/blob/main/cmd/contour/bootstrap.go#L37 and the associated documentation to default to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+5, -1395, impressive!
LGTM.
062deb7
to
acdf947
Compare
@skriss I updated the default bootstrap value, thanks, I missed that. Also I removed the flag from the initContainer since it's not needed anymore. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need to update the docs for the flag too: https://github.com/projectcontour/contour/blob/main/site/docs/main/configuration.md#bootstrap-config-file
Otherwise LGTM.
bootstrap.Flag("envoy-key-file", "Client key filename for Envoy secure xDS gRPC communication.").Envar("ENVOY_KEY_FILE").StringVar(&config.GrpcClientKey) | ||
bootstrap.Flag("namespace", "The namespace the Envoy container will run in.").Envar("CONTOUR_NAMESPACE").Default("projectcontour").StringVar(&config.Namespace) | ||
bootstrap.Flag("xds-resource-version", "The versions of the xDS resources to request from Contour.").Default("v2").StringVar((*string)(&config.XDSResourceVersion)) | ||
bootstrap.Flag("xds-resource-version", "The versions of the xDS resources to request from Contour.").Default("v3").StringVar((*string)(&config.XDSResourceVersion)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so I guess we're now ignoring this flag and just automatically serving v3 only, right? I guess that's fine, maybe worth a callout in docs or help text though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah essentially the flag does nothing now until we need to support say v4.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm way late to this party, but I agree that keeping the flag makes sense. Do you think that emitting an error for --xds-resource-version=v2
is worth consideration?
Drop support for xDS v3 resource version by changing the default boostrap resource version to v3 and removing the v2 xDS resource server. Updates projectcontour#1898 Signed-off-by: Steve Sloka <[email protected]>
acdf947
to
43c3c7c
Compare
Drop support for xDS v3 resource version by changing the default
boostrap resource version to v3 and removing the v2 xDS resource server.
Updates #1898
Signed-off-by: Steve Sloka [email protected]