From 27815eeb2aa204abe464da066be316848f882f1f Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Mon, 8 Apr 2019 08:58:03 -0400 Subject: [PATCH 1/4] release: flipping deprecated features to be fatal-by-default Signed-off-by: Alyssa Wilk --- source/common/runtime/runtime_features.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc index 7e63701b1c88..b654148f87c9 100644 --- a/source/common/runtime/runtime_features.cc +++ b/source/common/runtime/runtime_features.cc @@ -47,6 +47,14 @@ 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.lds.proto:use_original_dst", + "envoy.deprecated_features.tcp_proxy.proto:deprecated_v1", + "envoy.deprecated_features.fault.proto:type", + "envoy.deprecated_features.cds.proto:hosts", + "envoy.deprecated_features.route.proto:runtime_key", }; RuntimeFeatures::RuntimeFeatures() { From b681a6125011a25b6830b8cd363a683796e9ec61 Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Mon, 8 Apr 2019 09:00:44 -0400 Subject: [PATCH 2/4] manually reverting fields from #5355 Signed-off-by: Alyssa Wilk --- source/common/runtime/runtime_features.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc index b654148f87c9..5305e2feec35 100644 --- a/source/common/runtime/runtime_features.cc +++ b/source/common/runtime/runtime_features.cc @@ -50,7 +50,6 @@ constexpr const char* disallowed_features[] = { "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.lds.proto:use_original_dst", "envoy.deprecated_features.tcp_proxy.proto:deprecated_v1", "envoy.deprecated_features.fault.proto:type", "envoy.deprecated_features.cds.proto:hosts", From 184cb43828d24f52feb8334b755f174389e393d3 Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Tue, 9 Apr 2019 12:04:29 -0400 Subject: [PATCH 3/4] reinstating hosts, tcp proxy deprecated v1 Signed-off-by: Alyssa Wilk --- api/envoy/api/v2/cds.proto | 5 +++-- api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto | 3 ++- source/common/runtime/runtime_features.cc | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/envoy/api/v2/cds.proto b/api/envoy/api/v2/cds.proto index e13f8dc77186..670cf5767609 100644 --- a/api/envoy/api/v2/cds.proto +++ b/api/envoy/api/v2/cds.proto @@ -184,8 +184,9 @@ message Cluster { // // .. attention:: // - // **This field is deprecated**. Set the - // :ref:`load_assignment` field instead. + // **This field is outdated**. Setting the + // :ref:`load_assignment` field is + // preferred. // repeated core.Address hosts = 7 [deprecated = true]; diff --git a/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto b/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto index 12ce0d275789..9eb8f4f07817 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto +++ b/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto @@ -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. diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc index 5305e2feec35..7ea7af077bc5 100644 --- a/source/common/runtime/runtime_features.cc +++ b/source/common/runtime/runtime_features.cc @@ -50,9 +50,7 @@ constexpr const char* disallowed_features[] = { "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.tcp_proxy.proto:deprecated_v1", "envoy.deprecated_features.fault.proto:type", - "envoy.deprecated_features.cds.proto:hosts", "envoy.deprecated_features.route.proto:runtime_key", }; From 40bdb13d9827fced166869adf7cec801bac43a2e Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Tue, 9 Apr 2019 12:14:00 -0400 Subject: [PATCH 4/4] hosts -> deprecated but not fatal per envoy call Signed-off-by: Alyssa Wilk --- api/envoy/api/v2/cds.proto | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/api/envoy/api/v2/cds.proto b/api/envoy/api/v2/cds.proto index 670cf5767609..e13f8dc77186 100644 --- a/api/envoy/api/v2/cds.proto +++ b/api/envoy/api/v2/cds.proto @@ -184,9 +184,8 @@ message Cluster { // // .. attention:: // - // **This field is outdated**. Setting the - // :ref:`load_assignment` field is - // preferred. + // **This field is deprecated**. Set the + // :ref:`load_assignment` field instead. // repeated core.Address hosts = 7 [deprecated = true];