Update protobuf to envoy 1.16.0

README.md

@@ -36,3 +36,4 @@ following:
    file) and then
 2. run [tools/update-api.sh](tools/update-api.sh) from the `tools`
    directory.
+3. update envoy-alpine-dev docker image version [EnvoyContainer.java] according to envoy SHA in first point.

api/src/main/proto/envoy/admin/v2alpha/certs.proto

@@ -4,9 +4,12 @@ package envoy.admin.v2alpha;
 
 import "google/protobuf/timestamp.proto";
 
+import "udpa/annotations/status.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "CertsProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Certificates]
 
@@ -53,5 +56,7 @@ message SubjectAlternateName {
     string dns = 1;
 
     string uri = 2;
+
+    string ip_address = 3;
   }
 }

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

@@ -4,12 +4,16 @@ package envoy.admin.v2alpha;
 
 import "envoy/admin/v2alpha/metrics.proto";
 import "envoy/api/v2/core/address.proto";
+import "envoy/api/v2/core/base.proto";
 import "envoy/api/v2/core/health_check.proto";
 import "envoy/type/percent.proto";
 
+import "udpa/annotations/status.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ClustersProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Clusters]
 
@@ -70,7 +74,7 @@ message ClusterStatus {
 }
 
 // Current state of a particular host.
-// [#next-free-field: 9]
+// [#next-free-field: 10]
 message HostStatus {
   // Address of this host.
   api.v2.core.Address address = 1;
@@ -118,6 +122,9 @@ message HostStatus {
   // success rate or the cluster did not have enough hosts to run through success rate outlier
   // ejection.
   type.Percent local_origin_success_rate = 8;
+
+  // locality of the host.
+  api.v2.core.Locality locality = 9;
 }
 
 // Health status for a host.

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

@@ -7,9 +7,12 @@ import "envoy/config/bootstrap/v2/bootstrap.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 
+import "udpa/annotations/status.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ConfigDumpProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: ConfigDump]
 
@@ -170,10 +173,10 @@ message ClustersConfigDump {
 }
 
 // Envoy's RDS implementation fills this message with all currently loaded routes, as described by
-// their RouteConfiguration objects. Static routes configured in the bootstrap configuration are
-// separated from those configured dynamically via RDS. Route configuration information can be used
-// to recreate an Envoy configuration by populating all routes as static routes or by returning them
-// in RDS responses.
+// their RouteConfiguration objects. Static routes that are either defined in the bootstrap configuration
+// or defined inline while configuring listeners are separated from those configured dynamically via RDS.
+// Route configuration information can be used to recreate an Envoy configuration by populating all routes
+// as static routes or by returning them in RDS responses.
 message RoutesConfigDump {
   message StaticRouteConfig {
     // The route config.

api/src/main/proto/envoy/admin/v2alpha/listeners.proto

@@ -4,9 +4,12 @@ package envoy.admin.v2alpha;
 
 import "envoy/api/v2/core/address.proto";
 
+import "udpa/annotations/status.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ListenersProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Listeners]
 

api/src/main/proto/envoy/admin/v2alpha/memory.proto

@@ -2,16 +2,19 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+import "udpa/annotations/status.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "MemoryProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Memory]
 
 // Proto representation of the internal memory consumption of an Envoy instance. These represent
 // values extracted from an internal TCMalloc instance. For more information, see the section of the
 // docs entitled ["Generic Tcmalloc Status"](https://gperftools.github.io/gperftools/tcmalloc.html).
-// [#next-free-field: 6]
+// [#next-free-field: 7]
 message Memory {
   // The number of bytes allocated by the heap for Envoy. This is an alias for
   // `generic.current_allocated_bytes`.
@@ -34,4 +37,8 @@ message Memory {
   // The amount of memory used by the TCMalloc thread caches (for small objects). This is an alias
   // for `tcmalloc.current_total_thread_cache_bytes`.
   uint64 total_thread_cache = 5;
+
+  // The number of bytes of the physical memory usage by the allocator. This is an alias for
+  // `generic.total_physical_bytes`.
+  uint64 total_physical_bytes = 6;
 }

api/src/main/proto/envoy/admin/v2alpha/metrics.proto

@@ -2,9 +2,12 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+import "udpa/annotations/status.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "MetricsProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Metrics]
 

api/src/main/proto/envoy/admin/v2alpha/mutex_stats.proto

@@ -2,9 +2,12 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+import "udpa/annotations/status.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "MutexStatsProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: MutexStats]
 

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

@@ -5,10 +5,12 @@ package envoy.admin.v2alpha;
 import "google/protobuf/duration.proto";
 
 import "envoy/annotations/deprecation.proto";
+import "udpa/annotations/status.proto";
 
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ServerInfoProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Server State]
 

api/src/main/proto/envoy/admin/v2alpha/tap.proto

@@ -4,11 +4,13 @@ package envoy.admin.v2alpha;
 
 import "envoy/service/tap/v2alpha/common.proto";
 
+import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "TapProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Tap]
 

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

@@ -4,11 +4,13 @@ package envoy.admin.v3;
 
 import "google/protobuf/timestamp.proto";
 
+import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
 
 option java_package = "io.envoyproxy.envoy.admin.v3";
 option java_outer_classname = "CertsProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Certificates]
 
@@ -32,11 +34,19 @@ message Certificate {
   repeated CertificateDetails cert_chain = 2;
 }
 
-// [#next-free-field: 7]
+// [#next-free-field: 8]
 message CertificateDetails {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.admin.v2alpha.CertificateDetails";
 
+  message OcspDetails {
+    // Indicates the time from which the OCSP response is valid.
+    google.protobuf.Timestamp valid_from = 1;
+
+    // Indicates the time at which the OCSP response expires.
+    google.protobuf.Timestamp expiration = 2;
+  }
+
   // Path of the certificate.
   string path = 1;
 
@@ -54,6 +64,9 @@ message CertificateDetails {
 
   // Indicates the time at which the certificate expires.
   google.protobuf.Timestamp expiration_time = 6;
+
+  // Details related to the OCSP response associated with this certificate, if any.
+  OcspDetails ocsp_details = 7;
 }
 
 message SubjectAlternateName {
@@ -65,5 +78,7 @@ message SubjectAlternateName {
     string dns = 1;
 
     string uri = 2;
+
+    string ip_address = 3;
   }
 }

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

@@ -3,15 +3,19 @@ syntax = "proto3";
 package envoy.admin.v3;
 
 import "envoy/admin/v3/metrics.proto";
+import "envoy/config/cluster/v3/circuit_breaker.proto";
 import "envoy/config/core/v3/address.proto";
+import "envoy/config/core/v3/base.proto";
 import "envoy/config/core/v3/health_check.proto";
 import "envoy/type/v3/percent.proto";
 
+import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
 
 option java_package = "io.envoyproxy.envoy.admin.v3";
 option java_outer_classname = "ClustersProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Clusters]
 
@@ -25,7 +29,7 @@ message Clusters {
 }
 
 // Details an individual cluster's current status.
-// [#next-free-field: 6]
+// [#next-free-field: 7]
 message ClusterStatus {
   option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.ClusterStatus";
 
@@ -73,10 +77,13 @@ message ClusterStatus {
   //    threshold for that interval.
   // 3. Outlier detection is not enabled for this cluster.
   type.v3.Percent local_origin_success_rate_ejection_threshold = 5;
+
+  // :ref:`Circuit breaking <arch_overview_circuit_break>` settings of the cluster.
+  config.cluster.v3.CircuitBreakers circuit_breakers = 6;
 }
 
 // Current state of a particular host.
-// [#next-free-field: 9]
+// [#next-free-field: 10]
 message HostStatus {
   option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.HostStatus";
 
@@ -126,6 +133,9 @@ message HostStatus {
   // success rate or the cluster did not have enough hosts to run through success rate outlier
   // ejection.
   type.v3.Percent local_origin_success_rate = 8;
+
+  // locality of the host.
+  config.core.v3.Locality locality = 9;
 }
 
 // Health status for a host.

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

@@ -7,11 +7,13 @@ import "envoy/config/bootstrap/v3/bootstrap.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 
+import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
 
 option java_package = "io.envoyproxy.envoy.admin.v3";
 option java_outer_classname = "ConfigDumpProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: ConfigDump]
 
@@ -28,9 +30,12 @@ message ConfigDump {
   //
   // * *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>`
   //
+  // EDS Configuration will only be dumped by using parameter `?include_eds`
+  //
   // You can filter output with the resource and mask query parameters.
   // See :ref:`/config_dump?resource={} <operations_admin_interface_config_dump_by_resource>`,
   // :ref:`/config_dump?mask={} <operations_admin_interface_config_dump_by_mask>`,
@@ -201,10 +206,10 @@ message ClustersConfigDump {
 }
 
 // Envoy's RDS implementation fills this message with all currently loaded routes, as described by
-// their RouteConfiguration objects. Static routes configured in the bootstrap configuration are
-// separated from those configured dynamically via RDS. Route configuration information can be used
-// to recreate an Envoy configuration by populating all routes as static routes or by returning them
-// in RDS responses.
+// their RouteConfiguration objects. Static routes that are either defined in the bootstrap configuration
+// or defined inline while configuring listeners are separated from those configured dynamically via RDS.
+// Route configuration information can be used to recreate an Envoy configuration by populating all routes
+// as static routes or by returning them in RDS responses.
 message RoutesConfigDump {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.admin.v2alpha.RoutesConfigDump";
@@ -344,3 +349,35 @@ message SecretsConfigDump {
   // warming in preparation to service clusters or listeners.
   repeated DynamicSecret dynamic_warming_secrets = 3;
 }
+
+// Envoy's admin fill this message with all currently known endpoints. Endpoint
+// configuration information can be used to recreate an Envoy configuration by populating all
+// endpoints as static endpoints or by returning them in an EDS response.
+message EndpointsConfigDump {
+  message StaticEndpointConfig {
+    // The endpoint config.
+    google.protobuf.Any endpoint_config = 1;
+
+    // [#not-implemented-hide:] The timestamp when the Endpoint was last updated.
+    google.protobuf.Timestamp last_updated = 2;
+  }
+
+  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
+    // the endpoint configuration was loaded.
+    string version_info = 1;
+
+    // The endpoint config.
+    google.protobuf.Any endpoint_config = 2;
+
+    // [#not-implemented-hide:] The timestamp when the Endpoint was last updated.
+    google.protobuf.Timestamp last_updated = 3;
+  }
+
+  // The statically loaded endpoint configs.
+  repeated StaticEndpointConfig static_endpoint_configs = 2;
+
+  // The dynamically loaded endpoint configs.
+  repeated DynamicEndpointConfig dynamic_endpoint_configs = 3;
+}