grpc 1.42.0 → 1.43.1

data/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c

@@ -8,60 +8,13 @@
 
 #include "upb/def.h"
 #include "envoy/admin/v3/config_dump.upbdefs.h"
+#include "envoy/admin/v3/config_dump.upb.h"
 
 extern upb_def_init envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit;
 extern upb_def_init google_protobuf_any_proto_upbdefinit;
 extern upb_def_init google_protobuf_timestamp_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
-extern const upb_msglayout envoy_admin_v3_ConfigDump_msginit;
-extern const upb_msglayout envoy_admin_v3_UpdateFailureState_msginit;
-extern const upb_msglayout envoy_admin_v3_BootstrapConfigDump_msginit;
-extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_msginit;
-extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_StaticListener_msginit;
-extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit;
-extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit;
-extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_msginit;
-extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit;
-extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit;
-extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_msginit;
-extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit;
-extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit;
-extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_msginit;
-extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit;
-extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit;
-extern const upb_msglayout envoy_admin_v3_SecretsConfigDump_msginit;
-extern const upb_msglayout envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit;
-extern const upb_msglayout envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit;
-extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_msginit;
-extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit;
-extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit;
-
-static const upb_msglayout *layouts[22] = {
-  &envoy_admin_v3_ConfigDump_msginit,
-  &envoy_admin_v3_UpdateFailureState_msginit,
-  &envoy_admin_v3_BootstrapConfigDump_msginit,
-  &envoy_admin_v3_ListenersConfigDump_msginit,
-  &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit,
-  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit,
-  &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit,
-  &envoy_admin_v3_ClustersConfigDump_msginit,
-  &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit,
-  &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit,
-  &envoy_admin_v3_RoutesConfigDump_msginit,
-  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit,
-  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit,
-  &envoy_admin_v3_ScopedRoutesConfigDump_msginit,
-  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit,
-  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit,
-  &envoy_admin_v3_SecretsConfigDump_msginit,
-  &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit,
-  &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit,
-  &envoy_admin_v3_EndpointsConfigDump_msginit,
-  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit,
-  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit,
-};
-
 static const char descriptor[6802] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', '/', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'd', 
 'u', 'm', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\016', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', 
 '\032', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '/', 
@@ -348,7 +301,7 @@ static upb_def_init *deps[6] = {
 
 upb_def_init envoy_admin_v3_config_dump_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_admin_v3_config_dump_proto_upb_file_layout,
   "envoy/admin/v3/config_dump.proto",
   UPB_STRVIEW_INIT(descriptor, 6802)
 };

data/src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c

@@ -8,9 +8,9 @@
 
 #include "upb/def.h"
 #include "envoy/annotations/deprecation.upbdefs.h"
+#include "envoy/annotations/deprecation.upb.h"
 
 extern upb_def_init google_protobuf_descriptor_proto_upbdefinit;
-
 static const char descriptor[490] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 
 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\021', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'n', 'n', 'o', 't', 
 'a', 't', 'i', 'o', 'n', 's', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 
@@ -40,7 +40,7 @@ static upb_def_init *deps[2] = {
 
 upb_def_init envoy_annotations_deprecation_proto_upbdefinit = {
   deps,
-  NULL,
+  &envoy_annotations_deprecation_proto_upb_file_layout,
   "envoy/annotations/deprecation.proto",
   UPB_STRVIEW_INIT(descriptor, 490)
 };

data/src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c

@@ -8,14 +8,9 @@
 
 #include "upb/def.h"
 #include "envoy/annotations/resource.upbdefs.h"
+#include "envoy/annotations/resource.upb.h"
 
 extern upb_def_init google_protobuf_descriptor_proto_upbdefinit;
-extern const upb_msglayout envoy_annotations_ResourceAnnotation_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_annotations_ResourceAnnotation_msginit,
-};
-
 static const char descriptor[240] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'r', 'e', 's', 'o', 'u', 
 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\021', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
 'o', 'n', 's', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 
@@ -35,7 +30,7 @@ static upb_def_init *deps[2] = {
 
 upb_def_init envoy_annotations_resource_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_annotations_resource_proto_upb_file_layout,
   "envoy/annotations/resource.proto",
   UPB_STRVIEW_INIT(descriptor, 240)
 };

data/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/accesslog/v3/accesslog.upbdefs.h"
+#include "envoy/config/accesslog/v3/accesslog.upb.h"
 
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
 extern upb_def_init envoy_config_route_v3_route_components_proto_upbdefinit;
@@ -18,40 +19,6 @@ extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_accesslog_v3_AccessLog_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_AccessLogFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_ComparisonFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_StatusCodeFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_DurationFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_NotHealthCheckFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_TraceableFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_RuntimeFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_AndFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_OrFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_HeaderFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_ResponseFlagFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_GrpcStatusFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_MetadataFilter_msginit;
-extern const upb_msglayout envoy_config_accesslog_v3_ExtensionFilter_msginit;
-
-static const upb_msglayout *layouts[15] = {
-  &envoy_config_accesslog_v3_AccessLog_msginit,
-  &envoy_config_accesslog_v3_AccessLogFilter_msginit,
-  &envoy_config_accesslog_v3_ComparisonFilter_msginit,
-  &envoy_config_accesslog_v3_StatusCodeFilter_msginit,
-  &envoy_config_accesslog_v3_DurationFilter_msginit,
-  &envoy_config_accesslog_v3_NotHealthCheckFilter_msginit,
-  &envoy_config_accesslog_v3_TraceableFilter_msginit,
-  &envoy_config_accesslog_v3_RuntimeFilter_msginit,
-  &envoy_config_accesslog_v3_AndFilter_msginit,
-  &envoy_config_accesslog_v3_OrFilter_msginit,
-  &envoy_config_accesslog_v3_HeaderFilter_msginit,
-  &envoy_config_accesslog_v3_ResponseFlagFilter_msginit,
-  &envoy_config_accesslog_v3_GrpcStatusFilter_msginit,
-  &envoy_config_accesslog_v3_MetadataFilter_msginit,
-  &envoy_config_accesslog_v3_ExtensionFilter_msginit,
-};
-
 static const char descriptor[4402] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 
 'v', '3', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', 
 '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 
@@ -246,7 +213,7 @@ static upb_def_init *deps[10] = {
 
 upb_def_init envoy_config_accesslog_v3_accesslog_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_accesslog_v3_accesslog_proto_upb_file_layout,
   "envoy/config/accesslog/v3/accesslog.proto",
   UPB_STRVIEW_INIT(descriptor, 4402)
 };

data/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/bootstrap/v3/bootstrap.upbdefs.h"
+#include "envoy/config/bootstrap/v3/bootstrap.upb.h"
 
 extern upb_def_init envoy_config_accesslog_v3_accesslog_proto_upbdefinit;
 extern upb_def_init envoy_config_cluster_v3_cluster_proto_upbdefinit;
@@ -33,46 +34,6 @@ extern upb_def_init udpa_annotations_security_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_Admin_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_Watchdogs_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_Watchdog_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_FatalAction_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_Runtime_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_LayeredRuntime_msginit;
-extern const upb_msglayout envoy_config_bootstrap_v3_CustomInlineHeader_msginit;
-
-static const upb_msglayout *layouts[18] = {
-  &envoy_config_bootstrap_v3_Bootstrap_msginit,
-  &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit,
-  &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit,
-  &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msginit,
-  &envoy_config_bootstrap_v3_Admin_msginit,
-  &envoy_config_bootstrap_v3_ClusterManager_msginit,
-  &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit,
-  &envoy_config_bootstrap_v3_Watchdogs_msginit,
-  &envoy_config_bootstrap_v3_Watchdog_msginit,
-  &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit,
-  &envoy_config_bootstrap_v3_FatalAction_msginit,
-  &envoy_config_bootstrap_v3_Runtime_msginit,
-  &envoy_config_bootstrap_v3_RuntimeLayer_msginit,
-  &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit,
-  &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit,
-  &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit,
-  &envoy_config_bootstrap_v3_LayeredRuntime_msginit,
-  &envoy_config_bootstrap_v3_CustomInlineHeader_msginit,
-};
-
 static const char descriptor[7815] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '/', 
 'v', '3', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', 
 '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '\032', ')', 'e', 'n', 'v', 
@@ -418,7 +379,7 @@ static upb_def_init *deps[25] = {
 
 upb_def_init envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout,
   "envoy/config/bootstrap/v3/bootstrap.proto",
   UPB_STRVIEW_INIT(descriptor, 7815)
 };

data/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/cluster/v3/circuit_breaker.upbdefs.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb.h"
 
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
 extern upb_def_init envoy_type_v3_percent_proto_upbdefinit;
@@ -15,16 +16,6 @@ extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_cluster_v3_CircuitBreakers_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_CircuitBreakers_Thresholds_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msginit;
-
-static const upb_msglayout *layouts[3] = {
-  &envoy_config_cluster_v3_CircuitBreakers_msginit,
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msginit,
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msginit,
-};
-
 static const char descriptor[1364] = {'\n', '-', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', 
 '/', 'c', 'i', 'r', 'c', 'u', 'i', 't', '_', 'b', 'r', 'e', 'a', 'k', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 
 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', '\037', 'e', 
@@ -94,7 +85,7 @@ static upb_def_init *deps[7] = {
 
 upb_def_init envoy_config_cluster_v3_circuit_breaker_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_cluster_v3_circuit_breaker_proto_upb_file_layout,
   "envoy/config/cluster/v3/circuit_breaker.proto",
   UPB_STRVIEW_INIT(descriptor, 1364)
 };

data/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/cluster/v3/cluster.upbdefs.h"
+#include "envoy/config/cluster/v3/cluster.upb.h"
 
 extern upb_def_init envoy_config_cluster_v3_circuit_breaker_proto_upbdefinit;
 extern upb_def_init envoy_config_cluster_v3_filter_proto_upbdefinit;
@@ -32,60 +33,6 @@ extern upb_def_init udpa_annotations_security_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_cluster_v3_ClusterCollection_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_TransportSocketMatch_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_CustomClusterType_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_EdsClusterConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_LbSubsetConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_SlowStartConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_RingHashLbConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_MaglevLbConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_RefreshRate_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_LoadBalancingPolicy_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_UpstreamBindConfig_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_UpstreamConnectionOptions_msginit;
-extern const upb_msglayout envoy_config_cluster_v3_TrackClusterStats_msginit;
-
-static const upb_msglayout *layouts[25] = {
-  &envoy_config_cluster_v3_ClusterCollection_msginit,
-  &envoy_config_cluster_v3_Cluster_msginit,
-  &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msginit,
-  &envoy_config_cluster_v3_Cluster_CustomClusterType_msginit,
-  &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msginit,
-  &envoy_config_cluster_v3_Cluster_SlowStartConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit,
-  &envoy_config_cluster_v3_Cluster_RefreshRate_msginit,
-  &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit,
-  &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msginit,
-  &envoy_config_cluster_v3_LoadBalancingPolicy_msginit,
-  &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit,
-  &envoy_config_cluster_v3_UpstreamBindConfig_msginit,
-  &envoy_config_cluster_v3_UpstreamConnectionOptions_msginit,
-  &envoy_config_cluster_v3_TrackClusterStats_msginit,
-};
-
 static const char descriptor[11811] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', 
 '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', '-', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 
@@ -590,7 +537,7 @@ static upb_def_init *deps[24] = {
 
 upb_def_init envoy_config_cluster_v3_cluster_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_cluster_v3_cluster_proto_upb_file_layout,
   "envoy/config/cluster/v3/cluster.proto",
   UPB_STRVIEW_INIT(descriptor, 11811)
 };

data/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c

@@ -8,17 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/config/cluster/v3/filter.upbdefs.h"
+#include "envoy/config/cluster/v3/filter.upb.h"
 
 extern upb_def_init google_protobuf_any_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_cluster_v3_Filter_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_cluster_v3_Filter_msginit,
-};
-
 static const char descriptor[386] = {'\n', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', 
 '/', 'f', 'i', 'l', 't', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 
@@ -47,7 +42,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_config_cluster_v3_filter_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_cluster_v3_filter_proto_upb_file_layout,
   "envoy/config/cluster/v3/filter.proto",
   UPB_STRVIEW_INIT(descriptor, 386)
 };

data/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c

@@ -8,18 +8,13 @@
 
 #include "upb/def.h"
 #include "envoy/config/cluster/v3/outlier_detection.upbdefs.h"
+#include "envoy/config/cluster/v3/outlier_detection.upb.h"
 
 extern upb_def_init google_protobuf_duration_proto_upbdefinit;
 extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_cluster_v3_OutlierDetection_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_cluster_v3_OutlierDetection_msginit,
-};
-
 static const char descriptor[2423] = {'\n', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', 
 '/', 'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', 
 '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', 
@@ -130,7 +125,7 @@ static upb_def_init *deps[6] = {
 
 upb_def_init envoy_config_cluster_v3_outlier_detection_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout,
   "envoy/config/cluster/v3/outlier_detection.proto",
   UPB_STRVIEW_INIT(descriptor, 2423)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c

@@ -8,30 +8,13 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/address.upbdefs.h"
+#include "envoy/config/core/v3/address.upb.h"
 
 extern upb_def_init envoy_config_core_v3_socket_option_proto_upbdefinit;
 extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_Pipe_msginit;
-extern const upb_msglayout envoy_config_core_v3_EnvoyInternalAddress_msginit;
-extern const upb_msglayout envoy_config_core_v3_SocketAddress_msginit;
-extern const upb_msglayout envoy_config_core_v3_TcpKeepalive_msginit;
-extern const upb_msglayout envoy_config_core_v3_BindConfig_msginit;
-extern const upb_msglayout envoy_config_core_v3_Address_msginit;
-extern const upb_msglayout envoy_config_core_v3_CidrRange_msginit;
-
-static const upb_msglayout *layouts[7] = {
-  &envoy_config_core_v3_Pipe_msginit,
-  &envoy_config_core_v3_EnvoyInternalAddress_msginit,
-  &envoy_config_core_v3_SocketAddress_msginit,
-  &envoy_config_core_v3_TcpKeepalive_msginit,
-  &envoy_config_core_v3_BindConfig_msginit,
-  &envoy_config_core_v3_Address_msginit,
-  &envoy_config_core_v3_CidrRange_msginit,
-};
-
 static const char descriptor[1878] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 
 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
 '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 
@@ -121,7 +104,7 @@ static upb_def_init *deps[6] = {
 
 upb_def_init envoy_config_core_v3_address_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_address_proto_upb_file_layout,
   "envoy/config/core/v3/address.proto",
   UPB_STRVIEW_INIT(descriptor, 1878)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c

@@ -8,17 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/backoff.upbdefs.h"
+#include "envoy/config/core/v3/backoff.upb.h"
 
 extern upb_def_init google_protobuf_duration_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_BackoffStrategy_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_core_v3_BackoffStrategy_msginit,
-};
-
 static const char descriptor[465] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 
 'c', 'k', 'o', 'f', 'f', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
 '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
@@ -50,7 +45,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_config_core_v3_backoff_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_backoff_proto_upb_file_layout,
   "envoy/config/core/v3/backoff.proto",
   UPB_STRVIEW_INIT(descriptor, 465)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/base.upbdefs.h"
+#include "envoy/config/core/v3/base.upb.h"
 
 extern upb_def_init envoy_config_core_v3_address_proto_upbdefinit;
 extern upb_def_init envoy_config_core_v3_backoff_proto_upbdefinit;
@@ -23,58 +24,6 @@ extern upb_def_init udpa_annotations_migrate_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_Locality_msginit;
-extern const upb_msglayout envoy_config_core_v3_BuildVersion_msginit;
-extern const upb_msglayout envoy_config_core_v3_Extension_msginit;
-extern const upb_msglayout envoy_config_core_v3_Node_msginit;
-extern const upb_msglayout envoy_config_core_v3_Node_DynamicParametersEntry_msginit;
-extern const upb_msglayout envoy_config_core_v3_Metadata_msginit;
-extern const upb_msglayout envoy_config_core_v3_Metadata_FilterMetadataEntry_msginit;
-extern const upb_msglayout envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msginit;
-extern const upb_msglayout envoy_config_core_v3_RuntimeUInt32_msginit;
-extern const upb_msglayout envoy_config_core_v3_RuntimePercent_msginit;
-extern const upb_msglayout envoy_config_core_v3_RuntimeDouble_msginit;
-extern const upb_msglayout envoy_config_core_v3_RuntimeFeatureFlag_msginit;
-extern const upb_msglayout envoy_config_core_v3_QueryParameter_msginit;
-extern const upb_msglayout envoy_config_core_v3_HeaderValue_msginit;
-extern const upb_msglayout envoy_config_core_v3_HeaderValueOption_msginit;
-extern const upb_msglayout envoy_config_core_v3_HeaderMap_msginit;
-extern const upb_msglayout envoy_config_core_v3_WatchedDirectory_msginit;
-extern const upb_msglayout envoy_config_core_v3_DataSource_msginit;
-extern const upb_msglayout envoy_config_core_v3_RetryPolicy_msginit;
-extern const upb_msglayout envoy_config_core_v3_RemoteDataSource_msginit;
-extern const upb_msglayout envoy_config_core_v3_AsyncDataSource_msginit;
-extern const upb_msglayout envoy_config_core_v3_TransportSocket_msginit;
-extern const upb_msglayout envoy_config_core_v3_RuntimeFractionalPercent_msginit;
-extern const upb_msglayout envoy_config_core_v3_ControlPlane_msginit;
-
-static const upb_msglayout *layouts[24] = {
-  &envoy_config_core_v3_Locality_msginit,
-  &envoy_config_core_v3_BuildVersion_msginit,
-  &envoy_config_core_v3_Extension_msginit,
-  &envoy_config_core_v3_Node_msginit,
-  &envoy_config_core_v3_Node_DynamicParametersEntry_msginit,
-  &envoy_config_core_v3_Metadata_msginit,
-  &envoy_config_core_v3_Metadata_FilterMetadataEntry_msginit,
-  &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msginit,
-  &envoy_config_core_v3_RuntimeUInt32_msginit,
-  &envoy_config_core_v3_RuntimePercent_msginit,
-  &envoy_config_core_v3_RuntimeDouble_msginit,
-  &envoy_config_core_v3_RuntimeFeatureFlag_msginit,
-  &envoy_config_core_v3_QueryParameter_msginit,
-  &envoy_config_core_v3_HeaderValue_msginit,
-  &envoy_config_core_v3_HeaderValueOption_msginit,
-  &envoy_config_core_v3_HeaderMap_msginit,
-  &envoy_config_core_v3_WatchedDirectory_msginit,
-  &envoy_config_core_v3_DataSource_msginit,
-  &envoy_config_core_v3_RetryPolicy_msginit,
-  &envoy_config_core_v3_RemoteDataSource_msginit,
-  &envoy_config_core_v3_AsyncDataSource_msginit,
-  &envoy_config_core_v3_TransportSocket_msginit,
-  &envoy_config_core_v3_RuntimeFractionalPercent_msginit,
-  &envoy_config_core_v3_ControlPlane_msginit,
-};
-
 static const char descriptor[5228] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 
 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 
 'r', 'e', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 
@@ -307,7 +256,7 @@ static upb_def_init *deps[15] = {
 
 upb_def_init envoy_config_core_v3_base_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_base_proto_upb_file_layout,
   "envoy/config/core/v3/base.proto",
   UPB_STRVIEW_INIT(descriptor, 5228)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/config_source.upbdefs.h"
+#include "envoy/config/core/v3/config_source.upb.h"
 
 extern upb_def_init envoy_config_core_v3_grpc_service_proto_upbdefinit;
 extern upb_def_init google_protobuf_duration_proto_upbdefinit;
@@ -17,20 +18,6 @@ extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_ApiConfigSource_msginit;
-extern const upb_msglayout envoy_config_core_v3_AggregatedConfigSource_msginit;
-extern const upb_msglayout envoy_config_core_v3_SelfConfigSource_msginit;
-extern const upb_msglayout envoy_config_core_v3_RateLimitSettings_msginit;
-extern const upb_msglayout envoy_config_core_v3_ConfigSource_msginit;
-
-static const upb_msglayout *layouts[5] = {
-  &envoy_config_core_v3_ApiConfigSource_msginit,
-  &envoy_config_core_v3_AggregatedConfigSource_msginit,
-  &envoy_config_core_v3_SelfConfigSource_msginit,
-  &envoy_config_core_v3_RateLimitSettings_msginit,
-  &envoy_config_core_v3_ConfigSource_msginit,
-};
-
 static const char descriptor[2256] = {'\n', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 
 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 
 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 
@@ -138,7 +125,7 @@ static upb_def_init *deps[9] = {
 
 upb_def_init envoy_config_core_v3_config_source_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_config_source_proto_upb_file_layout,
   "envoy/config/core/v3/config_source.proto",
   UPB_STRVIEW_INIT(descriptor, 2256)
 };

data/src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c

@@ -8,17 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/config/core/v3/event_service_config.upbdefs.h"
+#include "envoy/config/core/v3/event_service_config.upb.h"
 
 extern upb_def_init envoy_config_core_v3_grpc_service_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_config_core_v3_EventServiceConfig_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_config_core_v3_EventServiceConfig_msginit,
-};
-
 static const char descriptor[456] = {'\n', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'v', 
 'e', 'n', 't', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', 
 '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\'', 'e', 'n', 
@@ -50,7 +45,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_config_core_v3_event_service_config_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_config_core_v3_event_service_config_proto_upb_file_layout,
   "envoy/config/core/v3/event_service_config.proto",
   UPB_STRVIEW_INIT(descriptor, 456)
 };