Merge remote-tracking branch 'origin/main' into delta-xds-non-breaking-slonka-hash-bytes

# Conflicts:
#	api/pom.xml
#	cache/pom.xml
#	pom.xml
#	server/pom.xml
#	test/pom.xml

Author: Ferdudas97

api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>java-control-plane</artifactId>
         <groupId>io.envoyproxy.controlplane</groupId>
-        <version>0.1.30-delta-xds-slonka-hash-bytes-SNAPSHOT</version>
+        <version>0.1.31-delta-xds-slonka-hash-bytes-SNAPSHOT</version>
     </parent>
 
     <artifactId>api</artifactId>

api/src/main/proto/envoy/admin/v3/clusters.proto

@@ -41,10 +41,10 @@ message ClusterStatus {
 
   // The success rate threshold used in the last interval.
   // If
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *false*, all errors: externally and locally generated were used to calculate the threshold.
   // If
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *true*, only externally generated errors were used to calculate the threshold.
   // The threshold is used to eject hosts based on their success rate. See
   // :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for details.
@@ -64,7 +64,7 @@ message ClusterStatus {
   // The success rate threshold used in the last interval when only locally originated failures were
   // taken into account and externally originated errors were treated as success.
   // This field should be interpreted only when
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *true*. The threshold is used to eject hosts based on their success rate.
   // See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
   // details.
@@ -101,10 +101,10 @@ message HostStatus {
 
   // Request success rate for this host over the last calculated interval.
   // If
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *false*, all errors: externally and locally generated were used in success rate
   // calculation. If
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *true*, only externally generated errors were used in success rate calculation.
   // See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
   // details.
@@ -127,7 +127,7 @@ message HostStatus {
   // interval when only locally originated errors are taken into account and externally originated
   // errors were treated as success.
   // This field should be interpreted only when
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *true*.
   // See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
   // details.

api/src/main/proto/envoy/admin/v3/config_dump.proto

@@ -53,11 +53,13 @@ message ConfigDump {
   // The following configurations are currently supported and will be dumped in the order given
   // below:
   //
-  // * *bootstrap*: :ref:`BootstrapConfigDump <envoy_api_msg_admin.v3.BootstrapConfigDump>`
-  // * *clusters*: :ref:`ClustersConfigDump <envoy_api_msg_admin.v3.ClustersConfigDump>`
-  // * *endpoints*:  :ref:`EndpointsConfigDump <envoy_api_msg_admin.v3.EndpointsConfigDump>`
-  // * *listeners*: :ref:`ListenersConfigDump <envoy_api_msg_admin.v3.ListenersConfigDump>`
-  // * *routes*:  :ref:`RoutesConfigDump <envoy_api_msg_admin.v3.RoutesConfigDump>`
+  // * *bootstrap*: :ref:`BootstrapConfigDump <envoy_v3_api_msg_admin.v3.BootstrapConfigDump>`
+  // * *clusters*: :ref:`ClustersConfigDump <envoy_v3_api_msg_admin.v3.ClustersConfigDump>`
+  // * *endpoints*:  :ref:`EndpointsConfigDump <envoy_v3_api_msg_admin.v3.EndpointsConfigDump>`
+  // * *listeners*: :ref:`ListenersConfigDump <envoy_v3_api_msg_admin.v3.ListenersConfigDump>`
+  // * *scoped_routes*: :ref:`ScopedRoutesConfigDump <envoy_v3_api_msg_admin.v3.ScopedRoutesConfigDump>`
+  // * *routes*:  :ref:`RoutesConfigDump <envoy_v3_api_msg_admin.v3.RoutesConfigDump>`
+  // * *secrets*:  :ref:`SecretsConfigDump <envoy_v3_api_msg_admin.v3.SecretsConfigDump>`
   //
   // EDS Configuration will only be dumped by using parameter `?include_eds`
   //
@@ -126,7 +128,7 @@ message ListenersConfigDump {
         "envoy.admin.v2alpha.ListenersConfigDump.DynamicListenerState";
 
     // This is the per-resource version information. This version is currently taken from the
-    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time
+    // :ref:`version_info <envoy_v3_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time
     // that the listener was loaded. In the future, discrete per-listener versions may be supported
     // by the API.
     string version_info = 1;
@@ -174,7 +176,7 @@ message ListenersConfigDump {
     ClientResourceStatus client_status = 6;
   }
 
-  // This is the :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the
+  // This is the :ref:`version_info <envoy_v3_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the
   // last processed LDS discovery response. If there are only static bootstrap listeners, this field
   // will be "".
   string version_info = 1;
@@ -212,7 +214,7 @@ message ClustersConfigDump {
         "envoy.admin.v2alpha.ClustersConfigDump.DynamicCluster";
 
     // This is the per-resource version information. This version is currently taken from the
-    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time
+    // :ref:`version_info <envoy_v3_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time
     // that the cluster was loaded. In the future, discrete per-cluster versions may be supported by
     // the API.
     string version_info = 1;
@@ -235,7 +237,7 @@ message ClustersConfigDump {
     ClientResourceStatus client_status = 5;
   }
 
-  // This is the :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the
+  // This is the :ref:`version_info <envoy_v3_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the
   // last processed CDS discovery response. If there are only static bootstrap clusters, this field
   // will be "".
   string version_info = 1;
@@ -280,7 +282,7 @@ message RoutesConfigDump {
         "envoy.admin.v2alpha.RoutesConfigDump.DynamicRouteConfig";
 
     // This is the per-resource version information. This version is currently taken from the
-    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time that
+    // :ref:`version_info <envoy_v3_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time that
     // the route configuration was loaded.
     string version_info = 1;
 
@@ -340,7 +342,7 @@ message ScopedRoutesConfigDump {
     string name = 1;
 
     // This is the per-resource version information. This version is currently taken from the
-    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time that
+    // :ref:`version_info <envoy_v3_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time that
     // the scoped routes configuration was loaded.
     string version_info = 2;
 
@@ -450,7 +452,7 @@ message EndpointsConfigDump {
   // [#next-free-field: 6]
   message DynamicEndpointConfig {
     // [#not-implemented-hide:] This is the per-resource version information. This version is currently taken from the
-    // :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time that
+    // :ref:`version_info <envoy_v3_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time that
     // the endpoint configuration was loaded.
     string version_info = 1;
 

api/src/main/proto/envoy/admin/v3/server_info.proto

@@ -87,9 +87,9 @@ message CommandLineOptions {
     Immediate = 1;
   }
 
-  reserved 12, 20, 21;
+  reserved 12, 20, 21, 29;
 
-  reserved "max_stats", "max_obj_name_len";
+  reserved "max_stats", "max_obj_name_len", "bootstrap_version";
 
   // See :option:`--base-id` for details.
   uint64 base_id = 1;
@@ -178,9 +178,6 @@ message CommandLineOptions {
   // See :option:`--disable-extensions` for details.
   repeated string disabled_extensions = 28;
 
-  // See :option:`--bootstrap-version` for details.
-  uint32 bootstrap_version = 29;
-
   // See :option:`--enable-fine-grain-logging` for details.
   bool enable_fine_grain_logging = 34;