-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
extensions: update straggler v2 extensions to v3. #14907
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e11c00d
extensions: update straggler v2 extensions to v3.
htuch df41345
Typo.
htuch 3957492
Merge remote-tracking branch 'upstream/main' into missing-v3-configs
htuch df71e3a
Merge remote-tracking branch 'upstream/main' into missing-v3-configs
htuch 7ad6b62
Merge remote-tracking branch 'upstream/main' into missing-v3-configs
htuch 12289ee
Merge remote-tracking branch 'upstream/main' into missing-v3-configs
htuch 77f4596
Update some configs/docs refs.
htuch File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| syntax = "proto3"; | ||
|
|
||
| package envoy.extensions.health_checkers.redis.v3; | ||
|
|
||
| import "udpa/annotations/status.proto"; | ||
| import "udpa/annotations/versioning.proto"; | ||
|
|
||
| option java_package = "io.envoyproxy.envoy.extensions.health_checkers.redis.v3"; | ||
| option java_outer_classname = "RedisProto"; | ||
| option java_multiple_files = true; | ||
| option (udpa.annotations.file_status).package_version_status = ACTIVE; | ||
|
|
||
| // [#protodoc-title: Redis] | ||
| // Redis health checker :ref:`configuration overview <config_health_checkers_redis>`. | ||
| // [#extension: envoy.health_checkers.redis] | ||
|
|
||
| message Redis { | ||
| option (udpa.annotations.versioning).previous_message_type = | ||
| "envoy.config.health_checker.redis.v2.Redis"; | ||
|
|
||
| // If set, optionally perform ``EXISTS <key>`` instead of ``PING``. A return value | ||
| // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other | ||
| // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance | ||
| // by setting the specified key to any value and waiting for traffic to drain. | ||
| string key = 1; | ||
| } |
12 changes: 12 additions & 0 deletions
12
api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. | ||
|
|
||
| load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") | ||
|
|
||
| licenses(["notice"]) # Apache 2 | ||
|
|
||
| api_proto_package( | ||
| deps = [ | ||
| "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", | ||
| "@com_github_cncf_udpa//udpa/annotations:pkg", | ||
| ], | ||
| ) |
25 changes: 25 additions & 0 deletions
25
api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| syntax = "proto3"; | ||
|
|
||
| package envoy.extensions.resource_monitors.fixed_heap.v3; | ||
|
|
||
| import "udpa/annotations/status.proto"; | ||
| import "udpa/annotations/versioning.proto"; | ||
| import "validate/validate.proto"; | ||
|
|
||
| option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.fixed_heap.v3"; | ||
| option java_outer_classname = "FixedHeapProto"; | ||
| option java_multiple_files = true; | ||
| option (udpa.annotations.file_status).package_version_status = ACTIVE; | ||
|
|
||
| // [#protodoc-title: Fixed heap] | ||
| // [#extension: envoy.resource_monitors.fixed_heap] | ||
|
|
||
| // The fixed heap resource monitor reports the Envoy process memory pressure, computed as a | ||
| // fraction of currently reserved heap memory divided by a statically configured maximum | ||
| // specified in the FixedHeapConfig. | ||
| message FixedHeapConfig { | ||
| option (udpa.annotations.versioning).previous_message_type = | ||
| "envoy.config.resource_monitor.fixed_heap.v2alpha.FixedHeapConfig"; | ||
|
|
||
| uint64 max_heap_size_bytes = 1 [(validate.rules).uint64 = {gt: 0}]; | ||
| } |
12 changes: 12 additions & 0 deletions
12
api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. | ||
|
|
||
| load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") | ||
|
|
||
| licenses(["notice"]) # Apache 2 | ||
|
|
||
| api_proto_package( | ||
| deps = [ | ||
| "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", | ||
| "@com_github_cncf_udpa//udpa/annotations:pkg", | ||
| ], | ||
| ) |
26 changes: 26 additions & 0 deletions
26
api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| syntax = "proto3"; | ||
|
|
||
| package envoy.extensions.resource_monitors.injected_resource.v3; | ||
|
|
||
| import "udpa/annotations/status.proto"; | ||
| import "udpa/annotations/versioning.proto"; | ||
| import "validate/validate.proto"; | ||
|
|
||
| option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.injected_resource.v3"; | ||
| option java_outer_classname = "InjectedResourceProto"; | ||
| option java_multiple_files = true; | ||
| option (udpa.annotations.file_status).package_version_status = ACTIVE; | ||
|
|
||
| // [#protodoc-title: Injected resource] | ||
| // [#extension: envoy.resource_monitors.injected_resource] | ||
|
|
||
| // The injected resource monitor allows injecting a synthetic resource pressure into Envoy | ||
| // via a text file, which must contain a floating-point number in the range [0..1] representing | ||
| // the resource pressure and be updated atomically by a symbolic link swap. | ||
| // This is intended primarily for integration tests to force Envoy into an overloaded state. | ||
| message InjectedResourceConfig { | ||
| option (udpa.annotations.versioning).previous_message_type = | ||
| "envoy.config.resource_monitor.injected_resource.v2alpha.InjectedResourceConfig"; | ||
|
|
||
| string filename = 1 [(validate.rules).string = {min_len: 1}]; | ||
| } |
12 changes: 12 additions & 0 deletions
12
api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. | ||
|
|
||
| load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") | ||
|
|
||
| licenses(["notice"]) # Apache 2 | ||
|
|
||
| api_proto_package( | ||
| deps = [ | ||
| "//envoy/config/retry/omit_canary_hosts/v2:pkg", | ||
| "@com_github_cncf_udpa//udpa/annotations:pkg", | ||
| ], | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,4 +5,5 @@ Health checkers | |
| :glob: | ||
| :maxdepth: 2 | ||
|
|
||
| */v2/* | ||
| */v2/* | ||
| ../../extensions/health_checkers/*/v3/* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,4 +7,5 @@ Resource monitors | |
| :glob: | ||
| :maxdepth: 2 | ||
|
|
||
| ../../extensions/resource_monitors/*/v3/* | ||
| */v2alpha/* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,5 +7,4 @@ Retry Predicates | |
|
|
||
| */empty/* | ||
| */v2/* | ||
| */v3/* | ||
| ../../extensions/retry/**/v3/* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
won't this break wire compatibility?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I merged this one only a short while back and it's never been used by Envoy, so we can do this.