release: flipping deprecated features to be fatal-by-default (#7549)

Signed-off-by: Alyssa Wilk <[email protected]>

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`)
  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.
 

api/envoy/api/v2/cds.proto

@@ -188,7 +188,7 @@ message Cluster {
  // **This field is deprecated**. Set the
  // :ref:`load_assignment<envoy_api_field_Cluster.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<envoy_api_enum_value_Cluster.DiscoveryType.STATIC>`,

configs/envoy_double_proxy_v2.template.yaml

@@ -174,10 +174,19 @@ 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/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:

configs/envoy_front_proxy_v2.template.yaml

@@ -157,10 +157,19 @@ 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/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:

configs/envoy_service_to_service_v2.template.yaml

@@ -543,10 +543,19 @@ 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/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:

source/common/runtime/runtime_features.cc

@@ -42,6 +42,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",