You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2022/03/17 07:24:29 UTC
[GitHub] [apisix] spacewander opened a new pull request #6646: feat: release 2.13.0
spacewander opened a new pull request #6646:
URL: https://github.com/apache/apisix/pull/6646
Signed-off-by: spacewander <sp...@gmail.com>
### Description
<!-- Please include a summary of the change and which issue is fixed. -->
<!-- Please also include relevant motivation and context. -->
Fixes # (issue)
### Checklist
- [x] I have explained the need for this PR and the problem it solves
- [ ] I have explained the changes or the new features added to this PR
- [ ] I have added tests corresponding to this change
- [x] I have updated the documentation to reflect this change
- [x] I have verified that this change is backward compatible (If not, please discuss on the [APISIX mailing list](https://github.com/apache/apisix/tree/master#community) first)
<!--
Note
1. Mark the PR as draft until it's ready to be reviewed.
2. Always add/update tests for any changes unless you have a good reason.
3. Always update the documentation to reflect the changes made in the PR.
4. Make a new commit to resolve conversations instead of `push -f`.
5. To resolve merge conflicts, merge master instead of rebasing.
6. Use "request review" to notify the reviewer after making changes.
7. Only a reviewer can mark a conversation as resolved.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] leslie-tsang commented on a change in pull request #6646: feat: release 2.13.0
Posted by GitBox <gi...@apache.org>.
leslie-tsang commented on a change in pull request #6646:
URL: https://github.com/apache/apisix/pull/6646#discussion_r830710170
##########
File path: docs/zh/latest/discovery/kubernetes.md
##########
@@ -93,28 +98,89 @@ discovery:
#token_file: # enter file path here
```
-# Kubernetes 服务发现插件的使用
+## Kubernetes 服务发现模块的查询接口
+
+Kubernetes 服务发现模块遵循 [_APISIX Discovery 规范_](https://github.com/apache/apisix/blob/master/docs/zh/latest/discovery.md) 提供查询接口
+
+**函数:**
+ nodes(service_name)
+
+**说明:**
+ service_name 必须满足格式: [namespace]/[name]:[portName]
+
+ + namespace: Endpoints 所在的命名空间
+
+ + name: Endpoints 的资源名
+
+ + portName: Endpoints 定义包含的 portName, 如果 Endpoints 没有定义 portName, 请使用 targetPort,Port 代替
+
+**返回值:**
+ 以如下 Endpoints 为例:
-Kubernetes 服务发现插件提供与其他服务发现插件相同的查询接口 -> nodes(service_name) \
-service_name 的 pattern 如下:
-> _[namespace]/[name]:[portName]_
+ ```yaml
+ apiVersion: v1
+ kind: Endpoints
+ metadata:
+ name: plat-dev
+ namespace: default
+ subsets:
+ - addresses:
+ - ip: "10.5.10.109"
+ - ip: "10.5.10.110"
+ ports:
+ - port: 3306
+ ```
-如果 kubernetes Endpoint 没有定义 portName, Kubernetes 服务发现插件会依次使用 targetPort, port 代替
+ nodes("default/plat-dev:3306") 调用会得到如下的返回值:
-# Q&A
+ ```
Review comment:
Maybe `json` would be better?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] spacewander commented on pull request #6646: feat: release 2.13.0
Posted by GitBox <gi...@apache.org>.
spacewander commented on pull request #6646:
URL: https://github.com/apache/apisix/pull/6646#issuecomment-1073178824
Let's cherry pick https://github.com/apache/apisix/pull/6663 before releasing.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] juzhiyuan commented on a change in pull request #6646: feat: release 2.13.0
Posted by GitBox <gi...@apache.org>.
juzhiyuan commented on a change in pull request #6646:
URL: https://github.com/apache/apisix/pull/6646#discussion_r830786493
##########
File path: docs/zh/latest/discovery/kubernetes.md
##########
@@ -93,28 +98,89 @@ discovery:
#token_file: # enter file path here
```
-# Kubernetes 服务发现插件的使用
+## Kubernetes 服务发现模块的查询接口
+
+Kubernetes 服务发现模块遵循 [_APISIX Discovery 规范_](https://github.com/apache/apisix/blob/master/docs/zh/latest/discovery.md) 提供查询接口
+
+**函数:**
+ nodes(service_name)
+
+**说明:**
+ service_name 必须满足格式: [namespace]/[name]:[portName]
+
+ + namespace: Endpoints 所在的命名空间
+
+ + name: Endpoints 的资源名
+
+ + portName: Endpoints 定义包含的 portName, 如果 Endpoints 没有定义 portName, 请使用 targetPort,Port 代替
+
+**返回值:**
+ 以如下 Endpoints 为例:
-Kubernetes 服务发现插件提供与其他服务发现插件相同的查询接口 -> nodes(service_name) \
-service_name 的 pattern 如下:
-> _[namespace]/[name]:[portName]_
+ ```yaml
+ apiVersion: v1
+ kind: Endpoints
+ metadata:
+ name: plat-dev
+ namespace: default
+ subsets:
+ - addresses:
+ - ip: "10.5.10.109"
+ - ip: "10.5.10.110"
+ ports:
+ - port: 3306
+ ```
-如果 kubernetes Endpoint 没有定义 portName, Kubernetes 服务发现插件会依次使用 targetPort, port 代替
+ nodes("default/plat-dev:3306") 调用会得到如下的返回值:
-# Q&A
+ ```
Review comment:
agree
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] leslie-tsang commented on a change in pull request #6646: feat: release 2.13.0
Posted by GitBox <gi...@apache.org>.
leslie-tsang commented on a change in pull request #6646:
URL: https://github.com/apache/apisix/pull/6646#discussion_r830779020
##########
File path: docs/zh/latest/discovery/kubernetes.md
##########
@@ -93,28 +98,89 @@ discovery:
#token_file: # enter file path here
```
-# Kubernetes 服务发现插件的使用
+## Kubernetes 服务发现模块的查询接口
+
+Kubernetes 服务发现模块遵循 [_APISIX Discovery 规范_](https://github.com/apache/apisix/blob/master/docs/zh/latest/discovery.md) 提供查询接口
+
+**函数:**
+ nodes(service_name)
+
+**说明:**
+ service_name 必须满足格式: [namespace]/[name]:[portName]
+
+ + namespace: Endpoints 所在的命名空间
+
+ + name: Endpoints 的资源名
+
+ + portName: Endpoints 定义包含的 portName, 如果 Endpoints 没有定义 portName, 请使用 targetPort,Port 代替
+
+**返回值:**
+ 以如下 Endpoints 为例:
-Kubernetes 服务发现插件提供与其他服务发现插件相同的查询接口 -> nodes(service_name) \
-service_name 的 pattern 如下:
-> _[namespace]/[name]:[portName]_
+ ```yaml
+ apiVersion: v1
+ kind: Endpoints
+ metadata:
+ name: plat-dev
+ namespace: default
+ subsets:
+ - addresses:
+ - ip: "10.5.10.109"
+ - ip: "10.5.10.110"
+ ports:
+ - port: 3306
+ ```
-如果 kubernetes Endpoint 没有定义 portName, Kubernetes 服务发现插件会依次使用 targetPort, port 代替
+ nodes("default/plat-dev:3306") 调用会得到如下的返回值:
-# Q&A
+ ```
Review comment:
> I prefer to solve it in the master branch? And would be good to check it in the CI if the mark is required.
Agree.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] spacewander closed pull request #6646: feat: release 2.13.0
Posted by GitBox <gi...@apache.org>.
spacewander closed pull request #6646:
URL: https://github.com/apache/apisix/pull/6646
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] juzhiyuan commented on a change in pull request #6646: feat: release 2.13.0
Posted by GitBox <gi...@apache.org>.
juzhiyuan commented on a change in pull request #6646:
URL: https://github.com/apache/apisix/pull/6646#discussion_r830706087
##########
File path: docs/zh/latest/discovery/kubernetes.md
##########
@@ -93,28 +98,89 @@ discovery:
#token_file: # enter file path here
```
-# Kubernetes 服务发现插件的使用
+## Kubernetes 服务发现模块的查询接口
+
+Kubernetes 服务发现模块遵循 [_APISIX Discovery 规范_](https://github.com/apache/apisix/blob/master/docs/zh/latest/discovery.md) 提供查询接口
+
+**函数:**
+ nodes(service_name)
+
+**说明:**
+ service_name 必须满足格式: [namespace]/[name]:[portName]
+
+ + namespace: Endpoints 所在的命名空间
+
+ + name: Endpoints 的资源名
+
+ + portName: Endpoints 定义包含的 portName, 如果 Endpoints 没有定义 portName, 请使用 targetPort,Port 代替
+
+**返回值:**
+ 以如下 Endpoints 为例:
-Kubernetes 服务发现插件提供与其他服务发现插件相同的查询接口 -> nodes(service_name) \
-service_name 的 pattern 如下:
-> _[namespace]/[name]:[portName]_
+ ```yaml
+ apiVersion: v1
+ kind: Endpoints
+ metadata:
+ name: plat-dev
+ namespace: default
+ subsets:
+ - addresses:
+ - ip: "10.5.10.109"
+ - ip: "10.5.10.110"
+ ports:
+ - port: 3306
+ ```
-如果 kubernetes Endpoint 没有定义 portName, Kubernetes 服务发现插件会依次使用 targetPort, port 代替
+ nodes("default/plat-dev:3306") 调用会得到如下的返回值:
-# Q&A
+ ```
Review comment:
Hi, do we need to add `lua` here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] spacewander edited a comment on pull request #6646: feat: release 2.13.0
Posted by GitBox <gi...@apache.org>.
spacewander edited a comment on pull request #6646:
URL: https://github.com/apache/apisix/pull/6646#issuecomment-1073178824
Let's wait for https://github.com/apache/apisix/pull/6663 before releasing.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] spacewander commented on a change in pull request #6646: feat: release 2.13.0
Posted by GitBox <gi...@apache.org>.
spacewander commented on a change in pull request #6646:
URL: https://github.com/apache/apisix/pull/6646#discussion_r830777846
##########
File path: docs/zh/latest/discovery/kubernetes.md
##########
@@ -93,28 +98,89 @@ discovery:
#token_file: # enter file path here
```
-# Kubernetes 服务发现插件的使用
+## Kubernetes 服务发现模块的查询接口
+
+Kubernetes 服务发现模块遵循 [_APISIX Discovery 规范_](https://github.com/apache/apisix/blob/master/docs/zh/latest/discovery.md) 提供查询接口
+
+**函数:**
+ nodes(service_name)
+
+**说明:**
+ service_name 必须满足格式: [namespace]/[name]:[portName]
+
+ + namespace: Endpoints 所在的命名空间
+
+ + name: Endpoints 的资源名
+
+ + portName: Endpoints 定义包含的 portName, 如果 Endpoints 没有定义 portName, 请使用 targetPort,Port 代替
+
+**返回值:**
+ 以如下 Endpoints 为例:
-Kubernetes 服务发现插件提供与其他服务发现插件相同的查询接口 -> nodes(service_name) \
-service_name 的 pattern 如下:
-> _[namespace]/[name]:[portName]_
+ ```yaml
+ apiVersion: v1
+ kind: Endpoints
+ metadata:
+ name: plat-dev
+ namespace: default
+ subsets:
+ - addresses:
+ - ip: "10.5.10.109"
+ - ip: "10.5.10.110"
+ ports:
+ - port: 3306
+ ```
-如果 kubernetes Endpoint 没有定义 portName, Kubernetes 服务发现插件会依次使用 targetPort, port 代替
+ nodes("default/plat-dev:3306") 调用会得到如下的返回值:
-# Q&A
+ ```
Review comment:
I prefer to solve it in the master branch? And would be good to check it in the CI if the mark is required.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org