From 54f24aaec92a5c0e54bbaf57fc91415062529ffb Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Fri, 20 Nov 2020 14:34:20 +0530 Subject: [PATCH 1/4] new v3 packages for omit_canary_hosts Signed-off-by: Abhay Narayan Katare --- .../config/retry/omit_canary_hosts/v3/BUILD | 9 +++++++++ .../omit_canary_hosts/v3/omit_canary_hosts.proto | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 api/envoy/config/retry/omit_canary_hosts/v3/BUILD create mode 100644 api/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto diff --git a/api/envoy/config/retry/omit_canary_hosts/v3/BUILD b/api/envoy/config/retry/omit_canary_hosts/v3/BUILD new file mode 100644 index 0000000000000..ef3541ebcb1df --- /dev/null +++ b/api/envoy/config/retry/omit_canary_hosts/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/api/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto b/api/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto new file mode 100644 index 0000000000000..fe928ba733db7 --- /dev/null +++ b/api/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package envoy.config.retry.omit_canary_hosts.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.config.retry.omit_canary_hosts.v3"; +option java_outer_classname = "OmitCanaryHostsProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Omit Canary Hosts Predicate] +// [#extension: envoy.retry_host_predicates.omit_canary_hosts] + +message OmitCanaryHostsPredicate { +} From 76a3f3a6c13b46f5dbc1685c3e6b7c75bc0bb936 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Fri, 20 Nov 2020 14:52:58 +0530 Subject: [PATCH 2/4] v3 package fix for omit_canary_hosts proto Signed-off-by: Abhay Narayan Katare --- api/BUILD | 1 + api/versioning/BUILD | 1 + docs/root/api-v3/config/retry/retry.rst | 1 + .../config/retry/omit_canary_hosts/v3/BUILD | 9 +++++++++ .../omit_canary_hosts/v3/omit_canary_hosts.proto | 16 ++++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/BUILD create mode 100644 generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto diff --git a/api/BUILD b/api/BUILD index 73912d9fbbacc..1a418fd8f15e5 100644 --- a/api/BUILD +++ b/api/BUILD @@ -143,6 +143,7 @@ proto_library( "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", + "//envoy/config/retry/omit_canary_hosts/v3:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", "//envoy/config/route/v3:pkg", "//envoy/config/tap/v3:pkg", diff --git a/api/versioning/BUILD b/api/versioning/BUILD index 1bc4b51231e2a..0e415075b716d 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -26,6 +26,7 @@ proto_library( "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", + "//envoy/config/retry/omit_canary_hosts/v3:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", "//envoy/config/route/v3:pkg", "//envoy/config/tap/v3:pkg", diff --git a/docs/root/api-v3/config/retry/retry.rst b/docs/root/api-v3/config/retry/retry.rst index 2ba4572ab2edc..75b69edd2bc15 100644 --- a/docs/root/api-v3/config/retry/retry.rst +++ b/docs/root/api-v3/config/retry/retry.rst @@ -7,4 +7,5 @@ Retry Predicates */empty/* */v2/* + */v3/* ../../extensions/retry/**/v3/* diff --git a/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/BUILD b/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/BUILD new file mode 100644 index 0000000000000..ef3541ebcb1df --- /dev/null +++ b/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto b/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto new file mode 100644 index 0000000000000..fe928ba733db7 --- /dev/null +++ b/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package envoy.config.retry.omit_canary_hosts.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.config.retry.omit_canary_hosts.v3"; +option java_outer_classname = "OmitCanaryHostsProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Omit Canary Hosts Predicate] +// [#extension: envoy.retry_host_predicates.omit_canary_hosts] + +message OmitCanaryHostsPredicate { +} From e8ade226cbef69bcccae67fbb88e65a20616f96d Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Fri, 20 Nov 2020 22:49:04 +0530 Subject: [PATCH 3/4] fix build issues due to BUILD file Signed-off-by: Abhay Narayan Katare --- api/envoy/config/retry/omit_canary_hosts/v3/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/envoy/config/retry/omit_canary_hosts/v3/BUILD b/api/envoy/config/retry/omit_canary_hosts/v3/BUILD index ef3541ebcb1df..ee92fb652582e 100644 --- a/api/envoy/config/retry/omit_canary_hosts/v3/BUILD +++ b/api/envoy/config/retry/omit_canary_hosts/v3/BUILD @@ -1,4 +1,4 @@ -# DO NOT EDIT. This file is generated by tools/proto_sync.py. +# 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") From 049a907d97467c7259af4cd1003ff0709f583be0 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Sat, 21 Nov 2020 16:31:14 +0530 Subject: [PATCH 4/4] update in proto_format.sh file to fix build issues Signed-off-by: Abhay Narayan Katare --- .../envoy/config/retry/omit_canary_hosts/v3/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/BUILD b/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/BUILD index ef3541ebcb1df..ee92fb652582e 100644 --- a/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/BUILD +++ b/generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/BUILD @@ -1,4 +1,4 @@ -# DO NOT EDIT. This file is generated by tools/proto_sync.py. +# 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")