This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new f02e3508 docs: fix description error in upgrade doc (#2440)
f02e3508 is described below

commit f02e35086f1cf647dff04b5492b2511c0aab1af0
Author: AlinsRan <alins...@apache.org>
AuthorDate: Fri Jul 18 22:42:44 2025 +0800

    docs: fix description error in upgrade doc (#2440)
---
 docs/en/latest/concepts/resources.md |  2 +-
 docs/en/latest/upgrade-guide.md      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/en/latest/concepts/resources.md 
b/docs/en/latest/concepts/resources.md
index 7359fd46..df1a0681 100644
--- a/docs/en/latest/concepts/resources.md
+++ b/docs/en/latest/concepts/resources.md
@@ -70,7 +70,7 @@ Enable additional features not included in the standard 
Kubernetes Gateway API,
 
 ![Gateway API Extensions 
Overview](../../../assets/images/gateway-api-extensions-resources.png)
 
-## Ingress API Extensions
+### Ingress API Extensions
 
 APISIX Ingress Controller CRDs extend Kubernetes functionality to provide 
declarative configuration management for the Apache APISIX gateway, supporting 
advanced routing, traffic management, and security policies.
 
diff --git a/docs/en/latest/upgrade-guide.md b/docs/en/latest/upgrade-guide.md
index 343fd366..6b3fa7f9 100644
--- a/docs/en/latest/upgrade-guide.md
+++ b/docs/en/latest/upgrade-guide.md
@@ -64,7 +64,7 @@ etcdserver:
 
 ##### Controller-Only Configuration Source
 
-In 2.0.0, all data plane configurations must originate from the Ingress 
Controller. Configurations via Admin API or any external methods are no longer 
supported and will be ignored or may cause errors.
+Starting with APISIX Ingress Controller 2.0.0, the controller is the single 
source of truth. Manual Admin API changes will be overwritten on the next full 
sync. The prior approach, which allowed controller-managed and manually added 
configurations to coexist, was incorrect and is now deprecated.
 
 #### APISIX With Etcd (Admin API) synchronization performance
 
@@ -139,7 +139,7 @@ spec:
 
 #### `ApisixUpstream`
 
-Due to current limitations in the ADC (API Definition Controller) component, 
the following fields are not yet supported:
+Due to current limitations in the [ADC](https://github.com/api7/adc) 
component, the following fields are not yet supported:
 
 * `spec.discovery`: Service Discovery
 * `spec.healthCheck`: Health Checking
@@ -203,10 +203,10 @@ Ingress annotations used in version 1.x.x are not fully 
supported in 2.0.0. If y
 
 ### Summary
 
-| Category         | Description                                               
                                           |
-| ---------------- | 
----------------------------------------------------------------------------------------------------
 |
-| Architecture     | The `mock-etcd` component has been removed. Configuration 
is now centralized through the Controller. |
-| Configuration    | Static configuration fields have been removed. Use 
`GatewayProxy` CRD to configure the data plane.   |
-| Data Plane       | Requires APISIX version 3.13.0 running in `standalone` 
mode.                                         |
-| API              | Some fields in `Ingress Annotations` and `ApisixUpstream` 
are not yet supported.                     |
-| Upgrade Strategy | Blue-green deployment or canary release is recommended 
before full switchover.                       |
+| Category         | Description                                               
                                                                        |
+| ---------------- | 
---------------------------------------------------------------------------------------------------------------------------------
 |
+| Architecture     | The `mock-etcd` component has been removed. Configuration 
is now centralized through the Controller.                              |
+| Configuration    | Static configuration fields have been removed. Use 
`GatewayProxy` CRD to configure the data plane.                                |
+| Data Plane       | The Admin API configuration method is still supported. 
Support for the Standalone API-driven mode was introduced in APISIX 3.13.0 and 
later. |
+| API              | Some fields in `Ingress Annotations` and `ApisixUpstream` 
are not yet supported.                                                  |
+| Upgrade Strategy | Blue-green deployment or canary release is recommended 
before full switchover.                                                    |

Reply via email to