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/04/29 08:04:05 UTC
[GitHub] [apisix] bin-ya opened a new pull request, #6971: docs: update config-default.yaml
bin-ya opened a new pull request, #6971:
URL: https://github.com/apache/apisix/pull/6971
### Description
<!-- Please include a summary of the change and which issue is fixed. -->
<!-- Please also include relevant motivation and context. -->
Fixes # (6969)
### Checklist
- [x] I have explained the need for this PR and the problem it solves
- [x] 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] starsz commented on a diff in pull request #6971: docs: update config-default.yaml
Posted by GitBox <gi...@apache.org>.
starsz commented on code in PR #6971:
URL: https://github.com/apache/apisix/pull/6971#discussion_r865860662
##########
conf/config-default.yaml:
##########
@@ -315,6 +315,70 @@ etcd:
# connect: 2000 # default 2000ms
# send: 2000 # default 2000ms
# read: 5000 # default 5000ms
+# nacos:
+# host:
+# - "http://${username}:${password}@${host1}:${port1}"
+# prefix: "/nacos/v1/"
+# fetch_interval: 30 # default 30 sec
+# weight: 100 # default 100
+# timeout:
+# connect: 2000 # default 2000 ms
+# send: 2000 # default 2000 ms
+# read: 5000 # default 5000 ms
+# consul_kv:
+# servers:
+# - "http://127.0.0.1:8500"
+# - "http://127.0.0.1:8600"
+# prefix: "upstreams"
+# skip_keys: # if you need to skip special keys
+# - "upstreams/unused_api/"
+# timeout:
+# connect: 1000 # default 2000 ms
+# read: 1000 # default 2000 ms
+# wait: 60 # default 60 sec
+# weight: 1 # default 1
+# fetch_interval: 5 # default 3 sec, only take effect for keepalive: false way
+# keepalive: true # default true, use the long pull way to query consul servers
+# default_server: # you can define default server when missing hit
+# host: "127.0.0.1"
+# port: 20999
+# metadata:
+# fail_timeout: 1 # default 1 ms
+# weight: 1 # default 1
+# max_fails: 1 # default 1
+# dump: # if you need, when registered nodes updated can dump into file
+# path: "logs/consul_kv.dump"
+# expire: 2592000 # unit sec, here is 30 day
+# kubernetes:
+# service:
+# schema: https #apiserver schema, options [http, https], default https
+# host: ${KUBERNETES_SERVICE_HOST} #apiserver host, options [ipv4, ipv6, domain, environment variable], default ${KUBERNETES_SERVICE_HOST}
+# port: ${KUBERNETES_SERVICE_PORT} #apiserver port, options [port number, environment variable], default ${KUBERNETES_SERVICE_PORT}
+# client:
+# token_file: path/to/token # path of serviceaccount token_file
+# #token: |-
+# # eyJhbGciOiJSUzI1NiIsImtpZCI6Ikx5ME1DNWdnbmhQNkZCNlZYMXBsT3pYU3BBS2swYzBPSkN3ZnBESGpkUEEif
+# # 6Ikx5ME1DNWdnbmhQNkZCNlZYMXBsT3pYU3BBS2swYzBPSkN3ZnBESGpkUEEifeyJhbGciOiJSUzI1NiIsImtpZCI
+# # kubernetes discovery plugin support use namespace_selector
+# # you can use one of [equal, not_equal, match, not_match] filter namespace
+# namespace_selector:
+# # only save endpoints with namespace equal default
+# equal: default
+# # only save endpoints with namespace not equal default
+# #not_equal: default
+# # only save endpoints with namespace match one of [default, ^my-[a-z]+$]
+# #match:
+# #- default
+# #- ^my-[a-z]+$
+# # only save endpoints with namespace not match one of [default, ^my-[a-z]+$ ]
+# #not_match:
+# #- default
+# #- ^my-[a-z]+$
+# # kubernetes discovery plugin support use label_selector
+# # for the expression of label_selector, please refer to https://kubernetes.io/docs/concepts/overview/working-with-objects/labels
+# label_selector: |-
+# first="a",second="b"
+# # default 10s
Review Comment:
What's this? Which value defaults to` 10s`?
##########
conf/config-default.yaml:
##########
@@ -315,6 +315,70 @@ etcd:
# connect: 2000 # default 2000ms
# send: 2000 # default 2000ms
# read: 5000 # default 5000ms
+# nacos:
+# host:
+# - "http://${username}:${password}@${host1}:${port1}"
+# prefix: "/nacos/v1/"
+# fetch_interval: 30 # default 30 sec
+# weight: 100 # default 100
+# timeout:
+# connect: 2000 # default 2000 ms
+# send: 2000 # default 2000 ms
+# read: 5000 # default 5000 ms
+# consul_kv:
+# servers:
+# - "http://127.0.0.1:8500"
+# - "http://127.0.0.1:8600"
+# prefix: "upstreams"
+# skip_keys: # if you need to skip special keys
+# - "upstreams/unused_api/"
+# timeout:
+# connect: 1000 # default 2000 ms
+# read: 1000 # default 2000 ms
+# wait: 60 # default 60 sec
+# weight: 1 # default 1
+# fetch_interval: 5 # default 3 sec, only take effect for keepalive: false way
Review Comment:
`fetch_interval: 5` , default 5 or 3 ？
--
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] github-actions[bot] closed pull request #6971: docs: update config-default.yaml
Posted by GitBox <gi...@apache.org>.
github-actions[bot] closed pull request #6971: docs: update config-default.yaml
URL: https://github.com/apache/apisix/pull/6971
--
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] github-actions[bot] commented on pull request #6971: docs: update config-default.yaml
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #6971:
URL: https://github.com/apache/apisix/pull/6971#issuecomment-1202303357
This pull request/issue has been closed due to lack of activity. If you think that is incorrect, or the pull request requires review, you can revive the PR at any time.
--
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] starsz commented on a diff in pull request #6971: docs: update config-default.yaml
Posted by GitBox <gi...@apache.org>.
starsz commented on code in PR #6971:
URL: https://github.com/apache/apisix/pull/6971#discussion_r861683042
##########
conf/config-default.yaml:
##########
@@ -315,6 +315,83 @@ etcd:
# connect: 2000 # default 2000ms
# send: 2000 # default 2000ms
# read: 5000 # default 5000ms
+# nacos:
+# host:
+# - "http://${username}:${password}@${host1}:${port1}"
+# prefix: "/nacos/v1/"
+# fetch_interval: 30 # default 30 sec
+# weight: 100 # default 100
+# timeout:
+# connect: 2000 # default 2000 ms
+# send: 2000 # default 2000 ms
+# read: 5000 # default 5000 ms
+# consul_kv:
+# servers:
+# - "http://127.0.0.1:8500"
+# - "http://127.0.0.1:8600"
+# prefix: "upstreams"
+# skip_keys: # if you need to skip special keys
+# - "upstreams/unused_api/"
+# timeout:
+# connect: 1000 # default 2000 ms
+# read: 1000 # default 2000 ms
+# wait: 60 # default 60 sec
+# weight: 1 # default 1
+# fetch_interval: 5 # default 3 sec, only take effect for keepalive: false way
+# keepalive: true # default true, use the long pull way to query consul servers
+# default_server: # you can define default server when missing hit
+# host: "127.0.0.1"
+# port: 20999
+# metadata:
+# fail_timeout: 1 # default 1 ms
+# weight: 1 # default 1
+# max_fails: 1 # default 1
+# dump: # if you need, when registered nodes updated can dump into file
+# path: "logs/consul_kv.dump"
+# expire: 2592000 # unit sec, here is 30 day
+# kubernetes:
+# service:
+ # apiserver schema, options [http, https]
+# schema: https #default https
Review Comment:
```suggestion
# schema: https # apiserver schema, options [http, https], default https
```
##########
conf/config-default.yaml:
##########
@@ -315,6 +315,83 @@ etcd:
# connect: 2000 # default 2000ms
# send: 2000 # default 2000ms
# read: 5000 # default 5000ms
+# nacos:
+# host:
+# - "http://${username}:${password}@${host1}:${port1}"
+# prefix: "/nacos/v1/"
+# fetch_interval: 30 # default 30 sec
+# weight: 100 # default 100
+# timeout:
+# connect: 2000 # default 2000 ms
+# send: 2000 # default 2000 ms
+# read: 5000 # default 5000 ms
+# consul_kv:
+# servers:
+# - "http://127.0.0.1:8500"
+# - "http://127.0.0.1:8600"
+# prefix: "upstreams"
+# skip_keys: # if you need to skip special keys
+# - "upstreams/unused_api/"
+# timeout:
+# connect: 1000 # default 2000 ms
+# read: 1000 # default 2000 ms
+# wait: 60 # default 60 sec
+# weight: 1 # default 1
+# fetch_interval: 5 # default 3 sec, only take effect for keepalive: false way
+# keepalive: true # default true, use the long pull way to query consul servers
+# default_server: # you can define default server when missing hit
+# host: "127.0.0.1"
+# port: 20999
+# metadata:
+# fail_timeout: 1 # default 1 ms
+# weight: 1 # default 1
+# max_fails: 1 # default 1
+# dump: # if you need, when registered nodes updated can dump into file
+# path: "logs/consul_kv.dump"
+# expire: 2592000 # unit sec, here is 30 day
+# kubernetes:
+# service:
+ # apiserver schema, options [http, https]
+# schema: https #default https
+#
+ # apiserver host, options [ipv4, ipv6, domain, environment variable]
+# host: ${KUBERNETES_SERVICE_HOST} #default ${KUBERNETES_SERVICE_HOST}
Review Comment:
Ditto.
##########
conf/config-default.yaml:
##########
@@ -315,6 +315,83 @@ etcd:
# connect: 2000 # default 2000ms
# send: 2000 # default 2000ms
# read: 5000 # default 5000ms
+# nacos:
+# host:
+# - "http://${username}:${password}@${host1}:${port1}"
+# prefix: "/nacos/v1/"
+# fetch_interval: 30 # default 30 sec
+# weight: 100 # default 100
+# timeout:
+# connect: 2000 # default 2000 ms
+# send: 2000 # default 2000 ms
+# read: 5000 # default 5000 ms
+# consul_kv:
+# servers:
+# - "http://127.0.0.1:8500"
+# - "http://127.0.0.1:8600"
+# prefix: "upstreams"
+# skip_keys: # if you need to skip special keys
+# - "upstreams/unused_api/"
+# timeout:
+# connect: 1000 # default 2000 ms
+# read: 1000 # default 2000 ms
+# wait: 60 # default 60 sec
+# weight: 1 # default 1
+# fetch_interval: 5 # default 3 sec, only take effect for keepalive: false way
+# keepalive: true # default true, use the long pull way to query consul servers
+# default_server: # you can define default server when missing hit
+# host: "127.0.0.1"
+# port: 20999
+# metadata:
+# fail_timeout: 1 # default 1 ms
+# weight: 1 # default 1
+# max_fails: 1 # default 1
+# dump: # if you need, when registered nodes updated can dump into file
+# path: "logs/consul_kv.dump"
+# expire: 2592000 # unit sec, here is 30 day
+# kubernetes:
+# service:
+ # apiserver schema, options [http, https]
+# schema: https #default https
+#
+ # apiserver host, options [ipv4, ipv6, domain, environment variable]
+# host: ${KUBERNETES_SERVICE_HOST} #default ${KUBERNETES_SERVICE_HOST}
+#
+ # apiserver port, options [port number, environment variable]
+# port: ${KUBERNETES_SERVICE_PORT} #default ${KUBERNETES_SERVICE_PORT}
+#
+# client:
+ # serviceaccount token or token_file
+# token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
Review Comment:
```suggestion
# token_file: path/to/token # path of serviceaccount token_file
```
##########
conf/config-default.yaml:
##########
@@ -315,6 +315,83 @@ etcd:
# connect: 2000 # default 2000ms
# send: 2000 # default 2000ms
# read: 5000 # default 5000ms
+# nacos:
+# host:
+# - "http://${username}:${password}@${host1}:${port1}"
+# prefix: "/nacos/v1/"
+# fetch_interval: 30 # default 30 sec
+# weight: 100 # default 100
+# timeout:
+# connect: 2000 # default 2000 ms
+# send: 2000 # default 2000 ms
+# read: 5000 # default 5000 ms
+# consul_kv:
+# servers:
+# - "http://127.0.0.1:8500"
+# - "http://127.0.0.1:8600"
+# prefix: "upstreams"
+# skip_keys: # if you need to skip special keys
+# - "upstreams/unused_api/"
+# timeout:
+# connect: 1000 # default 2000 ms
+# read: 1000 # default 2000 ms
+# wait: 60 # default 60 sec
+# weight: 1 # default 1
+# fetch_interval: 5 # default 3 sec, only take effect for keepalive: false way
+# keepalive: true # default true, use the long pull way to query consul servers
+# default_server: # you can define default server when missing hit
+# host: "127.0.0.1"
+# port: 20999
+# metadata:
+# fail_timeout: 1 # default 1 ms
+# weight: 1 # default 1
+# max_fails: 1 # default 1
+# dump: # if you need, when registered nodes updated can dump into file
+# path: "logs/consul_kv.dump"
+# expire: 2592000 # unit sec, here is 30 day
+# kubernetes:
+# service:
+ # apiserver schema, options [http, https]
+# schema: https #default https
+#
Review Comment:
Redundant line.
--
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] github-actions[bot] commented on pull request #6971: docs: update config-default.yaml
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #6971:
URL: https://github.com/apache/apisix/pull/6971#issuecomment-1174874535
This pull request has been marked as stale due to 60 days of inactivity. It will be closed in 4 weeks if no further activity occurs. If you think that's incorrect or this pull request should instead be reviewed, please simply write any comment. Even if closed, you can still revive the PR at any time or discuss it on the dev@apisix.apache.org list. Thank you for your contributions.
--
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