From a85c97cafa4195bf7121a5e328a558ff77358fe2 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Fri, 20 Nov 2020 15:07:47 +0530 Subject: [PATCH 1/4] v3 package update for previous_hosts proto Signed-off-by: Abhay Narayan Katare --- api/envoy/config/retry/previous_hosts/v3/BUILD | 9 +++++++++ .../retry/previous_hosts/v3/previous_hosts.proto | 16 ++++++++++++++++ docs/root/api-v3/config/retry/retry.rst | 1 + 3 files changed, 26 insertions(+) create mode 100644 api/envoy/config/retry/previous_hosts/v3/BUILD create mode 100644 api/envoy/config/retry/previous_hosts/v3/previous_hosts.proto diff --git a/api/envoy/config/retry/previous_hosts/v3/BUILD b/api/envoy/config/retry/previous_hosts/v3/BUILD new file mode 100644 index 000000000000..ef3541ebcb1d --- /dev/null +++ b/api/envoy/config/retry/previous_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/previous_hosts/v3/previous_hosts.proto b/api/envoy/config/retry/previous_hosts/v3/previous_hosts.proto new file mode 100644 index 000000000000..349802ebe92d --- /dev/null +++ b/api/envoy/config/retry/previous_hosts/v3/previous_hosts.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package envoy.config.retry.previous_hosts.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.config.retry.previous_hosts.v3"; +option java_outer_classname = "PreviousHostsProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Previous Hosts Predicate] +// [#extension: envoy.retry_host_predicates.previous_hosts] + +message PreviousHostsPredicate { +} diff --git a/docs/root/api-v3/config/retry/retry.rst b/docs/root/api-v3/config/retry/retry.rst index 2ba4572ab2ed..75b69edd2bc1 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/* From 7fac2488a042f6dc782152a39ec560ec04edd2c1 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Fri, 20 Nov 2020 15:14:28 +0530 Subject: [PATCH 2/4] v3 package update for previous_hosts proto Signed-off-by: Abhay Narayan Katare --- api/BUILD | 1 + api/versioning/BUILD | 1 + .../envoy/config/retry/previous_hosts/v3/BUILD | 9 +++++++++ .../retry/previous_hosts/v3/previous_hosts.proto | 16 ++++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 generated_api_shadow/envoy/config/retry/previous_hosts/v3/BUILD create mode 100644 generated_api_shadow/envoy/config/retry/previous_hosts/v3/previous_hosts.proto diff --git a/api/BUILD b/api/BUILD index 73912d9fbbac..f2f0a1f8d914 100644 --- a/api/BUILD +++ b/api/BUILD @@ -144,6 +144,7 @@ proto_library( "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", + "//envoy/config/retry/previous_hosts/v3:pkg", "//envoy/config/route/v3:pkg", "//envoy/config/tap/v3:pkg", "//envoy/config/trace/v3:pkg", diff --git a/api/versioning/BUILD b/api/versioning/BUILD index 1bc4b51231e2..0819861374f5 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -27,6 +27,7 @@ proto_library( "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", + "//envoy/config/retry/previous_hosts/v3:pkg", "//envoy/config/route/v3:pkg", "//envoy/config/tap/v3:pkg", "//envoy/config/trace/v3:pkg", diff --git a/generated_api_shadow/envoy/config/retry/previous_hosts/v3/BUILD b/generated_api_shadow/envoy/config/retry/previous_hosts/v3/BUILD new file mode 100644 index 000000000000..ef3541ebcb1d --- /dev/null +++ b/generated_api_shadow/envoy/config/retry/previous_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/previous_hosts/v3/previous_hosts.proto b/generated_api_shadow/envoy/config/retry/previous_hosts/v3/previous_hosts.proto new file mode 100644 index 000000000000..349802ebe92d --- /dev/null +++ b/generated_api_shadow/envoy/config/retry/previous_hosts/v3/previous_hosts.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package envoy.config.retry.previous_hosts.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.config.retry.previous_hosts.v3"; +option java_outer_classname = "PreviousHostsProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Previous Hosts Predicate] +// [#extension: envoy.retry_host_predicates.previous_hosts] + +message PreviousHostsPredicate { +} From f6fcc1648aa02fe648c5e1620bcc8aab0ec20516 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Fri, 20 Nov 2020 22:42:49 +0530 Subject: [PATCH 3/4] fixing build issue due to BUILD file Signed-off-by: Abhay Narayan Katare --- api/envoy/config/retry/previous_hosts/v3/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/envoy/config/retry/previous_hosts/v3/BUILD b/api/envoy/config/retry/previous_hosts/v3/BUILD index ef3541ebcb1d..ee92fb652582 100644 --- a/api/envoy/config/retry/previous_hosts/v3/BUILD +++ b/api/envoy/config/retry/previous_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 862997b5bc29d947dfe1c09a113b0db1320c68d0 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Sat, 21 Nov 2020 19:47:23 +0530 Subject: [PATCH 4/4] fixing build issues by updating proto_format.sh file Signed-off-by: Abhay Narayan Katare --- generated_api_shadow/envoy/config/retry/previous_hosts/v3/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated_api_shadow/envoy/config/retry/previous_hosts/v3/BUILD b/generated_api_shadow/envoy/config/retry/previous_hosts/v3/BUILD index ef3541ebcb1d..ee92fb652582 100644 --- a/generated_api_shadow/envoy/config/retry/previous_hosts/v3/BUILD +++ b/generated_api_shadow/envoy/config/retry/previous_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")