Skip to content

Commit a43976b

Browse files
soloio-botsoloio-bot
and
soloio-bot
authored
Sync APIs. @tag-name=gloo-v1.18.0-beta34 (#1369)
Co-authored-by: soloio-bot <[email protected]>
1 parent b99cf20 commit a43976b

File tree

94 files changed

+1974
-1198
lines changed

Some content is hidden

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

94 files changed

+1974
-1198
lines changed

api/gloo/gloo/external/envoy/annotations/deprecation.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import "google/protobuf/descriptor.proto";
77
// [#protodoc-title: Deprecation]
88
// Allows tagging proto fields as fatal by default. One Envoy release after
99
// deprecation, deprecated fields will be disallowed by default, a state which
10-
// is reversible with :ref:`runtime overrides <config_runtime_deprecation>`.
10+
// is reversible with runtime overrides.
1111

1212
// Magic number in this file derived from top 28bit of SHA256 digest of
1313
// "solo.io.envoy.annotation.disallowed_by_default"

api/gloo/gloo/external/envoy/api/v2/core/health_check.proto

+8-11
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ message HealthCheck {
142142
// HTTP Method that will be used for health checking, default is "GET".
143143
// GET, HEAD, POST, PUT, DELETE, OPTIONS, TRACE, PATCH methods are supported, but making request body is not supported.
144144
// CONNECT method is disallowed because it is not appropriate for health check request.
145-
// If a non-200 response is expected by the method, it needs to be set in :ref:`expected_statuses <envoy_v3_api_field_config.core.v3.HealthCheck.HttpHealthCheck.expected_statuses>`.
145+
// If a non-200 response is expected by the method, it needs to be set in expected_statuses.
146146
solo.io.envoy.config.core.v3.RequestMethod method = 11;
147147
}
148148

@@ -157,23 +157,20 @@ message HealthCheck {
157157
}
158158

159159
message RedisHealthCheck {
160-
// If set, optionally perform ``EXISTS <key>`` instead of ``PING``. A return value
160+
// If set, optionally perform `EXISTS <key>` instead of `PING`. A return value
161161
// from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other
162162
// than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance
163163
// by setting the specified key to any value and waiting for traffic to drain.
164164
string key = 1;
165165
}
166166

167-
// `grpc.health.v1.Health
168-
// <https://github.com/grpc/grpc/blob/master/src/proto/grpc/health/v1/health.proto>`_-based
169-
// healthcheck. See `gRPC doc <https://github.com/grpc/grpc/blob/master/doc/health-checking.md>`_
167+
// [grpc.health.v1.Health](https://github.com/grpc/grpc/blob/master/src/proto/grpc/health/v1/health.proto)-based
168+
// healthcheck. See [gRPC doc](https://github.com/grpc/grpc/blob/master/doc/health-checking.md)
170169
// for details.
171170
message GrpcHealthCheck {
172171
// An optional service name parameter which will be sent to gRPC service in
173-
// `grpc.health.v1.HealthCheckRequest
174-
// <https://github.com/grpc/grpc/blob/master/src/proto/grpc/health/v1/health.proto#L20>`_.
175-
// message. See `gRPC health-checking overview
176-
// <https://github.com/grpc/grpc/blob/master/doc/health-checking.md>`_ for more information.
172+
// [grpc.health.v1.HealthCheckRequest](https://github.com/grpc/grpc/blob/master/src/proto/grpc/health/v1/health.proto#L20)
173+
// message. See [gRPC health-checking overview](https://github.com/grpc/grpc/blob/master/doc/health-checking.md) for more information.
177174
string service_name = 1;
178175

179176
// The value of the :authority header in the gRPC health check request. If
@@ -277,9 +274,9 @@ enum HealthStatus {
277274
UNHEALTHY = 2;
278275

279276
// Connection draining in progress. E.g.,
280-
// `<https://aws.amazon.com/blogs/aws/elb-connection-draining-remove-instances-from-service-with-care/>`_
277+
// https://aws.amazon.com/blogs/aws/elb-connection-draining-remove-instances-from-service-with-care/
281278
// or
282-
// `<https://cloud.google.com/compute/docs/load-balancing/enabling-connection-draining>`_.
279+
// https://cloud.google.com/compute/docs/load-balancing/enabling-connection-draining.
283280
// This is interpreted by Envoy as *UNHEALTHY*.
284281
DRAINING = 3;
285282

api/gloo/gloo/external/envoy/api/v2/route/route.proto

+11-13
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ message VirtualHost {
4141
// virtual host. Wildcard hosts are supported in the suffix or prefix form.
4242
//
4343
// Domain search order:
44-
// 1. Exact domain names: ``www.foo.com``.
45-
// 2. Suffix domain wildcards: ``*.foo.com`` or ``*-bar.foo.com``.
46-
// 3. Prefix domain wildcards: ``foo.*`` or ``foo-*``.
47-
// 4. Special wildcard ``*`` matching any domain.
44+
// 1. Exact domain names: `www.foo.com`.
45+
// 2. Suffix domain wildcards: `*.foo.com` or `*-bar.foo.com`.
46+
// 3. Prefix domain wildcards: `foo.*` or `foo-*`.
47+
// 4. Special wildcard `*` matching any domain.
4848
//
4949
//
5050
// The wildcard will not match the empty string.
51-
// e.g. ``*-bar.foo.com`` will match ``baz-bar.foo.com`` but not ``-bar.foo.com``.
51+
// e.g. `*-bar.foo.com` will match `baz-bar.foo.com` but not `-bar.foo.com`.
5252
// The longest wildcards match first.
53-
// Only a single virtual host in the entire route configuration can match on ``*``. A domain
53+
// Only a single virtual host in the entire route configuration can match on `*`. A domain
5454
// must be unique across all virtual hosts or the config will fail to load.
5555
repeated string domains = 2 [(validate.rules).repeated.min_items = 1];
5656

@@ -338,8 +338,7 @@ message RouteMatch {
338338
// If specified, the route is a regular expression rule meaning that the
339339
// regex must match the *:path* header once the query string is removed. The entire path
340340
// (without the query string) must match the regex. The rule will not match if only a
341-
// subsequence of the *:path* header matches the regex. The regex grammar is defined `here
342-
// <https://en.cppreference.com/w/cpp/regex/ecmascript>`_.
341+
// subsequence of the *:path* header matches the regex. The regex grammar is defined [here](https://en.cppreference.com/w/cpp/regex/ecmascript).
343342
//
344343
// Examples:
345344
//
@@ -762,7 +761,7 @@ message RouteAction {
762761
reserved 21;
763762

764763
// If present, and the request is a gRPC request, use the
765-
// `grpc-timeout header <https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md>`_,
764+
// [grpc-timeout header](https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md),
766765
// or its default value (infinity) instead of
767766
// `timeout (envoy_api_field_route.RouteAction.timeout)`, but limit the applied timeout
768767
// to the maximum value specified here. If configured as 0, the maximum allowed timeout for
@@ -1053,8 +1052,7 @@ message Tracing {
10531052
// statistics output are not free.
10541053
message VirtualCluster {
10551054
// Specifies a regex pattern to use for matching requests. The entire path of the request
1056-
// must match the regex. The regex grammar used is defined `here
1057-
// <https://en.cppreference.com/w/cpp/regex/ecmascript>`_.
1055+
// must match the regex. The regex grammar used is defined [here](https://en.cppreference.com/w/cpp/regex/ecmascript).
10581056
//
10591057
// Examples:
10601058
//
@@ -1094,7 +1092,7 @@ message RateLimit {
10941092
// ("source_cluster", "<local service cluster>")
10951093
// ```
10961094
//
1097-
// <local service cluster> is derived from the :option:`--service-cluster` option.
1095+
// <local service cluster> is derived from the `--service-cluster` option.
10981096
message SourceCluster {
10991097
}
11001098

@@ -1245,7 +1243,7 @@ message HeaderMatcher {
12451243
// If specified, this regex string is a regular expression rule which implies the entire request
12461244
// header value must match the regex. The rule will not match if only a subsequence of the
12471245
// request header value matches the regex. The regex grammar used in the value field is defined
1248-
// `here <https://en.cppreference.com/w/cpp/regex/ecmascript>`_.
1246+
// [here](https://en.cppreference.com/w/cpp/regex/ecmascript).
12491247
//
12501248
// Examples:
12511249
//

api/gloo/gloo/external/envoy/config/common/mutation_rules/v3/mutation_rules.proto

+16-16
Original file line numberDiff line numberDiff line change
@@ -40,51 +40,51 @@ option (extproto.clone_all) = true;
4040
// denoted by an x-envoy prefix) or specific headers that may affect
4141
// further filter processing:
4242
//
43-
// * ``host``
44-
// * ``:authority``
45-
// * ``:scheme``
46-
// * ``:method``
43+
// * `host`
44+
// * `:authority`
45+
// * `:scheme`
46+
// * `:method`
4747
//
4848
// Every attempt to add, change, append, or remove a header will be
4949
// tested against the rules here. Disallowed header mutations will be
50-
// ignored unless ``disallow_is_error`` is set to true.
50+
// ignored unless `disallow_is_error` is set to true.
5151
//
5252
// Attempts to remove headers are further constrained -- regardless of the
53-
// settings, system-defined headers (that start with ``:``) and the ``host``
53+
// settings, system-defined headers (that start with `:`) and the `host`
5454
// header may never be removed.
5555
//
5656
// In addition, a counter will be incremented whenever a mutation is
5757
// rejected. In the ext_proc filter, that counter is named
58-
// ``rejected_header_mutations``.
58+
// `rejected_header_mutations`.
5959
// [#next-free-field: 8]
6060
message HeaderMutationRules {
6161
// By default, certain headers that could affect processing of subsequent
6262
// filters or request routing cannot be modified. These headers are
63-
// ``host``, ``:authority``, ``:scheme``, and ``:method``. Setting this parameter
63+
// `host`, `:authority`, `:scheme`, and `:method`. Setting this parameter
6464
// to true allows these headers to be modified as well.
6565
google.protobuf.BoolValue allow_all_routing = 1;
6666

6767
// If true, allow modification of envoy internal headers. By default, these
68-
// start with ``x-envoy`` but this may be overridden in the ``Bootstrap``
68+
// start with `x-envoy` but this may be overridden in the `Bootstrap`
6969
// configuration using the
7070
// :ref:`header_prefix <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.header_prefix>`
7171
// field. Default is false.
7272
google.protobuf.BoolValue allow_envoy = 2;
7373

7474
// If true, prevent modification of any system header, defined as a header
75-
// that starts with a ``:`` character, regardless of any other settings.
76-
// A processing server may still override the ``:status`` of an HTTP response
77-
// using an ``ImmediateResponse`` message. Default is false.
75+
// that starts with a `:` character, regardless of any other settings.
76+
// A processing server may still override the `:status` of an HTTP response
77+
// using an `ImmediateResponse` message. Default is false.
7878
google.protobuf.BoolValue disallow_system = 3;
7979

8080
// If true, prevent modifications of all header values, regardless of any
81-
// other settings. A processing server may still override the ``:status``
82-
// of an HTTP response using an ``ImmediateResponse`` message. Default is false.
81+
// other settings. A processing server may still override the `:status`
82+
// of an HTTP response using an `ImmediateResponse` message. Default is false.
8383
google.protobuf.BoolValue disallow_all = 4;
8484

8585
// If set, specifically allow any header that matches this regular
8686
// expression. This overrides all other settings except for
87-
// ``disallow_expression``.
87+
// `disallow_expression`.
8888
solo.io.envoy.type.matcher.v3.RegexMatcher allow_expression = 5;
8989

9090
// If set, specifically disallow any header that matches this regular
@@ -95,7 +95,7 @@ message HeaderMutationRules {
9595
// disallowed, then the filter using this configuration will terminate the
9696
// request with a 500 error. In addition, regardless of the setting of this
9797
// parameter, any attempt to set, add, or modify a disallowed header will
98-
// cause the ``rejected_header_mutations`` counter to be incremented.
98+
// cause the `rejected_header_mutations` counter to be incremented.
9999
// Default is false.
100100
google.protobuf.BoolValue disallow_is_error = 7;
101101
}

api/gloo/gloo/external/envoy/config/core/v3/address.proto

+9-10
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ message SocketAddress {
4141

4242
Protocol protocol = 1 [(validate.rules).enum = {defined_only: true}];
4343

44-
// The address for this socket. :ref:`Listeners <config_listeners>` will bind
45-
// to the address. An empty address is not allowed. Specify ``0.0.0.0`` or ``::``
44+
// The address for this socket. Listeners will bind
45+
// to the address. An empty address is not allowed. Specify `0.0.0.0` or `::`
4646
// to bind to any address. [#comment:TODO(zuercher) reinstate when implemented:
4747
// It is possible to distinguish a Listener address via the prefix/suffix matching
48-
// in :ref:`FilterChainMatch <envoy_api_msg_config.listener.v3.FilterChainMatch>`.] When used
49-
// within an upstream :ref:`BindConfig <envoy_api_msg_config.core.v3.BindConfig>`, the address
48+
// in FilterChainMatch.] When used
49+
// within an upstream BindConfig, the address
5050
// controls the source address of outbound connections. For :ref:`clusters
5151
// <envoy_api_msg_config.cluster.v3.Cluster>`, the cluster type determines whether the
5252
// address must be an IP (*STATIC* or *EDS* clusters) or a hostname resolved by DNS
5353
// (*STRICT_DNS* or *LOGICAL_DNS* clusters). Address resolution can be customized
54-
// via :ref:`resolver_name <envoy_api_field_config.core.v3.SocketAddress.resolver_name>`.
54+
// via resolver_name.
5555
string address = 2 [(validate.rules).string = {min_bytes: 1}];
5656

5757
oneof port_specifier {
@@ -72,10 +72,9 @@ message SocketAddress {
7272
// *STRICT_DNS* or *LOGICAL_DNS* will generate an error at runtime.
7373
string resolver_name = 5;
7474

75-
// When binding to an IPv6 address above, this enables `IPv4 compatibility
76-
// <https://datatracker.ietf.org/doc/html/rfc3493#page-11>`_. Binding to ``::`` will
75+
// When binding to an IPv6 address above, this enables [IPv4 compatibility](https://datatracker.ietf.org/doc/html/rfc3493#page-11). Binding to `::` will
7776
// allow both IPv4 and IPv6 connections, with peer IPv4 addresses mapped into
78-
// IPv6 space as ``::FFFF:<IPv4-address>``.
77+
// IPv6 space as `::FFFF:<IPv4-address>`.
7978
bool ipv4_compat = 6;
8079
}
8180

@@ -133,11 +132,11 @@ message Address {
133132
}
134133

135134
// CidrRange specifies an IP Address and a prefix length to construct
136-
// the subnet mask for a `CIDR <https://datatracker.ietf.org/doc/html/rfc4632>`_ range.
135+
// the subnet mask for a [CIDR](https://datatracker.ietf.org/doc/html/rfc4632) range.
137136
message CidrRange {
138137
option (solo.io.udpa.annotations.versioning).previous_message_type = "solo.io.envoy.api.v2.core.CidrRange";
139138

140-
// IPv4 or IPv6 address, e.g. ``192.0.0.0`` or ``2001:db8::``.
139+
// IPv4 or IPv6 address, e.g. `192.0.0.0` or `2001:db8::`.
141140
string address_prefix = 1 [(validate.rules).string = {min_bytes: 1}];
142141

143142
// Length of prefix, e.g. 0, 32.

0 commit comments

Comments
 (0)