Skip to content

Commit 19b4b16

Browse files
wookieJwookieJ
authored
Update protobuf to envoy 1.16.0 (#155)
* Update protobuf to envoy 1.16.0 Signed-off-by: Lukasz Jedryczka <[email protected]> * Fixing test by setting -boostrap-version 2 flag Signed-off-by: Lukasz Jedryczka <[email protected]> * Update protobuf to envoy 1.16.0 Signed-off-by: Lukasz Jedryczka <[email protected]> * Information about update envoy image version in README.md Signed-off-by: wookieJ <[email protected]>
1 parent d71b9a2 commit 19b4b16

File tree

514 files changed

+25420
-2471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

514 files changed

+25420
-2471
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ following:
3636
file) and then
3737
2. run [tools/update-api.sh](tools/update-api.sh) from the `tools`
3838
directory.
39+
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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ package envoy.admin.v2alpha;
44

55
import "google/protobuf/timestamp.proto";
66

7+
import "udpa/annotations/status.proto";
8+
79
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
810
option java_outer_classname = "CertsProto";
911
option java_multiple_files = true;
12+
option (udpa.annotations.file_status).package_version_status = FROZEN;
1013

1114
// [#protodoc-title: Certificates]
1215

@@ -53,5 +56,7 @@ message SubjectAlternateName {
5356
string dns = 1;
5457

5558
string uri = 2;
59+
60+
string ip_address = 3;
5661
}
5762
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ package envoy.admin.v2alpha;
44

55
import "envoy/admin/v2alpha/metrics.proto";
66
import "envoy/api/v2/core/address.proto";
7+
import "envoy/api/v2/core/base.proto";
78
import "envoy/api/v2/core/health_check.proto";
89
import "envoy/type/percent.proto";
910

11+
import "udpa/annotations/status.proto";
12+
1013
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
1114
option java_outer_classname = "ClustersProto";
1215
option java_multiple_files = true;
16+
option (udpa.annotations.file_status).package_version_status = FROZEN;
1317

1418
// [#protodoc-title: Clusters]
1519

@@ -70,7 +74,7 @@ message ClusterStatus {
7074
}
7175

7276
// Current state of a particular host.
73-
// [#next-free-field: 9]
77+
// [#next-free-field: 10]
7478
message HostStatus {
7579
// Address of this host.
7680
api.v2.core.Address address = 1;
@@ -118,6 +122,9 @@ message HostStatus {
118122
// success rate or the cluster did not have enough hosts to run through success rate outlier
119123
// ejection.
120124
type.Percent local_origin_success_rate = 8;
125+
126+
// locality of the host.
127+
api.v2.core.Locality locality = 9;
121128
}
122129

123130
// Health status for a host.

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ import "envoy/config/bootstrap/v2/bootstrap.proto";
77
import "google/protobuf/any.proto";
88
import "google/protobuf/timestamp.proto";
99

10+
import "udpa/annotations/status.proto";
11+
1012
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
1113
option java_outer_classname = "ConfigDumpProto";
1214
option java_multiple_files = true;
15+
option (udpa.annotations.file_status).package_version_status = FROZEN;
1316

1417
// [#protodoc-title: ConfigDump]
1518

@@ -170,10 +173,10 @@ message ClustersConfigDump {
170173
}
171174

172175
// Envoy's RDS implementation fills this message with all currently loaded routes, as described by
173-
// their RouteConfiguration objects. Static routes configured in the bootstrap configuration are
174-
// separated from those configured dynamically via RDS. Route configuration information can be used
175-
// to recreate an Envoy configuration by populating all routes as static routes or by returning them
176-
// in RDS responses.
176+
// their RouteConfiguration objects. Static routes that are either defined in the bootstrap configuration
177+
// or defined inline while configuring listeners are separated from those configured dynamically via RDS.
178+
// Route configuration information can be used to recreate an Envoy configuration by populating all routes
179+
// as static routes or by returning them in RDS responses.
177180
message RoutesConfigDump {
178181
message StaticRouteConfig {
179182
// The route config.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ package envoy.admin.v2alpha;
44

55
import "envoy/api/v2/core/address.proto";
66

7+
import "udpa/annotations/status.proto";
8+
79
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
810
option java_outer_classname = "ListenersProto";
911
option java_multiple_files = true;
12+
option (udpa.annotations.file_status).package_version_status = FROZEN;
1013

1114
// [#protodoc-title: Listeners]
1215

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@ syntax = "proto3";
22

33
package envoy.admin.v2alpha;
44

5+
import "udpa/annotations/status.proto";
6+
57
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
68
option java_outer_classname = "MemoryProto";
79
option java_multiple_files = true;
10+
option (udpa.annotations.file_status).package_version_status = FROZEN;
811

912
// [#protodoc-title: Memory]
1013

1114
// Proto representation of the internal memory consumption of an Envoy instance. These represent
1215
// values extracted from an internal TCMalloc instance. For more information, see the section of the
1316
// docs entitled ["Generic Tcmalloc Status"](https://gperftools.github.io/gperftools/tcmalloc.html).
14-
// [#next-free-field: 6]
17+
// [#next-free-field: 7]
1518
message Memory {
1619
// The number of bytes allocated by the heap for Envoy. This is an alias for
1720
// `generic.current_allocated_bytes`.
@@ -34,4 +37,8 @@ message Memory {
3437
// The amount of memory used by the TCMalloc thread caches (for small objects). This is an alias
3538
// for `tcmalloc.current_total_thread_cache_bytes`.
3639
uint64 total_thread_cache = 5;
40+
41+
// The number of bytes of the physical memory usage by the allocator. This is an alias for
42+
// `generic.total_physical_bytes`.
43+
uint64 total_physical_bytes = 6;
3744
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ syntax = "proto3";
22

33
package envoy.admin.v2alpha;
44

5+
import "udpa/annotations/status.proto";
6+
57
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
68
option java_outer_classname = "MetricsProto";
79
option java_multiple_files = true;
10+
option (udpa.annotations.file_status).package_version_status = FROZEN;
811

912
// [#protodoc-title: Metrics]
1013

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ syntax = "proto3";
22

33
package envoy.admin.v2alpha;
44

5+
import "udpa/annotations/status.proto";
6+
57
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
68
option java_outer_classname = "MutexStatsProto";
79
option java_multiple_files = true;
10+
option (udpa.annotations.file_status).package_version_status = FROZEN;
811

912
// [#protodoc-title: MutexStats]
1013

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ package envoy.admin.v2alpha;
55
import "google/protobuf/duration.proto";
66

77
import "envoy/annotations/deprecation.proto";
8+
import "udpa/annotations/status.proto";
89

910
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
1011
option java_outer_classname = "ServerInfoProto";
1112
option java_multiple_files = true;
13+
option (udpa.annotations.file_status).package_version_status = FROZEN;
1214

1315
// [#protodoc-title: Server State]
1416

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ package envoy.admin.v2alpha;
44

55
import "envoy/service/tap/v2alpha/common.proto";
66

7+
import "udpa/annotations/status.proto";
78
import "validate/validate.proto";
89

910
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
1011
option java_outer_classname = "TapProto";
1112
option java_multiple_files = true;
13+
option (udpa.annotations.file_status).package_version_status = FROZEN;
1214

1315
// [#protodoc-title: Tap]
1416

0 commit comments

Comments
 (0)