config: Deprecate opaque Struct config, again.

api/envoy/api/v2/cds.proto

@@ -610,7 +610,7 @@ message Cluster {
   // for upstream connections. The key should match the extension filter name, such as
   // "envoy.filters.network.thrift_proxy". See the extension's documentation for details on
   // specific options.
-  map<string, google.protobuf.Struct> extension_protocol_options = 35;
+  map<string, google.protobuf.Struct> extension_protocol_options = 35 [deprecated = true];
 
   // The extension_protocol_options field is used to provide extension-specific protocol options
   // for upstream connections. The key should match the extension filter name, such as
@@ -810,7 +810,7 @@ message LoadBalancingPolicy {
 
     // Optional config for the LB policy.
     // No more than one of these two fields may be populated.
-    google.protobuf.Struct config = 2;
+    google.protobuf.Struct config = 2 [deprecated = true];
 
     google.protobuf.Any typed_config = 3;
   }

api/envoy/api/v2/core/base.proto

@@ -240,7 +240,7 @@ message TransportSocket {
   // Implementation specific configuration which depends on the implementation being instantiated.
   // See the supported transport socket implementations for further documentation.
   oneof config_type {
-    google.protobuf.Struct config = 2;
+    google.protobuf.Struct config = 2 [deprecated = true];
 
     google.protobuf.Any typed_config = 3;
   }

api/envoy/api/v2/core/grpc_service.proto

@@ -80,7 +80,7 @@ message GrpcService {
         string name = 1;
 
         oneof config_type {
-          google.protobuf.Struct config = 2;
+          google.protobuf.Struct config = 2 [deprecated = true];
 
           google.protobuf.Any typed_config = 3;
         }

api/envoy/api/v2/core/health_check.proto

@@ -157,7 +157,7 @@ message HealthCheck {
     // A custom health checker specific configuration which depends on the custom health checker
     // being instantiated. See :api:`envoy/config/health_checker` for reference.
     oneof config_type {
-      google.protobuf.Struct config = 2;
+      google.protobuf.Struct config = 2 [deprecated = true];
 
       google.protobuf.Any typed_config = 3;
     }

api/envoy/api/v2/listener/listener.proto

@@ -31,7 +31,7 @@ message Filter {
   // Filter specific configuration which depends on the filter being
   // instantiated. See the supported filters for further documentation.
   oneof config_type {
-    google.protobuf.Struct config = 2;
+    google.protobuf.Struct config = 2 [deprecated = true];
 
     google.protobuf.Any typed_config = 4;
   }
@@ -212,7 +212,7 @@ message ListenerFilter {
   // Filter specific configuration which depends on the filter being instantiated.
   // See the supported filters for further documentation.
   oneof config_type {
-    google.protobuf.Struct config = 2;
+    google.protobuf.Struct config = 2 [deprecated = true];
 
     google.protobuf.Any typed_config = 3;
   }

api/envoy/api/v2/route/route.proto

@@ -117,7 +117,7 @@ message VirtualHost {
   // *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
   // specific; see the :ref:`HTTP filter documentation <config_http_filters>`
   // for if and how it is utilized.
-  map<string, google.protobuf.Struct> per_filter_config = 12;
+  map<string, google.protobuf.Struct> per_filter_config = 12 [deprecated = true];
 
   // The per_filter_config field can be used to provide virtual host-specific
   // configurations for filters. The key should match the filter name, such as
@@ -197,7 +197,7 @@ message Route {
   // *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
   // specific; see the :ref:`HTTP filter documentation <config_http_filters>` for
   // if and how it is utilized.
-  map<string, google.protobuf.Struct> per_filter_config = 8;
+  map<string, google.protobuf.Struct> per_filter_config = 8 [deprecated = true];
 
   // The per_filter_config field can be used to provide route-specific
   // configurations for filters. The key should match the filter name, such as
@@ -303,7 +303,7 @@ message WeightedCluster {
     // *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
     // specific; see the :ref:`HTTP filter documentation <config_http_filters>`
     // for if and how it is utilized.
-    map<string, google.protobuf.Struct> per_filter_config = 8;
+    map<string, google.protobuf.Struct> per_filter_config = 8 [deprecated = true];
 
     // The per_filter_config field can be used to provide weighted cluster-specific
     // configurations for filters. The key should match the filter name, such as
@@ -869,7 +869,7 @@ message RetryPolicy {
     string name = 1 [(validate.rules).string = {min_bytes: 1}];
 
     oneof config_type {
-      google.protobuf.Struct config = 2;
+      google.protobuf.Struct config = 2 [deprecated = true];
 
       google.protobuf.Any typed_config = 3;
     }
@@ -879,7 +879,7 @@ message RetryPolicy {
     string name = 1 [(validate.rules).string = {min_bytes: 1}];
 
     oneof config_type {
-      google.protobuf.Struct config = 2;
+      google.protobuf.Struct config = 2 [deprecated = true];
 
       google.protobuf.Any typed_config = 3;
     }

api/envoy/api/v3alpha/cds.proto

@@ -449,9 +449,9 @@ message Cluster {
     google.protobuf.Duration max_interval = 2 [(validate.rules).duration = {gt {nanos: 1000000}}];
   }
 
-  reserved 12, 15, 11;
+  reserved 12, 15, 11, 35;
 
-  reserved "tls_context";
+  reserved "tls_context", "extension_protocol_options";
 
   // Configuration to use different transport sockets for different endpoints.
   // The entry of *envoy.transport_socket* in the
@@ -595,12 +595,6 @@ message Cluster {
   // connections to happen over plain text.
   core.Http2ProtocolOptions http2_protocol_options = 14;
 
-  // The extension_protocol_options field is used to provide extension-specific protocol options
-  // for upstream connections. The key should match the extension filter name, such as
-  // "envoy.filters.network.thrift_proxy". See the extension's documentation for details on
-  // specific options.
-  map<string, google.protobuf.Struct> extension_protocol_options = 35;
-
   // The extension_protocol_options field is used to provide extension-specific protocol options
   // for upstream connections. The key should match the extension filter name, such as
   // "envoy.filters.network.thrift_proxy". See the extension's documentation for details on
@@ -794,13 +788,13 @@ message Cluster {
 // type LoadBalancingPolicy that specifies the child policy.
 message LoadBalancingPolicy {
   message Policy {
+    reserved 2;
+
+    reserved "config";
+
     // Required. The name of the LB policy.
     string name = 1;
 
-    // Optional config for the LB policy.
-    // No more than one of these two fields may be populated.
-    google.protobuf.Struct config = 2;
-
     google.protobuf.Any typed_config = 3;
   }
 

api/envoy/api/v3alpha/core/base.proto

@@ -234,15 +234,17 @@ message AsyncDataSource {
 // empty, a default transport socket implementation and configuration will be
 // chosen based on the platform and existence of tls_context.
 message TransportSocket {
+  reserved 2;
+
+  reserved "config";
+
   // The name of the transport socket to instantiate. The name must match a supported transport
   // socket implementation.
   string name = 1 [(validate.rules).string = {min_bytes: 1}];
 
   // Implementation specific configuration which depends on the implementation being instantiated.
   // See the supported transport socket implementations for further documentation.
   oneof config_type {
-    google.protobuf.Struct config = 2;
-
     google.protobuf.Any typed_config = 3;
   }
 }

api/envoy/api/v3alpha/core/grpc_service.proto

@@ -77,11 +77,13 @@ message GrpcService {
       }
 
       message MetadataCredentialsFromPlugin {
+        reserved 2;
+
+        reserved "config";
+
         string name = 1;
 
         oneof config_type {
-          google.protobuf.Struct config = 2;
-
           google.protobuf.Any typed_config = 3;
         }
       }

api/envoy/api/v3alpha/core/health_check.proto

@@ -151,14 +151,16 @@ message HealthCheck {
 
   // Custom health check.
   message CustomHealthCheck {
+    reserved 2;
+
+    reserved "config";
+
     // The registered name of the custom health checker.
     string name = 1 [(validate.rules).string = {min_bytes: 1}];
 
     // A custom health checker specific configuration which depends on the custom health checker
     // being instantiated. See :api:`envoy/config/health_checker` for reference.
     oneof config_type {
-      google.protobuf.Struct config = 2;
-
       google.protobuf.Any typed_config = 3;
     }
   }

api/envoy/api/v3alpha/listener/listener.proto

@@ -19,7 +19,9 @@ import "validate/validate.proto";
 // Listener :ref:`configuration overview <config_listeners>`
 
 message Filter {
-  reserved 3;
+  reserved 3, 2;
+
+  reserved "config";
 
   // The name of the filter to instantiate. The name must match a
   // :ref:`supported filter <config_network_filters>`.
@@ -28,8 +30,6 @@ message Filter {
   // Filter specific configuration which depends on the filter being
   // instantiated. See the supported filters for further documentation.
   oneof config_type {
-    google.protobuf.Struct config = 2;
-
     google.protobuf.Any typed_config = 4;
   }
 }
@@ -198,15 +198,17 @@ message FilterChain {
 }
 
 message ListenerFilter {
+  reserved 2;
+
+  reserved "config";
+
   // The name of the filter to instantiate. The name must match a
   // :ref:`supported filter <config_listener_filters>`.
   string name = 1 [(validate.rules).string = {min_bytes: 1}];
 
   // Filter specific configuration which depends on the filter being instantiated.
   // See the supported filters for further documentation.
   oneof config_type {
-    google.protobuf.Struct config = 2;
-
     google.protobuf.Any typed_config = 3;
   }
 }

api/envoy/api/v3alpha/route/route.proto

@@ -43,7 +43,9 @@ message VirtualHost {
     ALL = 2;
   }
 
-  reserved 9;
+  reserved 9, 12;
+
+  reserved "per_filter_config";
 
   // The logical name of the virtual host. This is used when emitting certain
   // statistics but is not relevant for routing.
@@ -112,13 +114,6 @@ message VirtualHost {
   // Indicates that the virtual host has a CORS policy.
   CorsPolicy cors = 8;
 
-  // The per_filter_config field can be used to provide virtual host-specific
-  // configurations for filters. The key should match the filter name, such as
-  // *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
-  // specific; see the :ref:`HTTP filter documentation <config_http_filters>`
-  // for if and how it is utilized.
-  map<string, google.protobuf.Struct> per_filter_config = 12;
-
   // The per_filter_config field can be used to provide virtual host-specific
   // configurations for filters. The key should match the filter name, such as
   // *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
@@ -161,7 +156,9 @@ message VirtualHost {
 //   <envoy_api_msg_api.v3alpha.route.HeaderMatcher>`.
 // [#next-free-field: 17]
 message Route {
-  reserved 6;
+  reserved 6, 8;
+
+  reserved "per_filter_config";
 
   // Name for the route.
   string name = 14;
@@ -192,13 +189,6 @@ message Route {
   // Decorator for the matched route.
   Decorator decorator = 5;
 
-  // The per_filter_config field can be used to provide route-specific
-  // configurations for filters. The key should match the filter name, such as
-  // *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
-  // specific; see the :ref:`HTTP filter documentation <config_http_filters>` for
-  // if and how it is utilized.
-  map<string, google.protobuf.Struct> per_filter_config = 8;
-
   // The per_filter_config field can be used to provide route-specific
   // configurations for filters. The key should match the filter name, such as
   // *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
@@ -251,7 +241,9 @@ message Route {
 message WeightedCluster {
   // [#next-free-field: 11]
   message ClusterWeight {
-    reserved 7;
+    reserved 7, 8;
+
+    reserved "per_filter_config";
 
     // Name of the upstream cluster. The cluster must exist in the
     // :ref:`cluster manager configuration <config_cluster_manager>`.
@@ -299,13 +291,6 @@ message WeightedCluster {
     // through the enclosing :ref:`envoy_api_msg_route.RouteAction`.
     repeated string response_headers_to_remove = 6;
 
-    // The per_filter_config field can be used to provide weighted cluster-specific
-    // configurations for filters. The key should match the filter name, such as
-    // *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
-    // specific; see the :ref:`HTTP filter documentation <config_http_filters>`
-    // for if and how it is utilized.
-    map<string, google.protobuf.Struct> per_filter_config = 8;
-
     // The per_filter_config field can be used to provide weighted cluster-specific
     // configurations for filters. The key should match the filter name, such as
     // *envoy.buffer* for the HTTP buffer filter. Use of this field is filter
@@ -820,21 +805,25 @@ message RouteAction {
 // [#next-free-field: 11]
 message RetryPolicy {
   message RetryPriority {
+    reserved 2;
+
+    reserved "config";
+
     string name = 1 [(validate.rules).string = {min_bytes: 1}];
 
     oneof config_type {
-      google.protobuf.Struct config = 2;
-
       google.protobuf.Any typed_config = 3;
     }
   }
 
   message RetryHostPredicate {
+    reserved 2;
+
+    reserved "config";
+
     string name = 1 [(validate.rules).string = {min_bytes: 1}];
 
     oneof config_type {
-      google.protobuf.Struct config = 2;
-
       google.protobuf.Any typed_config = 3;
     }
   }

api/envoy/config/bootstrap/v3alpha/BUILD

@@ -10,7 +10,7 @@ api_proto_package(
         "//envoy/api/v3alpha/auth:pkg",
         "//envoy/api/v3alpha/core:pkg",
         "//envoy/config/metrics/v3alpha:pkg",
-        "//envoy/config/overload/v2alpha:pkg",
+        "//envoy/config/overload/v3alpha:pkg",
         "//envoy/config/trace/v3alpha:pkg",
     ],
 )

api/envoy/config/bootstrap/v3alpha/bootstrap.proto

@@ -13,7 +13,7 @@ import "envoy/api/v3alpha/core/base.proto";
 import "envoy/api/v3alpha/core/config_source.proto";
 import "envoy/api/v3alpha/lds.proto";
 import "envoy/config/metrics/v3alpha/stats.proto";
-import "envoy/config/overload/v2alpha/overload.proto";
+import "envoy/config/overload/v3alpha/overload.proto";
 import "envoy/config/trace/v3alpha/trace.proto";
 
 import "google/protobuf/duration.proto";
@@ -126,7 +126,7 @@ message Bootstrap {
   Admin admin = 12;
 
   // Optional overload manager configuration.
-  overload.v2alpha.OverloadManager overload_manager = 15;
+  overload.v3alpha.OverloadManager overload_manager = 15;
 
   // Enable :ref:`stats for event dispatcher <operations_performance>`, defaults to false.
   // Note that this records a value for each iteration of the event loop on every thread. This

api/envoy/config/filter/accesslog/v2/accesslog.proto

@@ -39,7 +39,7 @@ message AccessLog {
   // #. "envoy.tcp_grpc_access_log": :ref:`TcpGrpcAccessLogConfig
   //    <envoy_api_msg_config.accesslog.v2.TcpGrpcAccessLogConfig>`
   oneof config_type {
-    google.protobuf.Struct config = 3;
+    google.protobuf.Struct config = 3 [deprecated = true];
 
     google.protobuf.Any typed_config = 4;
   }