From e921b9488c3d5cd9f9c414950a2a5bf4f95ab7e5 Mon Sep 17 00:00:00 2001 From: Traky Deng Date: Thu, 2 Oct 2025 14:19:42 +0800 Subject: [PATCH] docs: clarify support for Ingress Annotations (#2575) (cherry picked from commit 0f29ac7b65a8a6561c46a376a4a930fffd270cbe) --- docs/en/latest/upgrade-guide.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/en/latest/upgrade-guide.md b/docs/en/latest/upgrade-guide.md index 7d738edf..cafc357b 100644 --- a/docs/en/latest/upgrade-guide.md +++ b/docs/en/latest/upgrade-guide.md @@ -154,7 +154,11 @@ Currently supports networking.k8s.io/v1 only. Support for other Ingress API vers ##### Limited Support for Ingress Annotations +<<<<<<< HEAD The following Ingress annotations supported in version 1.x.x are not supported in the current version. They will be supported in a future release. If your existing setup relies on any of the following annotations, validate compatibility or consider delaying the upgrade. +======= +The following Ingress annotations supported in version 1.x.x are not supported in the current version (2.0.0-rc*). They will be supported in the 2.0.0 final release. If your existing setup relies on any of the following annotations, validate compatibility or consider delaying the upgrade. +>>>>>>> 0f29ac7b (docs: clarify support for Ingress Annotations (#2575)) | Ingress Annotations | | ------------------------------------------------------ |