Skip to content

Commit c540b17

Browse files
slonkaslonka
authored
Update protobuf definitions to Envoy latest as of 12 Feb 2020 (#130)
Signed-off-by: slonka <slonka@users.noreply.github.com>
1 parent c2c5df5 commit c540b17

322 files changed

Lines changed: 9756 additions & 5408 deletions

File tree

Some content is hidden

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

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

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

33
package envoy.admin.v2alpha;
44

5+
import "google/protobuf/timestamp.proto";
6+
57
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
68
option java_outer_classname = "CertsProto";
79
option java_multiple_files = true;
810

9-
import "google/protobuf/timestamp.proto";
10-
1111
// [#protodoc-title: Certificates]
1212

1313
// Proto representation of certificate details. Admin endpoint uses this wrapper for `/certs` to

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ syntax = "proto3";
22

33
package envoy.admin.v2alpha;
44

5-
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
6-
option java_outer_classname = "ClustersProto";
7-
option java_multiple_files = true;
8-
95
import "envoy/admin/v2alpha/metrics.proto";
106
import "envoy/api/v2/core/address.proto";
117
import "envoy/api/v2/core/health_check.proto";
128
import "envoy/type/percent.proto";
139

10+
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
11+
option java_outer_classname = "ClustersProto";
12+
option java_multiple_files = true;
13+
1414
// [#protodoc-title: Clusters]
1515

1616
// Admin endpoint uses this wrapper for `/clusters` to display cluster status information.
@@ -141,6 +141,6 @@ message HostHealthStatus {
141141

142142
// Health status as reported by EDS. Note: only HEALTHY and UNHEALTHY are currently supported
143143
// here.
144-
// TODO(mrice32): pipe through remaining EDS health status possibilities.
144+
// [#comment:TODO(mrice32): pipe through remaining EDS health status possibilities.]
145145
api.v2.core.HealthStatus eds_health_status = 3;
146146
}

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

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,15 @@ syntax = "proto3";
22

33
package envoy.admin.v2alpha;
44

5-
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
6-
option java_outer_classname = "ConfigDumpProto";
7-
option java_multiple_files = true;
8-
9-
import "envoy/api/v2/auth/cert.proto";
10-
import "envoy/api/v2/cds.proto";
11-
import "envoy/api/v2/lds.proto";
12-
import "envoy/api/v2/rds.proto";
13-
import "envoy/api/v2/srds.proto";
145
import "envoy/config/bootstrap/v2/bootstrap.proto";
156

167
import "google/protobuf/any.proto";
178
import "google/protobuf/timestamp.proto";
189

10+
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
11+
option java_outer_classname = "ConfigDumpProto";
12+
option java_multiple_files = true;
13+
1914
// [#protodoc-title: ConfigDump]
2015

2116
// The :ref:`/config_dump <operations_admin_interface_config_dump>` admin endpoint uses this wrapper
@@ -31,6 +26,12 @@ message ConfigDump {
3126
// * *clusters*: :ref:`ClustersConfigDump <envoy_api_msg_admin.v2alpha.ClustersConfigDump>`
3227
// * *listeners*: :ref:`ListenersConfigDump <envoy_api_msg_admin.v2alpha.ListenersConfigDump>`
3328
// * *routes*: :ref:`RoutesConfigDump <envoy_api_msg_admin.v2alpha.RoutesConfigDump>`
29+
//
30+
// You can filter output with the resource and mask query parameters.
31+
// See :ref:`/config_dump?resource={} <operations_admin_interface_config_dump_by_resource>`,
32+
// :ref:`/config_dump?mask={} <operations_admin_interface_config_dump_by_mask>`,
33+
// or :ref:`/config_dump?resource={},mask={}
34+
// <operations_admin_interface_config_dump_by_resource_and_mask>` for more information.
3435
repeated google.protobuf.Any configs = 1;
3536
}
3637

@@ -63,7 +64,7 @@ message ListenersConfigDump {
6364
// Describes a statically loaded listener.
6465
message StaticListener {
6566
// The listener config.
66-
api.v2.Listener listener = 1;
67+
google.protobuf.Any listener = 1;
6768

6869
// The timestamp when the Listener was last successfully updated.
6970
google.protobuf.Timestamp last_updated = 2;
@@ -77,7 +78,7 @@ message ListenersConfigDump {
7778
string version_info = 1;
7879

7980
// The listener config.
80-
api.v2.Listener listener = 2;
81+
google.protobuf.Any listener = 2;
8182

8283
// The timestamp when the Listener was last successfully updated.
8384
google.protobuf.Timestamp last_updated = 3;
@@ -128,7 +129,7 @@ message ClustersConfigDump {
128129
// Describes a statically loaded cluster.
129130
message StaticCluster {
130131
// The cluster config.
131-
api.v2.Cluster cluster = 1;
132+
google.protobuf.Any cluster = 1;
132133

133134
// The timestamp when the Cluster was last updated.
134135
google.protobuf.Timestamp last_updated = 2;
@@ -143,7 +144,7 @@ message ClustersConfigDump {
143144
string version_info = 1;
144145

145146
// The cluster config.
146-
api.v2.Cluster cluster = 2;
147+
google.protobuf.Any cluster = 2;
147148

148149
// The timestamp when the Cluster was last updated.
149150
google.protobuf.Timestamp last_updated = 3;
@@ -176,7 +177,7 @@ message ClustersConfigDump {
176177
message RoutesConfigDump {
177178
message StaticRouteConfig {
178179
// The route config.
179-
api.v2.RouteConfiguration route_config = 1;
180+
google.protobuf.Any route_config = 1;
180181

181182
// The timestamp when the Route was last updated.
182183
google.protobuf.Timestamp last_updated = 2;
@@ -189,7 +190,7 @@ message RoutesConfigDump {
189190
string version_info = 1;
190191

191192
// The route config.
192-
api.v2.RouteConfiguration route_config = 2;
193+
google.protobuf.Any route_config = 2;
193194

194195
// The timestamp when the Route was last updated.
195196
google.protobuf.Timestamp last_updated = 3;
@@ -212,7 +213,7 @@ message ScopedRoutesConfigDump {
212213
string name = 1;
213214

214215
// The scoped route configurations.
215-
repeated api.v2.ScopedRouteConfiguration scoped_route_configs = 2;
216+
repeated google.protobuf.Any scoped_route_configs = 2;
216217

217218
// The timestamp when the scoped route config set was last updated.
218219
google.protobuf.Timestamp last_updated = 3;
@@ -228,7 +229,7 @@ message ScopedRoutesConfigDump {
228229
string version_info = 2;
229230

230231
// The scoped route configurations.
231-
repeated api.v2.ScopedRouteConfiguration scoped_route_configs = 3;
232+
repeated google.protobuf.Any scoped_route_configs = 3;
232233

233234
// The timestamp when the scoped route config set was last updated.
234235
google.protobuf.Timestamp last_updated = 4;
@@ -257,7 +258,7 @@ message SecretsConfigDump {
257258
// The actual secret information.
258259
// Security sensitive information is redacted (replaced with "[redacted]") for
259260
// private keys and passwords in TLS certificates.
260-
api.v2.auth.Secret secret = 4;
261+
google.protobuf.Any secret = 4;
261262
}
262263

263264
// StaticSecret specifies statically loaded secret in bootstrap.
@@ -271,7 +272,7 @@ message SecretsConfigDump {
271272
// The actual secret information.
272273
// Security sensitive information is redacted (replaced with "[redacted]") for
273274
// private keys and passwords in TLS certificates.
274-
api.v2.auth.Secret secret = 3;
275+
google.protobuf.Any secret = 3;
275276
}
276277

277278
// The statically loaded secrets.

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

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

33
package envoy.admin.v2alpha;
44

5+
import "envoy/api/v2/core/address.proto";
6+
57
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
68
option java_outer_classname = "ListenersProto";
79
option java_multiple_files = true;
810

9-
import "envoy/api/v2/core/address.proto";
10-
1111
// [#protodoc-title: Listeners]
1212

1313
// Admin endpoint uses this wrapper for `/listeners` to display listener status information.

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ syntax = "proto3";
22

33
package envoy.admin.v2alpha;
44

5+
import "google/protobuf/duration.proto";
6+
7+
import "envoy/annotations/deprecation.proto";
8+
59
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
610
option java_outer_classname = "ServerInfoProto";
711
option java_multiple_files = true;
812

9-
import "google/protobuf/duration.proto";
10-
1113
// [#protodoc-title: Server State]
1214

1315
// Proto representation of the value returned by /server_info, containing
@@ -47,7 +49,7 @@ message ServerInfo {
4749
CommandLineOptions command_line_options = 6;
4850
}
4951

50-
// [#next-free-field: 28]
52+
// [#next-free-field: 29]
5153
message CommandLineOptions {
5254
enum IpVersion {
5355
v4 = 0;
@@ -128,9 +130,10 @@ message CommandLineOptions {
128130
Mode mode = 19;
129131

130132
// max_stats and max_obj_name_len are now unused and have no effect.
131-
uint64 max_stats = 20 [deprecated = true];
133+
uint64 max_stats = 20 [deprecated = true, (envoy.annotations.disallowed_by_default) = true];
132134

133-
uint64 max_obj_name_len = 21 [deprecated = true];
135+
uint64 max_obj_name_len = 21
136+
[deprecated = true, (envoy.annotations.disallowed_by_default) = true];
134137

135138
// See :option:`--disable-hot-restart` for details.
136139
bool disable_hot_restart = 22;
@@ -143,4 +146,7 @@ message CommandLineOptions {
143146

144147
// See :option:`--cpuset-threads` for details.
145148
bool cpuset_threads = 25;
149+
150+
// See :option:`--disable-extensions` for details.
151+
repeated string disabled_extensions = 28;
146152
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ syntax = "proto3";
22

33
package envoy.admin.v2alpha;
44

5+
import "envoy/service/tap/v2alpha/common.proto";
6+
7+
import "validate/validate.proto";
8+
59
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
610
option java_outer_classname = "TapProto";
711
option java_multiple_files = true;
812

9-
import "envoy/service/tap/v2alpha/common.proto";
10-
11-
import "validate/validate.proto";
13+
// [#protodoc-title: Tap]
1214

1315
// The /tap admin request body that is used to configure an active tap session.
1416
message TapRequest {

api/src/main/proto/envoy/admin/v3alpha/certs.proto renamed to api/src/main/proto/envoy/admin/v3/certs.proto

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
syntax = "proto3";
22

3-
package envoy.admin.v3alpha;
4-
5-
option java_package = "io.envoyproxy.envoy.admin.v3alpha";
6-
option java_outer_classname = "CertsProto";
7-
option java_multiple_files = true;
3+
package envoy.admin.v3;
84

95
import "google/protobuf/timestamp.proto";
106

117
import "udpa/annotations/versioning.proto";
128

9+
option java_package = "io.envoyproxy.envoy.admin.v3";
10+
option java_outer_classname = "CertsProto";
11+
option java_multiple_files = true;
12+
1313
// [#protodoc-title: Certificates]
1414

1515
// Proto representation of certificate details. Admin endpoint uses this wrapper for `/certs` to

api/src/main/proto/envoy/admin/v3alpha/clusters.proto renamed to api/src/main/proto/envoy/admin/v3/clusters.proto

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
syntax = "proto3";
22

3-
package envoy.admin.v3alpha;
3+
package envoy.admin.v3;
44

5-
option java_package = "io.envoyproxy.envoy.admin.v3alpha";
6-
option java_outer_classname = "ClustersProto";
7-
option java_multiple_files = true;
8-
9-
import "envoy/admin/v3alpha/metrics.proto";
10-
import "envoy/api/v3alpha/core/address.proto";
11-
import "envoy/api/v3alpha/core/health_check.proto";
12-
import "envoy/type/v3alpha/percent.proto";
5+
import "envoy/admin/v3/metrics.proto";
6+
import "envoy/config/core/v3/address.proto";
7+
import "envoy/config/core/v3/health_check.proto";
8+
import "envoy/type/v3/percent.proto";
139

1410
import "udpa/annotations/versioning.proto";
1511

12+
option java_package = "io.envoyproxy.envoy.admin.v3";
13+
option java_outer_classname = "ClustersProto";
14+
option java_multiple_files = true;
15+
1616
// [#protodoc-title: Clusters]
1717

1818
// Admin endpoint uses this wrapper for `/clusters` to display cluster status information.
@@ -37,10 +37,10 @@ message ClusterStatus {
3737

3838
// The success rate threshold used in the last interval.
3939
// If
40-
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
40+
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
4141
// is *false*, all errors: externally and locally generated were used to calculate the threshold.
4242
// If
43-
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
43+
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
4444
// is *true*, only externally generated errors were used to calculate the threshold.
4545
// The threshold is used to eject hosts based on their success rate. See
4646
// :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for details.
@@ -52,15 +52,15 @@ message ClusterStatus {
5252
// 2. The threshold is computed to be < 0 because a negative value implies that there was no
5353
// threshold for that interval.
5454
// 3. Outlier detection is not enabled for this cluster.
55-
type.v3alpha.Percent success_rate_ejection_threshold = 3;
55+
type.v3.Percent success_rate_ejection_threshold = 3;
5656

5757
// Mapping from host address to the host's current status.
5858
repeated HostStatus host_statuses = 4;
5959

6060
// The success rate threshold used in the last interval when only locally originated failures were
6161
// taken into account and externally originated errors were treated as success.
6262
// This field should be interpreted only when
63-
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
63+
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
6464
// is *true*. The threshold is used to eject hosts based on their success rate.
6565
// See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
6666
// details.
@@ -72,7 +72,7 @@ message ClusterStatus {
7272
// 2. The threshold is computed to be < 0 because a negative value implies that there was no
7373
// threshold for that interval.
7474
// 3. Outlier detection is not enabled for this cluster.
75-
type.v3alpha.Percent local_origin_success_rate_ejection_threshold = 5;
75+
type.v3.Percent local_origin_success_rate_ejection_threshold = 5;
7676
}
7777

7878
// Current state of a particular host.
@@ -81,7 +81,7 @@ message HostStatus {
8181
option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.HostStatus";
8282

8383
// Address of this host.
84-
api.v3alpha.core.Address address = 1;
84+
config.core.v3.Address address = 1;
8585

8686
// List of stats specific to this host.
8787
repeated SimpleMetric stats = 2;
@@ -91,18 +91,18 @@ message HostStatus {
9191

9292
// Request success rate for this host over the last calculated interval.
9393
// If
94-
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
94+
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
9595
// is *false*, all errors: externally and locally generated were used in success rate
9696
// calculation. If
97-
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
97+
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
9898
// is *true*, only externally generated errors were used in success rate calculation.
9999
// See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
100100
// details.
101101
//
102102
// Note: the message will not be present if host did not have enough request volume to calculate
103103
// success rate or the cluster did not have enough hosts to run through success rate outlier
104104
// ejection.
105-
type.v3alpha.Percent success_rate = 4;
105+
type.v3.Percent success_rate = 4;
106106

107107
// The host's weight. If not configured, the value defaults to 1.
108108
uint32 weight = 5;
@@ -117,15 +117,15 @@ message HostStatus {
117117
// interval when only locally originated errors are taken into account and externally originated
118118
// errors were treated as success.
119119
// This field should be interpreted only when
120-
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
120+
// :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
121121
// is *true*.
122122
// See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
123123
// details.
124124
//
125125
// Note: the message will not be present if host did not have enough request volume to calculate
126126
// success rate or the cluster did not have enough hosts to run through success rate outlier
127127
// ejection.
128-
type.v3alpha.Percent local_origin_success_rate = 8;
128+
type.v3.Percent local_origin_success_rate = 8;
129129
}
130130

131131
// Health status for a host.
@@ -152,6 +152,6 @@ message HostHealthStatus {
152152

153153
// Health status as reported by EDS. Note: only HEALTHY and UNHEALTHY are currently supported
154154
// here.
155-
// TODO(mrice32): pipe through remaining EDS health status possibilities.
156-
api.v3alpha.core.HealthStatus eds_health_status = 3;
155+
// [#comment:TODO(mrice32): pipe through remaining EDS health status possibilities.]
156+
config.core.v3.HealthStatus eds_health_status = 3;
157157
}

0 commit comments

Comments
 (0)