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

release: flipping deprecated features to fatal-by-default #6509

Merged
merged 5 commits into from
Apr 10, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/envoy/api/v2/cds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,9 @@ message Cluster {
//
// .. attention::
//
// **This field is deprecated**. Set the
// :ref:`load_assignment<envoy_api_field_Cluster.load_assignment>` field instead.
// **This field is outdated**. Setting the
// :ref:`load_assignment<envoy_api_field_Cluster.load_assignment>` field is
// preferred.
//
repeated core.Address hosts = 7 [deprecated = true];

Expand Down
3 changes: 2 additions & 1 deletion api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ message TcpProxy {
// list of strings with each string in CIDR notation. Source and destination ports are
// specified as single strings containing a comma-separated list of ports and/or port ranges.
//
DeprecatedV1 deprecated_v1 = 6 [deprecated = true];
// Deprecation pending https://github.com/envoyproxy/envoy/issues/4457
DeprecatedV1 deprecated_v1 = 6;

// The maximum number of unsuccessful connection attempts that will be made before
// giving up. If the parameter is not specified, 1 connection attempt will be made.
Expand Down
5 changes: 5 additions & 0 deletions source/common/runtime/runtime_features.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ constexpr const char* disallowed_features[] = {
// Acts as both a test entry for deprecated.proto and a marker for the Envoy
// deprecation scripts.
"envoy.deprecated_features.deprecated.proto:is_deprecated_fatal",
"envoy.deprecated_features.config_source.proto:UNSUPPORTED_REST_LEGACY",
"envoy.deprecated_features.ext_authz.proto:use_alpha",
"envoy.deprecated_features.route.proto:enabled",
"envoy.deprecated_features.fault.proto:type",
"envoy.deprecated_features.route.proto:runtime_key",
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: this could be sorted alphabetically.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we could locally, but tdb if we want to have these grouped by release rather than alphabetical overall. I'm going to merge without fixing just because I want it have a day or two where they're flipped and I'm around for questions and we can sort out ordering next release or in a follow-up?

};

RuntimeFeatures::RuntimeFeatures() {
Expand Down