Skip to content

Conversation

stevesloka
Copy link
Member

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]

@stevesloka stevesloka added this to the 1.11.0 milestone Nov 9, 2020
@codecov
Copy link

codecov bot commented Nov 9, 2020

Codecov Report

Merging #3111 (43c3c7c) into main (315ada8) will decrease coverage by 0.42%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            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     
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% <ø> (ø)
internal/envoy/bootstrap.go 47.82% <ø> (ø)

@skriss
Copy link
Member

skriss commented Nov 9, 2020

We should update https://github.com/projectcontour/contour/blob/main/cmd/contour/bootstrap.go#L37 and the associated documentation to default to v3 as well.

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.

+5, -1395, impressive!

LGTM.

@stevesloka
Copy link
Member Author

@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.

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.

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))
Copy link
Member

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.

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 essentially the flag does nothing now until we need to support say v4.

Copy link
Contributor

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]>
@stevesloka stevesloka merged commit 2885e38 into projectcontour:main Nov 10, 2020
@stevesloka stevesloka deleted the dropv2XDSSupport branch November 10, 2020 19:58
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.

4 participants