From be01f8ae38ab48d38ab28dac9a682d789fa4bc09 Mon Sep 17 00:00:00 2001 From: Kuat Date: Wed, 11 Oct 2023 16:37:56 -0700 Subject: [PATCH] api: mark the unified matcher API as stable (#30112) Commit Message: The API is now used in many places and must follow safe deprecation practices. Additional Description: Risk Level: low Testing: none Docs Changes: Release Notes: Platform Specific Features: --- api/envoy/config/common/matcher/v3/BUILD | 1 - api/envoy/config/common/matcher/v3/matcher.proto | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/api/envoy/config/common/matcher/v3/BUILD b/api/envoy/config/common/matcher/v3/BUILD index 221350b756d4..2f90ace882d9 100644 --- a/api/envoy/config/common/matcher/v3/BUILD +++ b/api/envoy/config/common/matcher/v3/BUILD @@ -10,6 +10,5 @@ api_proto_package( "//envoy/config/route/v3:pkg", "//envoy/type/matcher/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", - "@com_github_cncf_udpa//xds/annotations/v3:pkg", ], ) diff --git a/api/envoy/config/common/matcher/v3/matcher.proto b/api/envoy/config/common/matcher/v3/matcher.proto index 5b9da519687a..49a146d73bd1 100644 --- a/api/envoy/config/common/matcher/v3/matcher.proto +++ b/api/envoy/config/common/matcher/v3/matcher.proto @@ -6,8 +6,6 @@ import "envoy/config/core/v3/extension.proto"; import "envoy/config/route/v3/route_components.proto"; import "envoy/type/matcher/v3/string.proto"; -import "xds/annotations/v3/status.proto"; - import "udpa/annotations/status.proto"; import "validate/validate.proto"; @@ -24,9 +22,10 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // is found the action specified by the most specific on_no_match will be evaluated. // As an on_no_match might result in another matching tree being evaluated, this process // might repeat several times until the final OnMatch (or no match) is decided. +// +// .. note:: +// Please use the syntactically equivalent :ref:`matching API ` message Matcher { - option (xds.annotations.v3.message_status).work_in_progress = true; - // What to do if a match is successful. message OnMatch { oneof on_match {