You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2021/02/10 04:04:24 UTC

[apisix] branch master updated: docs: fix upstream.discovery_type optional description. (#3572)

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

spacewander 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 972a442  docs: fix upstream.discovery_type optional description. (#3572)
972a442 is described below

commit 972a442ab3f9e2aa5aa02694cc256c8beda65413
Author: Eaves <ea...@gmail.com>
AuthorDate: Wed Feb 10 12:04:18 2021 +0800

    docs: fix upstream.discovery_type optional description. (#3572)
---
 doc/admin-api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/admin-api.md b/doc/admin-api.md
index b007b8c..c82e25f 100644
--- a/doc/admin-api.md
+++ b/doc/admin-api.md
@@ -514,7 +514,7 @@ In addition to the basic complex equalization algorithm selection, APISIX's Upst
 |type            |required|the balancer algorithm|
 |nodes           |required, can't be used with `service_name` |Hash table, the key of the internal element is the upstream machine address list, the format is `Address + Port`, where the address part can be IP or domain name, such as `192.168.1.100:80`, `foo.com:80`, etc. Value is the weight of the node. In particular, when the weight value is `0`, it has a special meaning, which usually means that the upstream node is invalid and never wants to be selected. The `nodes` can be empty, whi [...]
 |service_name    |required, can't be used with `nodes` |the name of service used in the service discovery, see [discovery](discovery.md) for more details|
-|discovery_type |required, if `server_name` is used | the type of service discovery, see [discovery](discovery.md) for more details|
+|discovery_type |required, if `service_name` is used | the type of service discovery, see [discovery](discovery.md) for more details|
 |hash_on         |optional|This option is only valid if the `type` is `chash`. Supported types `vars`(Nginx variables), `header`(custom header), `cookie`, `consumer`, the default value is `vars`.|
 |key             |optional|This option is only valid if the `type` is `chash`. Find the corresponding node `id` according to `hash_on` and `key`. When `hash_on` is set as `vars`, `key` is the required parameter, for now, it support nginx built-in variables like `uri, server_name, server_addr, request_uri, remote_port, remote_addr, query_string, host, hostname, arg_***`, `arg_***` is arguments in the request line, [Nginx variables list](http://nginx.org/en/docs/varindex.html). When `hash_ [...]
 |checks          |optional|Configure the parameters of the health check. For details, refer to [health-check](health-check.md).|