Skip to content

Commit b9debc9

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix_ws_w_compression
Signed-off-by: Nikita V. Shirokov <tehnerd@tehnerd.com>
2 parents e226127 + 9893386 commit b9debc9

File tree

477 files changed

+2227
-791
lines changed

Some content is hidden

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

477 files changed

+2227
-791
lines changed

.azure-pipelines/pipelines.yml

+16
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,22 @@ stages:
342342
env:
343343
ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
344344
NO_BUILD_SETUP: 1
345+
- job: examples_build
346+
dependsOn: []
347+
pool:
348+
vmImage: "ubuntu-18.04"
349+
steps:
350+
- task: DownloadBuildArtifacts@0
351+
inputs:
352+
buildType: current
353+
artifactName: "docker"
354+
itemPattern: "docker/envoy-docker-images.tar.xz"
355+
downloadType: single
356+
targetPath: $(Build.StagingDirectory)
357+
- bash: ./ci/do_ci.sh verify_build_examples
358+
env:
359+
ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
360+
NO_BUILD_SETUP: 1
345361

346362
- stage: macos
347363
dependsOn: ["precheck"]

.github/workflows/stale.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010

1111
steps:
1212
- name: Prune Stale
13-
uses: actions/stale@v3.0.14
13+
uses: actions/stale@v3.0.15
1414
with:
1515
repo-token: ${{ secrets.GITHUB_TOKEN }}
16-
# Different amounts of days for issues/PRs are not currently supported but there is a PR
17-
# open for it: https://github.com/actions/stale/issues/214
18-
days-before-stale: 30
19-
days-before-close: 7
16+
days-before-issue-stale: 30
17+
days-before-issue-close: 7
18+
days-before-pr-stale: 10
19+
days-before-pr-close: 4
2020
stale-issue-message: >
2121
This issue has been automatically marked as stale because it has not had activity in the
2222
last 30 days. It will be closed in the next 7 days unless it is tagged "help wanted" or "no stalebot" or other activity
@@ -27,16 +27,16 @@ jobs:
2727
Thank you for your contributions.
2828
stale-pr-message: >
2929
This pull request has been automatically marked as stale because it has not had
30-
activity in the last 30 days. It will be closed in 7 days if no further activity occurs. Please
30+
activity in the last 10 days. It will be closed in 4 days if no further activity occurs. Please
3131
feel free to give a status update now, ping for review, or re-open when it's ready.
3232
Thank you for your contributions!
3333
close-pr-message: >
3434
This pull request has been automatically closed because it has not had
35-
activity in the last 37 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
35+
activity in the last 14 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
3636
Thank you for your contributions!
3737
stale-issue-label: 'stale'
3838
exempt-issue-labels: 'no stalebot,help wanted'
3939
stale-pr-label: 'stale'
4040
exempt-pr-labels: 'no stalebot'
4141
operations-per-run: 500
42-
ascending: true
42+
ascending: true

CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ extensions/filters/common/original_src @snowp @klarose
147147
# Compression
148148
/*/extensions/compression/common @junr03 @rojkov
149149
/*/extensions/compression/gzip @junr03 @rojkov
150+
/*/extensions/compression/brotli @junr03 @rojkov
150151
/*/extensions/filters/http/decompressor @rojkov @dio
151152
# Watchdog Extensions
152153
/*/extensions/watchdog/profile_action @kbaichoo @antoniovicente

api/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ proto_library(
165165
"//envoy/extensions/common/matching/v3:pkg",
166166
"//envoy/extensions/common/ratelimit/v3:pkg",
167167
"//envoy/extensions/common/tap/v3:pkg",
168+
"//envoy/extensions/compression/brotli/compressor/v3:pkg",
169+
"//envoy/extensions/compression/brotli/decompressor/v3:pkg",
168170
"//envoy/extensions/compression/gzip/compressor/v3:pkg",
169171
"//envoy/extensions/compression/gzip/decompressor/v3:pkg",
170172
"//envoy/extensions/filters/common/dependency/v3:pkg",

api/STYLE.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ In addition, the following conventions should be followed:
2525

2626
* Use [wrapped scalar
2727
types](https://github.com/google/protobuf/blob/master/src/google/protobuf/wrappers.proto)
28-
where there is a real need for the field to have a default value that does not
29-
match the proto3 defaults (0/false/""). This should not be done for fields
30-
where the proto3 defaults make sense. All things being equal, pick appropriate
31-
logic, e.g. enable vs. disable for a `bool` field, such that the proto3
32-
defaults work, but only where this doesn't result in API gymnastics.
28+
if there is any potential need for a field to have a default value that does not
29+
match the proto3 defaults (0/false/""). For example, new features whose
30+
default value may change in the future or security mitigations that should be
31+
default safe in the future but are temporarily not enabled.
3332

3433
* Use a `[#not-implemented-hide:]` `protodoc` annotation in comments for fields that lack Envoy
3534
implementation. These indicate that the entity is not implemented in Envoy and the entity

api/envoy/admin/v3/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2
77
api_proto_package(
88
deps = [
99
"//envoy/admin/v2alpha:pkg",
10-
"//envoy/annotations:pkg",
1110
"//envoy/config/bootstrap/v3:pkg",
1211
"//envoy/config/cluster/v3:pkg",
1312
"//envoy/config/core/v3:pkg",

api/envoy/admin/v3/config_dump.proto

+55-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,31 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
1717

1818
// [#protodoc-title: ConfigDump]
1919

20+
// Resource status from the view of a xDS client, which tells the synchronization
21+
// status between the xDS client and the xDS server.
22+
enum ClientResourceStatus {
23+
// Resource status is not available/unknown.
24+
UNKNOWN = 0;
25+
26+
// Client requested this resource but hasn't received any update from management
27+
// server. The client will not fail requests, but will queue them until update
28+
// arrives or the client times out waiting for the resource.
29+
REQUESTED = 1;
30+
31+
// This resource has been requested by the client but has either not been
32+
// delivered by the server or was previously delivered by the server and then
33+
// subsequently removed from resources provided by the server. For more
34+
// information, please refer to the :ref:`"Knowing When a Requested Resource
35+
// Does Not Exist" <xds_protocol_resource_not_existed>` section.
36+
DOES_NOT_EXIST = 2;
37+
38+
// Client received this resource and replied with ACK.
39+
ACKED = 3;
40+
41+
// Client received this resource and replied with NACK.
42+
NACKED = 4;
43+
}
44+
2045
// The :ref:`/config_dump <operations_admin_interface_config_dump>` admin endpoint uses this wrapper
2146
// message to maintain and serve arbitrary configuration information from any component in Envoy.
2247
message ConfigDump {
@@ -114,7 +139,7 @@ message ListenersConfigDump {
114139
}
115140

116141
// Describes a dynamically loaded listener via the LDS API.
117-
// [#next-free-field: 6]
142+
// [#next-free-field: 7]
118143
message DynamicListener {
119144
option (udpa.annotations.versioning).previous_message_type =
120145
"envoy.admin.v2alpha.ListenersConfigDump.DynamicListener";
@@ -143,6 +168,10 @@ message ListenersConfigDump {
143168
// resource along with the reason and timestamp. For successfully updated or
144169
// acknowledged resource, this field should be empty.
145170
UpdateFailureState error_state = 5;
171+
172+
// The client status of this resource.
173+
// [#not-implemented-hide:]
174+
ClientResourceStatus client_status = 6;
146175
}
147176

148177
// This is the :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the
@@ -177,6 +206,7 @@ message ClustersConfigDump {
177206
}
178207

179208
// Describes a dynamically loaded cluster via the CDS API.
209+
// [#next-free-field: 6]
180210
message DynamicCluster {
181211
option (udpa.annotations.versioning).previous_message_type =
182212
"envoy.admin.v2alpha.ClustersConfigDump.DynamicCluster";
@@ -199,6 +229,10 @@ message ClustersConfigDump {
199229
// acknowledged resource, this field should be empty.
200230
// [#not-implemented-hide:]
201231
UpdateFailureState error_state = 4;
232+
233+
// The client status of this resource.
234+
// [#not-implemented-hide:]
235+
ClientResourceStatus client_status = 5;
202236
}
203237

204238
// This is the :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the
@@ -240,6 +274,7 @@ message RoutesConfigDump {
240274
google.protobuf.Timestamp last_updated = 2;
241275
}
242276

277+
// [#next-free-field: 6]
243278
message DynamicRouteConfig {
244279
option (udpa.annotations.versioning).previous_message_type =
245280
"envoy.admin.v2alpha.RoutesConfigDump.DynamicRouteConfig";
@@ -261,6 +296,10 @@ message RoutesConfigDump {
261296
// acknowledged resource, this field should be empty.
262297
// [#not-implemented-hide:]
263298
UpdateFailureState error_state = 4;
299+
300+
// The client status of this resource.
301+
// [#not-implemented-hide:]
302+
ClientResourceStatus client_status = 5;
264303
}
265304

266305
// The statically loaded route configs.
@@ -292,7 +331,7 @@ message ScopedRoutesConfigDump {
292331
google.protobuf.Timestamp last_updated = 3;
293332
}
294333

295-
// [#next-free-field: 6]
334+
// [#next-free-field: 7]
296335
message DynamicScopedRouteConfigs {
297336
option (udpa.annotations.versioning).previous_message_type =
298337
"envoy.admin.v2alpha.ScopedRoutesConfigDump.DynamicScopedRouteConfigs";
@@ -317,6 +356,10 @@ message ScopedRoutesConfigDump {
317356
// acknowledged resource, this field should be empty.
318357
// [#not-implemented-hide:]
319358
UpdateFailureState error_state = 5;
359+
360+
// The client status of this resource.
361+
// [#not-implemented-hide:]
362+
ClientResourceStatus client_status = 6;
320363
}
321364

322365
// The statically loaded scoped route configs.
@@ -332,7 +375,7 @@ message SecretsConfigDump {
332375
"envoy.admin.v2alpha.SecretsConfigDump";
333376

334377
// DynamicSecret contains secret information fetched via SDS.
335-
// [#next-free-field: 6]
378+
// [#next-free-field: 7]
336379
message DynamicSecret {
337380
option (udpa.annotations.versioning).previous_message_type =
338381
"envoy.admin.v2alpha.SecretsConfigDump.DynamicSecret";
@@ -357,6 +400,10 @@ message SecretsConfigDump {
357400
// acknowledged resource, this field should be empty.
358401
// [#not-implemented-hide:]
359402
UpdateFailureState error_state = 5;
403+
404+
// The client status of this resource.
405+
// [#not-implemented-hide:]
406+
ClientResourceStatus client_status = 6;
360407
}
361408

362409
// StaticSecret specifies statically loaded secret in bootstrap.
@@ -400,6 +447,7 @@ message EndpointsConfigDump {
400447
google.protobuf.Timestamp last_updated = 2;
401448
}
402449

450+
// [#next-free-field: 6]
403451
message DynamicEndpointConfig {
404452
// [#not-implemented-hide:] This is the per-resource version information. This version is currently taken from the
405453
// :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` field at the time that
@@ -418,6 +466,10 @@ message EndpointsConfigDump {
418466
// acknowledged resource, this field should be empty.
419467
// [#not-implemented-hide:]
420468
UpdateFailureState error_state = 4;
469+
470+
// The client status of this resource.
471+
// [#not-implemented-hide:]
472+
ClientResourceStatus client_status = 5;
421473
}
422474

423475
// The statically loaded endpoint configs.

api/envoy/admin/v3/init_dump.proto

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ syntax = "proto3";
33
package envoy.admin.v3;
44

55
import "udpa/annotations/status.proto";
6-
import "udpa/annotations/versioning.proto";
76

87
option java_package = "io.envoyproxy.envoy.admin.v3";
98
option java_outer_classname = "InitDumpProto";

api/envoy/admin/v3/server_info.proto

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import "envoy/config/core/v3/base.proto";
66

77
import "google/protobuf/duration.proto";
88

9-
import "envoy/annotations/deprecation.proto";
109
import "udpa/annotations/status.proto";
1110
import "udpa/annotations/versioning.proto";
1211

api/envoy/admin/v4alpha/BUILD

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)