config: v2 transport API fatal-by-default.

api/envoy/api/v2/core/config_source.proto

@@ -26,10 +26,10 @@ enum ApiVersion {
   // When not specified, we assume v2, to ease migration to Envoy's stable API
   // versioning. If a client does not support v2 (e.g. due to deprecation), this
   // is an invalid value.
-  AUTO = 0;
+  AUTO = 0 [deprecated = true];
 
   // Use xDS v2 API.
-  V2 = 1;
+  V2 = 1 [deprecated = true];
 
   // Use xDS v3 API.
   V3 = 2;

api/envoy/config/core/v3/config_source.proto

@@ -27,10 +27,10 @@ enum ApiVersion {
   // When not specified, we assume v2, to ease migration to Envoy's stable API
   // versioning. If a client does not support v2 (e.g. due to deprecation), this
   // is an invalid value.
-  AUTO = 0;
+  AUTO = 0 [deprecated = true];
 
   // Use xDS v2 API.
-  V2 = 1;
+  V2 = 1 [deprecated = true];
 
   // Use xDS v3 API.
   V3 = 2;

configs/envoy_front_proxy.template.yaml

@@ -62,6 +62,7 @@
             domain: envoy_front
             request_type: external
             rate_limit_service:
+              transport_api_version: V3
               grpc_service:
                 envoy_grpc:
                   cluster_name: ratelimit

configs/envoy_service_to_service.template.yaml

@@ -159,6 +159,7 @@ static_resources:
               "@type": type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit
               domain: envoy_service_to_service
               rate_limit_service:
+                 transport_api_version: V3
                  grpc_service:
                     envoy_grpc:
                        cluster_name: ratelimit
@@ -182,8 +183,10 @@ static_resources:
           stat_prefix: egress_http
           rds:
             config_source:
+               resource_api_version: V3
                api_config_source:
                  api_type: GRPC
+                 transport_api_version: V3
                  grpc_services:
                    envoy_grpc:
                      cluster_name: "rds"
@@ -220,6 +223,7 @@ static_resources:
               "@type": type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit
               domain: envoy_service_to_service
               rate_limit_service:
+                 transport_api_version: V3
                  grpc_service:
                     envoy_grpc:
                        cluster_name: ratelimit
@@ -542,8 +546,10 @@ static_resources:
                 protocol: TCP
 dynamic_resources:
   cds_config:
+    resource_api_version: V3
     api_config_source:
       api_type: REST
+      transport_api_version: V3
       cluster_names:
       - cds_cluster
       refresh_delay: 30s

configs/routing_helper.template.yaml

@@ -15,8 +15,10 @@
   type: EDS
   eds_cluster_config:
     eds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: REST
+        transport_api_version: V3
         cluster_names:
         - sds
         refresh_delay: 30s

docs/root/configuration/overview/examples.rst

@@ -99,8 +99,10 @@ on 127.0.0.1:5678 is provided below:
       type: EDS
       eds_cluster_config:
         eds_config:
+          resource_api_version: V3
           api_config_source:
             api_type: GRPC
+            transport_api_version: V3
             grpc_services:
               - envoy_grpc:
                   cluster_name: xds_cluster
@@ -174,14 +176,18 @@ below:
 
   dynamic_resources:
     lds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: GRPC
+        transport_api_version: V3
         grpc_services:
           - envoy_grpc:
               cluster_name: xds_cluster
     cds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: GRPC
+        transport_api_version: V3
         grpc_services:
           - envoy_grpc:
               cluster_name: xds_cluster
@@ -230,8 +236,10 @@ The management server could respond to LDS requests with:
           rds:
             route_config_name: local_route
             config_source:
+              resource_api_version: V3
               api_config_source:
                 api_type: GRPC
+                transport_api_version: V3
                 grpc_services:
                   - envoy_grpc:
                       cluster_name: xds_cluster
@@ -266,8 +274,10 @@ The management server could respond to CDS requests with:
     type: EDS
     eds_cluster_config:
       eds_config:
+        resource_api_version: V3
         api_config_source:
           api_type: GRPC
+          transport_api_version: V3
           grpc_services:
             - envoy_grpc:
                 cluster_name: xds_cluster

docs/root/configuration/overview/extension.rst

@@ -21,8 +21,10 @@ filter configuration snippet is permitted:
     rds:
       route_config_name: local_route
       config_source:
+        resource_api_version: V3
         api_config_source:
           api_type: GRPC
+          transport_api_version: V3
           grpc_services:
             envoy_grpc:
               cluster_name: xds_cluster
@@ -49,9 +51,11 @@ follows:
       codec_type: AUTO
       rds:
         route_config_name: local_route
+        resource_api_version: V3
         config_source:
           api_config_source:
             api_type: GRPC
+            transport_api_version: V3
             grpc_services:
               envoy_grpc:
                 cluster_name: xds_cluster

docs/root/configuration/overview/xds_api.rst

@@ -25,9 +25,10 @@ as a client when
 .. code-block:: yaml
 
     cds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: GRPC
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         grpc_services:
           envoy_grpc:
             cluster_name: some_xds_cluster
@@ -46,9 +47,10 @@ for the service definition. This is used by Envoy as a client when
 .. code-block:: yaml
 
     eds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: GRPC
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         grpc_services:
           envoy_grpc:
             cluster_name: some_xds_cluster
@@ -67,9 +69,10 @@ for the service definition. This is used by Envoy as a client when
 .. code-block:: yaml
 
     lds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: GRPC
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         grpc_services:
           envoy_grpc:
             cluster_name: some_xds_cluster
@@ -89,9 +92,10 @@ for the service definition. This is used by Envoy as a client when
 
     route_config_name: some_route_name
     config_source:
+      resource_api_version: V3
       api_config_source:
         api_type: GRPC
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         grpc_services:
           envoy_grpc:
             cluster_name: some_xds_cluster
@@ -112,10 +116,11 @@ for the service definition. This is used by Envoy as a client when
 
     name: some_scoped_route_name
     scoped_rds:
+      resource_api_version: V3
       config_source:
         api_config_source:
           api_type: GRPC
-          transport_api_version: <V2|V3>
+          transport_api_version: V3
           grpc_services:
             envoy_grpc:
               cluster_name: some_xds_cluster
@@ -136,9 +141,10 @@ for the service definition. This is used by Envoy as a client when
 
     name: some_secret_name
     config_source:
+      resource_api_version: V3
       api_config_source:
         api_type: GRPC
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         grpc_services:
           envoy_grpc:
             cluster_name: some_xds_cluster
@@ -157,9 +163,10 @@ for the service definition. This is used by Envoy as a client when
 
     name: some_runtime_layer_name
     config_source:
+      resource_api_version: V3
       api_config_source:
         api_type: GRPC
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         grpc_services:
           envoy_grpc:
             cluster_name: some_xds_cluster
@@ -180,9 +187,10 @@ for the service definition. This is used by Envoy as a client when
 .. code-block:: yaml
 
     cds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: REST
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         cluster_names: [some_xds_cluster]
 
 is set in the :ref:`dynamic_resources
@@ -199,9 +207,10 @@ for the service definition. This is used by Envoy as a client when
 .. code-block:: yaml
 
     eds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: REST
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         cluster_names: [some_xds_cluster]
 
 is set in the :ref:`eds_cluster_config
@@ -218,9 +227,10 @@ for the service definition. This is used by Envoy as a client when
 .. code-block:: yaml
 
     lds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: REST
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         cluster_names: [some_xds_cluster]
 
 is set in the :ref:`dynamic_resources
@@ -238,9 +248,10 @@ for the service definition. This is used by Envoy as a client when
 
     route_config_name: some_route_name
     config_source:
+      resource_api_version: V3
       api_config_source:
         api_type: REST
-        transport_api_version: <V2|V3>
+        transport_api_version: V3
         cluster_names: [some_xds_cluster]
 
 is set in the :ref:`rds
@@ -295,7 +306,7 @@ for the service definition. This is used by Envoy as a client when
 
     ads_config:
       api_type: GRPC
-      transport_api_version: <V2|V3>
+      transport_api_version: V3
       grpc_services:
         envoy_grpc:
           cluster_name: some_ads_cluster
@@ -310,8 +321,10 @@ be set to use the ADS channel. For example, a LDS config could be changed from
 .. code-block:: yaml
 
     lds_config:
+      resource_api_version: V3
       api_config_source:
         api_type: REST
+        transport_api_version: V3
         cluster_names: [some_xds_cluster]
 
 to
@@ -369,4 +382,4 @@ within the response, while for SotW xDS the server may wrap individual resources
 :ref:`Resource <envoy_api_msg_Resource>` in order to specify a TTL value.
 
 The server can refresh or modify the TTL by issuing another response for the same version. In this case the resource
-itself does not have to be included.
+itself does not have to be included.

docs/root/configuration/security/secret.rst

@@ -169,8 +169,10 @@ This example shows how to configure secrets fetched from remote SDS servers:
                 tls_certificate_sds_secret_configs:
                 - name: client_cert
                   sds_config:
+                    resource_api_version: V3
                     api_config_source:
                       api_type: GRPC
+                      transport_api_version: V3
                       grpc_services:
                         google_grpc:
                           target_uri: unix:/tmp/uds_path
@@ -185,16 +187,20 @@ This example shows how to configure secrets fetched from remote SDS servers:
               tls_certificate_sds_secret_configs:
               - name: server_cert
                 sds_config:
+                  resource_api_version: V3
                   api_config_source:
                     api_type: GRPC
+                    transport_api_version: V3
                     grpc_services:
                       envoy_grpc:
                         cluster_name: sds_server_mtls
               validation_context_sds_secret_config:
                 name: validation_context
                 sds_config:
+                  resource_api_version: V3
                   api_config_source:
                     api_type: GRPC
+                    transport_api_version: V3
                     grpc_services:
                       envoy_grpc:
                         cluster_name: sds_server_uds