From e988d1d2f215a29453b76a74832e4472d6a53569 Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Thu, 11 Jul 2019 16:19:21 -0400 Subject: [PATCH 1/2] release: flipping deprecated features to be fatal-by-default Signed-off-by: Alyssa Wilk --- GOVERNANCE.md | 2 +- api/envoy/api/v2/cds.proto | 2 +- configs/envoy_double_proxy_v2.template.yaml | 8 ++++---- configs/envoy_front_proxy_v2.template.yaml | 8 ++++---- configs/envoy_service_to_service_v2.template.yaml | 12 ++++++++---- source/common/runtime/runtime_features.cc | 6 ++++++ 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 6639dbffca172..be6a65b3d21d1 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -103,7 +103,7 @@ or you can subscribe to the iCal feed [here](https://app.opsgenie.com/webcal/get following version. E.g., "1.7.0 (pending)". * Run the deprecate_versions.py script (e.g. `sh tools/deprecate_version/deprecate_version.sh 1.8.0 1.10.0`) to file tracking issues for code which can be removed. -* Run the deprecate_features.py script (e.g. `sh tools/deprecate_version/deprecate_features.sh`) +* Run the deprecate_features.py script (e.g. `sh tools/deprecate_features/deprecate_features.sh`) to make the last release's deprecated features fatal-by-default. Submit the resultant PR and send an email to envoy-announce. diff --git a/api/envoy/api/v2/cds.proto b/api/envoy/api/v2/cds.proto index 83fe4329e15ba..864290cdc42d3 100644 --- a/api/envoy/api/v2/cds.proto +++ b/api/envoy/api/v2/cds.proto @@ -188,7 +188,7 @@ message Cluster { // **This field is deprecated**. Set the // :ref:`load_assignment` field instead. // - repeated core.Address hosts = 7 [deprecated = true]; + repeated core.Address hosts = 7; // Setting this is required for specifying members of // :ref:`STATIC`, diff --git a/configs/envoy_double_proxy_v2.template.yaml b/configs/envoy_double_proxy_v2.template.yaml index 2c08332f795d8..5a0664c39294d 100644 --- a/configs/envoy_double_proxy_v2.template.yaml +++ b/configs/envoy_double_proxy_v2.template.yaml @@ -174,10 +174,10 @@ tracing: "@type": type.googleapis.com/envoy.config.trace.v2.LightstepConfig access_token_file: "/etc/envoy/lightstep_access_token" collector_cluster: lightstep_saas -runtime: - symlink_root: "/srv/runtime_data/current" - subdirectory: envoy - override_subdirectory: envoy_override +layered_runtime: + layers: + - name: root + disk_layer: { symlink_root: /srv/runtime_data/current, subdirectory: envoy } admin: access_log_path: "/var/log/envoy/admin_access.log" address: diff --git a/configs/envoy_front_proxy_v2.template.yaml b/configs/envoy_front_proxy_v2.template.yaml index 35f734f80ad2e..5433c37e056cc 100644 --- a/configs/envoy_front_proxy_v2.template.yaml +++ b/configs/envoy_front_proxy_v2.template.yaml @@ -157,10 +157,10 @@ tracing: "@type": type.googleapis.com/envoy.config.trace.v2.LightstepConfig collector_cluster: lightstep_saas access_token_file: "/etc/envoy/lightstep_access_token" -runtime: - symlink_root: /srv/runtime_data/current - subdirectory: envoy - override_subdirectory: envoy_override +layered_runtime: + layers: + - name: root + disk_layer: { symlink_root: /srv/runtime_data/current, subdirectory: envoy } admin: access_log_path: /var/log/envoy/admin_access.log address: diff --git a/configs/envoy_service_to_service_v2.template.yaml b/configs/envoy_service_to_service_v2.template.yaml index 083a8c39a2926..b432294a84046 100644 --- a/configs/envoy_service_to_service_v2.template.yaml +++ b/configs/envoy_service_to_service_v2.template.yaml @@ -543,10 +543,14 @@ tracing: "@type": type.googleapis.com/envoy.config.trace.v2.LightstepConfig access_token_file: "/etc/envoy/lightstep_access_token" collector_cluster: lightstep_saas -runtime: - symlink_root: "/srv/runtime_data/current" - subdirectory: envoy - override_subdirectory: envoy_override +layered_runtime: + layers: + - name: base + static_layer: + health_check: + min_interval: 5 + - name: root + disk_layer: { symlink_root: /srv/runtime_data/current, subdirectory: envoy } admin: access_log_path: /var/log/envoy/admin_access.log address: diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc index e9c20ff38199b..55944e8d79a01 100644 --- a/source/common/runtime/runtime_features.cc +++ b/source/common/runtime/runtime_features.cc @@ -47,6 +47,12 @@ 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.bootstrap.proto:runtime", + "envoy.deprecated_features.redis_proxy.proto:catch_all_cluster", + "envoy.deprecated_features.lds.proto:use_original_dst", + "envoy.deprecated_features.server_info.proto:max_stats", + "envoy.deprecated_features.redis_proxy.proto:cluster", + "envoy.deprecated_features.server_info.proto:max_obj_name_len", "envoy.deprecated_features.config_source.proto:UNSUPPORTED_REST_LEGACY", "envoy.deprecated_features.ext_authz.proto:use_alpha", "envoy.deprecated_features.route.proto:enabled", From 8d942c9c06b8244e7fbf5d4b07cdbf0cd58fc378 Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Mon, 15 Jul 2019 12:27:27 -0400 Subject: [PATCH 2/2] canonical config Signed-off-by: Alyssa Wilk --- configs/envoy_double_proxy_v2.template.yaml | 13 +++++++++++-- configs/envoy_front_proxy_v2.template.yaml | 13 +++++++++++-- .../envoy_service_to_service_v2.template.yaml | 17 +++++++++++------ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/configs/envoy_double_proxy_v2.template.yaml b/configs/envoy_double_proxy_v2.template.yaml index 5a0664c39294d..9cff9a40a6c72 100644 --- a/configs/envoy_double_proxy_v2.template.yaml +++ b/configs/envoy_double_proxy_v2.template.yaml @@ -175,9 +175,18 @@ tracing: access_token_file: "/etc/envoy/lightstep_access_token" collector_cluster: lightstep_saas layered_runtime: - layers: + layers: - name: root - disk_layer: { symlink_root: /srv/runtime_data/current, subdirectory: envoy } + disk_layer: + symlink_root: /srv/configset/envoydata/current + subdirectory: envoy + - name: override + disk_layer: + symlink_root: /srv/configset/envoydata/current + subdirectory: envoy_override + append_service_cluster: true + - name: admin + admin_layer: {} admin: access_log_path: "/var/log/envoy/admin_access.log" address: diff --git a/configs/envoy_front_proxy_v2.template.yaml b/configs/envoy_front_proxy_v2.template.yaml index 5433c37e056cc..c45bc1e24d0a3 100644 --- a/configs/envoy_front_proxy_v2.template.yaml +++ b/configs/envoy_front_proxy_v2.template.yaml @@ -158,9 +158,18 @@ tracing: collector_cluster: lightstep_saas access_token_file: "/etc/envoy/lightstep_access_token" layered_runtime: - layers: + layers: - name: root - disk_layer: { symlink_root: /srv/runtime_data/current, subdirectory: envoy } + disk_layer: + symlink_root: /srv/configset/envoydata/current + subdirectory: envoy + - name: override + disk_layer: + symlink_root: /srv/configset/envoydata/current + subdirectory: envoy_override + append_service_cluster: true + - name: admin + admin_layer: {} admin: access_log_path: /var/log/envoy/admin_access.log address: diff --git a/configs/envoy_service_to_service_v2.template.yaml b/configs/envoy_service_to_service_v2.template.yaml index b432294a84046..531322b3a14ba 100644 --- a/configs/envoy_service_to_service_v2.template.yaml +++ b/configs/envoy_service_to_service_v2.template.yaml @@ -544,13 +544,18 @@ tracing: access_token_file: "/etc/envoy/lightstep_access_token" collector_cluster: lightstep_saas layered_runtime: - layers: - - name: base - static_layer: - health_check: - min_interval: 5 + layers: - name: root - disk_layer: { symlink_root: /srv/runtime_data/current, subdirectory: envoy } + disk_layer: + symlink_root: /srv/configset/envoydata/current + subdirectory: envoy + - name: override + disk_layer: + symlink_root: /srv/configset/envoydata/current + subdirectory: envoy_override + append_service_cluster: true + - name: admin + admin_layer: {} admin: access_log_path: /var/log/envoy/admin_access.log address: