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.

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

Upgrade to Envoy 1.12.2 #1351

Closed
4 tasks done
Tracked by #1039
davecheney opened this issue Aug 19, 2019 · 2 comments · Fixed by #2037
Closed
4 tasks done
Tracked by #1039

Upgrade to Envoy 1.12.2 #1351

davecheney opened this issue Aug 19, 2019 · 2 comments · Fixed by #2037
Labels
priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release.
Milestone

Comments

@davecheney
Copy link
Contributor

davecheney commented Aug 19, 2019

Envoy 1.12 was released on 31/Oct.

TODO:

  • Update example/contour and test
  • Update Makefile references
  • Update site/_resources/envoy.md to note that 1.1 will require envoy 1.12.
  • Optional, if desired, back port the 1.12 change to 1.0.x and update site/_resources/envoy.md to note that 1.0.x supports Envoy 1.11.2 and 1.12.
@davecheney davecheney added this to the Unplanned milestone Aug 19, 2019
@davecheney
Copy link
Contributor Author

Moving to the unplanned milestone. We don't plan to upgrade to Envoy 1.12 for Contour 1.0 at this time.

@davecheney davecheney mentioned this issue Aug 23, 2019
2 tasks
@davecheney davecheney modified the milestones: Backlog, 1.1.0 Nov 3, 2019
@davecheney davecheney added good first issue Denotes an issue ready for a new contributor, according to the "help wanted" guidelines. help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Nov 3, 2019
davecheney added a commit to davecheney/contour that referenced this issue Nov 11, 2019
Updates projectcontour#1351

Update Envoy support matrix to mention the abortive Envoy 1.12.0 and
1.12.1 replacement.

Signed-off-by: Dave Cheney <dave@cheney.net>
@davecheney davecheney self-assigned this Nov 11, 2019
@davecheney davecheney removed good first issue Denotes an issue ready for a new contributor, according to the "help wanted" guidelines. help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. labels Nov 11, 2019
davecheney added a commit to davecheney/contour that referenced this issue Nov 11, 2019
Updates projectcontour#1351

nb. there appear to be no internal/contour, internal/e2e, or
internal/featuretest tests for header contains matching. I've raised
 projectcontour#1880 to track this.

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 11, 2019
Updates projectcontour#1351

internal/envoy offered two ways to construct a regex route matcher. The
first was from a *dag.Route via RouteMatch, the second was directly from
a string passed to RouteRegex. The latter was used by internal/e2e to
construct test fixtures, however the former didn't use RouteRegex, it
duplicated the RouteRegex logic. This makes refactoring this code to use
SafeRegex more problematic.

This PR cleans up RouteMatch to use RouteRegex directly. This isn't as
clean as I would like because of the way gRPC union types do no expose
an interface for the union value, this means we cannot pass from
RouteRegex or RoutePrefix a PathSpecifier value as the interface those
types implement is not exported -- thanks protoc, you're a pal.

Also, add a few tests for RouteRegex matching. These will be needed in
the next PR to switch to SafeRegex.

Lastly, note that the only way to create a regex dag.Route.PathCondition
is via the Ingress object whose value is actually specified to be a
ecmascript regex -- ffs.

Signed-off-by: Dave Cheney <dave@cheney.net>
jpeach pushed a commit that referenced this issue Nov 13, 2019
Updates #1351

Update Envoy support matrix to mention the abortive Envoy 1.12.0 and
1.12.1 replacement.

Signed-off-by: Dave Cheney <dave@cheney.net>
jpeach pushed a commit that referenced this issue Nov 13, 2019
Updates #1351

internal/envoy offered two ways to construct a regex route matcher. The
first was from a *dag.Route via RouteMatch, the second was directly from
a string passed to RouteRegex. The latter was used by internal/e2e to
construct test fixtures, however the former didn't use RouteRegex, it
duplicated the RouteRegex logic. This makes refactoring this code to use
SafeRegex more problematic.

This PR cleans up RouteMatch to use RouteRegex directly. This isn't as
clean as I would like because of the way gRPC union types do no expose
an interface for the union value, this means we cannot pass from
RouteRegex or RoutePrefix a PathSpecifier value as the interface those
types implement is not exported -- thanks protoc, you're a pal.

Also, add a few tests for RouteRegex matching. These will be needed in
the next PR to switch to SafeRegex.

Lastly, note that the only way to create a regex dag.Route.PathCondition
is via the Ingress object whose value is actually specified to be a
ecmascript regex -- ffs.

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 13, 2019
Updates projectcontour#1351

Signed-off-by: Dave Cheney <dave@cheney.net>
jpeach pushed a commit that referenced this issue Nov 13, 2019
Updates #1351

Signed-off-by: Dave Cheney <dave@cheney.net>
jpeach pushed a commit that referenced this issue Nov 15, 2019
Updates #1351

nb. there appear to be no internal/contour, internal/e2e, or
internal/featuretest tests for header contains matching. I've raised
 #1880 to track this.

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 18, 2019
Updates projectcontour#1351

HttpConnectionManager.IdleTimeout was deprecated in 1.11.2. Switch to
HttpConnectionManager.CommonHttpProtocolOptions.IdleTimeout.

Also, there was one case where ptypes.DurationProtocol was being used
where all the other cases uses protobuf.Duration. Make that the same as
everywhere else.

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 18, 2019
Updates projectcontour#1351

Switch path regex matching to safe regex. Refactor matcher.RegexMatcher
code to its own file and helper so it can be reused across
internal/envoy and internal/contour.

Also of note, internal/contour longestRouteFirst comparator has intimate
knowledge of RouteMatch_SafeRegex which is probably not ideal.

Signed-off-by: Dave Cheney <dave@cheney.net>
stevesloka pushed a commit that referenced this issue Nov 22, 2019
Updates #1351

Switch path regex matching to safe regex. Refactor matcher.RegexMatcher
code to its own file and helper so it can be reused across
internal/envoy and internal/contour.

Also of note, internal/contour longestRouteFirst comparator has intimate
knowledge of RouteMatch_SafeRegex which is probably not ideal.

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit that referenced this issue Nov 24, 2019
Updates #1351

HttpConnectionManager.IdleTimeout was deprecated in 1.11.2. Switch to
HttpConnectionManager.CommonHttpProtocolOptions.IdleTimeout.

Also, there was one case where ptypes.DurationProtocol was being used
where all the other cases uses protobuf.Duration. Make that the same as
everywhere else.

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 24, 2019
Updates projectcontour#1351

Prior to projectcontour#1882 the envoy package offered two ways to construct a
Prefix/Regex match -- the first was a direct call to
RoutePrefix/RouteRegex which took a string parameter, the second was
via RouteMatch which took a dag.Route object. projectcontour#1882 refactored
RouteMatch on top of RoutePrefix/RouteRegex which consolidated on one
method of constructing a regex match, projectcontour#1913 later took advatage of this
to update all uses of regex to safe regex.

However there still existed two ways to construct a matcher, one via a
direct call to RoutePrefix/RouteRegex the other via RouteMatch. It turns
out that all the test code used the former, and all the production code
used the latter, implying that RoutePrefix/RouteRegex were test helpers.

This PR removes RouteRegex/RoutePrefix and replaces their calls in test
code with helpers that construct the respective *dag.Route object and
passes that to RouteMatch.

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 25, 2019
Updates projectcontour#1351

Envoy 1.12 has deprecated the Cluster.TLSContext field, instead the
UpstreamTLSContext must be provided via a typed config attached to a
TransportSocket.

ref: https://www.envoyproxy.io/docs/envoy/v1.12.0/api-v2/api/v2/cds.proto#envoy-api-field-cluster-tls-context

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 25, 2019
Updates projectcontour#1351

Envoy 1.12 has deprecated the Cluster.TLSContext field, instead the
UpstreamTLSContext must be provided via a typed config attached to a
TransportSocket.

ref: https://www.envoyproxy.io/docs/envoy/v1.12.0/api-v2/api/v2/cds.proto#envoy-api-field-cluster-tls-context

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit that referenced this issue Nov 25, 2019
Updates #1351

Prior to #1882 the envoy package offered two ways to construct a
Prefix/Regex match -- the first was a direct call to
RoutePrefix/RouteRegex which took a string parameter, the second was
via RouteMatch which took a dag.Route object. #1882 refactored
RouteMatch on top of RoutePrefix/RouteRegex which consolidated on one
method of constructing a regex match, #1913 later took advatage of this
to update all uses of regex to safe regex.

However there still existed two ways to construct a matcher, one via a
direct call to RoutePrefix/RouteRegex the other via RouteMatch. It turns
out that all the test code used the former, and all the production code
used the latter, implying that RoutePrefix/RouteRegex were test helpers.

This PR removes RouteRegex/RoutePrefix and replaces their calls in test
code with helpers that construct the respective *dag.Route object and
passes that to RouteMatch.

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit that referenced this issue Nov 25, 2019
Updates #1351

Envoy 1.12 has deprecated the Cluster.TLSContext field, instead the
UpstreamTLSContext must be provided via a typed config attached to a
TransportSocket.

ref: https://www.envoyproxy.io/docs/envoy/v1.12.0/api-v2/api/v2/cds.proto#envoy-api-field-cluster-tls-context

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 26, 2019
Updates projectcontour#1351

Envoy 1.12 has deprecated the FilterChain.TLSContext field, instead the
DownstreamTLSContext must be provided via a typed config attached to a
TransportSocket.

ref: https://www.envoyproxy.io/docs/envoy/v1.12.0/api-v2/api/v2/listener/listener.proto#envoy-api-field-listener-filterchain-tls-context

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 26, 2019
Updates projectcontour#1351

Envoy 1.12 has deprecated the FilterChain.TLSContext field, instead the
DownstreamTLSContext must be provided via a typed config attached to a
TransportSocket.

ref: https://www.envoyproxy.io/docs/envoy/v1.12.0/api-v2/api/v2/listener/listener.proto#envoy-api-field-listener-filterchain-tls-context

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Nov 27, 2019
Updates projectcontour#1351

Envoy 1.12 has deprecated the FilterChain.TLSContext field, instead the
DownstreamTLSContext must be provided via a typed config attached to a
TransportSocket.

ref: https://www.envoyproxy.io/docs/envoy/v1.12.0/api-v2/api/v2/listener/listener.proto#envoy-api-field-listener-filterchain-tls-context

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit that referenced this issue Nov 27, 2019
Updates #1351

Envoy 1.12 has deprecated the FilterChain.TLSContext field, instead the
DownstreamTLSContext must be provided via a typed config attached to a
TransportSocket.

ref: https://www.envoyproxy.io/docs/envoy/v1.12.0/api-v2/api/v2/listener/listener.proto#envoy-api-field-listener-filterchain-tls-context

Signed-off-by: Dave Cheney <dave@cheney.net>
@davecheney
Copy link
Contributor Author

The envoy xDS deprecations have been addressed. The remainder of this ticket can happen closer to the release date.

@davecheney davecheney removed their assignment Nov 28, 2019
@davecheney davecheney changed the title Upgrade to Envoy 1.12 Upgrade to Envoy 1.12.2 Nov 28, 2019
davecheney added a commit to davecheney/contour that referenced this issue Dec 9, 2019
Updates projectcontour#1351

Do not merge til 10th of December 2019 at 10:00 PDT (18:00 GMT).

https://groups.google.com/forum/#!msg/envoy-announce/Z4_JwSksPpY/aUGfjc86BwAJ

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Dec 9, 2019
Updates projectcontour#1351

Do not merge til 10th of December 2019 at 10:00 PDT (18:00 GMT).

https://groups.google.com/forum/#!msg/envoy-announce/Z4_JwSksPpY/aUGfjc86BwAJ

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit that referenced this issue Dec 10, 2019
Updates #1351

Do not merge til 10th of December 2019 at 10:00 PDT (18:00 GMT).

https://groups.google.com/forum/#!msg/envoy-announce/Z4_JwSksPpY/aUGfjc86BwAJ

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Dec 10, 2019
Fixes projectcontour#1351

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit to davecheney/contour that referenced this issue Dec 10, 2019
Fixes projectcontour#1351

Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney added a commit that referenced this issue Dec 10, 2019
Fixes #1351

Signed-off-by: Dave Cheney <dave@cheney.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant