Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: refactor conf of manager api #693

Merged
merged 22 commits into from
Nov 5, 2020
Merged

chore: refactor conf of manager api #693

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8d7e4ea
feat: refactor conf
johzchen Nov 4, 2020
7f2cbfa
fix default listen port
johzchen Nov 4, 2020
bfbbb61
fix build and run scripts
johzchen Nov 4, 2020
abd0038
fix: docs
johzchen Nov 5, 2020
444284a
chore: remove useless file
johzchen Nov 5, 2020
b440a55
fix docker for test
johzchen Nov 5, 2020
6eba226
fix CI
johzchen Nov 5, 2020
6003ec9
fix CI
johzchen Nov 5, 2020
fe5f0a0
fix ci
johzchen Nov 5, 2020
95dec77
fix: `-c` conf dir --> `-p` work dir
johzchen Nov 5, 2020
e7eaad9
fix go test error
johzchen Nov 5, 2020
71c8177
fix conf
johzchen Nov 5, 2020
31cfa74
fix: revert changes
johzchen Nov 5, 2020
e5820a0
fix: remove useless comment
johzchen Nov 5, 2020
165aeb6
fix: remove useless comment
johzchen Nov 5, 2020
bcf3af8
doc: add comment for config
johzchen Nov 5, 2020
99964d9
doc: todo
johzchen Nov 5, 2020
7bdd2dc
fix: config format
johzchen Nov 5, 2020
05e5ee5
fix: if secret use default value, should generate a random string to …
johzchen Nov 5, 2020
7e315dd
fix comment style
johzchen Nov 5, 2020
3c42ded
fix: change web dir in docker file
johzchen Nov 5, 2020
87b06b9
doc: update comments
johzchen Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions api/conf/conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,18 @@

conf:
listen:
host: 127.0.0.1
port: 8080
host: 127.0.0.1 # `manager api` listening ip or host name
port: 8080 # `manager api` listening port
etcd:
endpoints:
endpoints: # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
juzhiyuan marked this conversation as resolved.
Show resolved Hide resolved
- 127.0.0.1:2379
authentication:
secret: secret
expireTime: 3600
secret: secret # secret for jwt token generation.
# *NOTE*: Highly recommended to modify this value to protect `manager api`.
# if it's default value, when `manager api` start , it will generate a random string to replace it.
expireTime: 3600 # jwt token expire time, in second
users:
- username: admin
- username: admin #username and password for login `manager api`
nic-chen marked this conversation as resolved.
Show resolved Hide resolved
password: admin
- username: user
password: user
18 changes: 11 additions & 7 deletions api/test/docker/manager-api-conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,24 @@
# limitations under the License.
#


conf:
listen:
host: 0.0.0.0
port: 8080
host: 0.0.0.0 # `manager api` listening ip or host name. It's for e2e test, so it is set to 0.0.0.0
port: 8080 # `manager api` listening port
etcd:
endpoints:
- 172.16.238.10:2379
endpoints: # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
- 172.16.238.10:2379 # ips here are defined in docker compose.
- 172.16.238.11:2379
- 172.16.238.12:2379
authentication:
secret: secret
expireTime: 3600
secret: secret # secret for jwt token generation.
# *NOTE*: Highly recommended to modify this value to protect `manager api`.
# if it's default value, when `manager api` start , it will generate a random string to replace it.
expireTime: 3600 # jwt token expire time, in second
users:
- username: admin
- username: admin #username and password for login `manager api`
membphis marked this conversation as resolved.
Show resolved Hide resolved
password: admin
- username: user
password: user