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.git
The following commit(s) were added to refs/heads/master by this push:
new 3413ebb docs: tweak discovery via DNS doc (#3731)
3413ebb is described below
commit 3413ebba81c1aa092881ce1904909361b28ed75b
Author: 罗泽轩 <[email protected]>
AuthorDate: Tue Mar 2 21:10:17 2021 +0800
docs: tweak discovery via DNS doc (#3731)
---
docs/en/latest/config.json | 4 ----
docs/en/latest/discovery.md | 11 ++++-------
docs/en/latest/{ => discovery}/dns.md | 0
docs/zh/latest/discovery.md | 6 ++++--
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index e217436..ccf23e7 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -129,10 +129,6 @@
},
{
"type": "doc",
- "id": "dns"
- },
- {
- "type": "doc",
"id": "https"
},
{
diff --git a/docs/en/latest/discovery.md b/docs/en/latest/discovery.md
index 4a98cb2..d3ef9b2 100644
--- a/docs/en/latest/discovery.md
+++ b/docs/en/latest/discovery.md
@@ -48,9 +48,11 @@ Common registries: Eureka, Etcd, Consul, Zookeeper, Nacos
etc.
## Supported discovery registries
-Currently we support Eureka and service discovery via DNS, like Consul.
+Currently we support Eureka/Consul and service discovery via DNS.
-For service discovery via DNS, see [service discovery via
DNS](dns.md#service-discovery-via-dns).
+For service discovery via DNS, see [service discovery via
DNS](discovery/dns.md).
+
+For Consul, see [service discovery via Consul](discovery/consul_kv.md)
For Eureka, see below.
@@ -254,8 +256,3 @@ $ curl http://127.0.0.1:9080/apisix/admin/routes/2 -H
'X-API-KEY: edd1c9f034335f
Suppose both A-SERVICE and B-SERVICE provide a `/test` API. The above
configuration allows access to A-SERVICE's `/test` API through `/a/test` and
B-SERVICE's `/test` API through `/b/test`.
**Notice**：When configuring `upstream.service_name`, `upstream.nodes` will no
longer take effect, but will be replaced by 'nodes' obtained from the registry.
-
-## Discovery modules
-
-- eureka
-- [Consul KV](discovery/consul_kv.md)
diff --git a/docs/en/latest/dns.md b/docs/en/latest/discovery/dns.md
similarity index 100%
rename from docs/en/latest/dns.md
rename to docs/en/latest/discovery/dns.md
diff --git a/docs/zh/latest/discovery.md b/docs/zh/latest/discovery.md
index 051a4e3..261f242 100644
--- a/docs/zh/latest/discovery.md
+++ b/docs/zh/latest/discovery.md
@@ -47,9 +47,11 @@ title: 集成服务发现注册中心
## 当前支持的注册中心
-目前支持 Eureka 和基于 DNS 的服务注册发现，如 Consul 等。
+目前支持 Eureka / Consul 和基于 DNS 的服务注册发现。
-基于 DNS 的服务注册发现见 [基于 DNS
的服务支持发现](../../en/latest/dns.md#service-discovery-via-dns)。
+基于 DNS 的服务注册发现见 [基于 DNS 的服务支持发现](../../en/latest/discovery/dns.md)。
+
+Consul 的支持见 [基于 Consul 的服务支持发现](../../en/latest/discovery/consul_kv.md)
Eureka 的支持方式见下文。
