Commit Graph

6121 Commits

Author SHA1 Message Date
Daniel Jiang
894f3774b1
Merge pull request #6933 from michmike/master
Delete open_source_license because it interferes with the CNCF recognized license for Harbor
2019-02-25 13:55:02 +08:00
Daniel Jiang
f69e4f9a4a
Merge pull request #7004 from wy65701436/robot-expiration-time
add expiration of robot account
2019-02-25 13:48:11 +08:00
Qian Deng
e8dcb50171
Merge pull request #7009 from JoeWrightss/patch-1
Fix some misspells in code
2019-02-25 13:47:08 +08:00
Yogi_Wang
11d7989ee3 fix_6950
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-25 12:36:03 +08:00
wang yan
91aa67a541 Update expiration variable name to expiresat/tokenduration
Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-25 11:55:42 +08:00
danfengliu
c7d1e18477
In Nightly-CI keyword <Delete Repo> failed on the rare occasion. The appearance is that the repo check-box is not checked, although Click action keyword returned success, it effected the following actions. (#7003)
For now, add a sleep to make it a try, and also add Capture Page Screenshot for debugging.

Signed-off-by: danfengliu <danfengl@vmware.com>
2019-02-25 10:48:04 +08:00
zhoulin xie
b2ed619e1e Fix some misspells in code
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-02-24 01:43:53 +08:00
wang yan
36a778b482 Update expiration schema to bigint and default unit to minute
Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-22 18:42:43 +08:00
wang yan
47a09b5891 add expiration of robot account
This commit is to make the expiration of robot account configurable

1, The expiration could be set by system admin in the configuation page or
by /api/config with robot_token_expiration=60, the default value is 30 days.
2, The expiration could be shown in the robot account infor both on UI and API.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-22 18:42:34 +08:00
stonezdj(Daojun Zhang)
4cb49e5388
Merge pull request #6963 from stonezdj/remove_container
Remove everything of adminserver container
2019-02-22 18:27:43 +08:00
stonezdj
0cba36d79f Remove everything of adminserver
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-22 16:34:39 +08:00
Nguyen Quang Huy
eda6c47b3e add signoff for DCO gate (#6981)
Some variable name, function name is colliding with builtin function.

Signed-off-by: Nguyen Quang Huy <huynq0911@gmail.com>
2019-02-22 15:00:18 +08:00
danfengliu
a1063edae6
Add GUI test script for new feature of master-role, without adding a new case for master-role, I add new test steps in old test case named Manage-Project-Members, because master-role is a sub function in project members. (#6945)
In this PR, I also modify a public action keyword to make it suitble for indefinite numbers of parameters.

Signed-off-by: danfengliu <danfengl@vmware.com>
2019-02-22 14:11:56 +08:00
Xiang Dai
fc4c9887bd docs/README.md: update old url
Signed-off-by: Xiang Dai <764524258@qq.com>
2019-02-22 10:30:52 +08:00
He Weiwei
f19ad5c522 Disable validation for registry (#6993)
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-02-22 10:30:40 +08:00
Wenkai Yin
1ecd119c3d
Merge pull request #6920 from wy65701436/fix-migrator-photon
[Cherry-pick]Upgrade migrator base os to photon 2.0
2019-02-21 19:10:58 +08:00
Wenkai Yin
a3e4772fe9
Merge pull request #6983 from reasonerjt/new-bump-up-notary-migrate
Bump up the migrate tool of notary
2019-02-21 18:03:17 +08:00
Daniel Jiang
1832699e93 Bump up the migrate tool of notary
fixes #5863
The migrate binary that we include in notary is quite out dated.
Additionally it introduced a breaking change, more details see #5863

In this commit a go program was added to workaround this issue to ensure the
migration process works, and refined bootstrap scripts and make process accordingly.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-02-21 00:36:24 -08:00
Daniel Jiang
321adc8362
Merge pull request #6941 from ywk253100/190213_replication_policy
Fix #6698: cannot create a same name replication policy after deleting it
2019-02-21 16:03:55 +08:00
Steven Zou
056ccbac41
Merge pull request #6931 from ninjadq/bump_chart_version
Enhhance: bump chartmuseum version to 0.8.1
2019-02-20 14:51:07 +08:00
Qian Deng
db05024755
Merge pull request #6919 from heww/permissions-doc
Add doc for permissions
2019-02-20 13:54:07 +08:00
jwangyangls
c8c0ee623d
Merge pull request #6954 from jwangyangls/skipped_tests_fix
fix_skipped_tests
2019-02-20 10:13:18 +08:00
Wenkai Yin
38d3c33ce4
Merge pull request #6729 from stonezdj/ref_admin_replace_backup
Refactor adminserver stage3
2019-02-19 13:52:46 +08:00
Wenkai Yin
696264bee9 Run logrotate as user 10000 to avoid issue #6895 (#6913)
This commit fixes issue #6895 by running logrotate with user 10000

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-19 13:18:45 +08:00
Yogi_Wang
60aecf2a1a fix_skipped_tests
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-19 09:43:23 +08:00
Michael Michael
cc814c69de Update Makefile
Signed-off-by: Michael Michael <michmike@users.noreply.github.com>
2019-02-18 17:04:00 -06:00
Michael Michael
4a1755b24e Delete open_source_license
Signed-off-by: Michael Michael <michmike@users.noreply.github.com>
2019-02-18 17:04:00 -06:00
stonezdj
7a5fbf718f Revise code with review comments
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 15:20:54 +08:00
stonezdj
880051c08a Add load for user settings in core/config/config.go
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
stonezdj
36e1c13a43 fix ut error in systeminfo_test.go
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
stonezdj
c9a8de9002 copy migration script to core container instead of mount volumn
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
stonezdj
1ae5126bb4 Refactor adminserver stage 3: replace config api and change ut settings
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
danfengliu
eaedd89c25 add api test case for robot user, and modify swagger.yaml for wrong type of return value. (#6900)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-02-18 13:47:16 +08:00
jwangyangls
9b9fa4fc83
Merge pull request #6944 from jwangyangls/skipped_tests_fix
Skipped tests fix
2019-02-15 17:48:03 +08:00
Yogi_Wang
4ee5ebe442 skipped_tests_fix
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-15 16:52:34 +08:00
jwangyangls
d28b8355ef
Merge pull request #6930 from jwangyangls/issue-6923
fix issue 2923
2019-02-15 15:53:51 +08:00
Qian Deng
4a4ebc2fba Enhhance: bump chartmuseum version to 0.8.1
bump the version of chartmuseum to 0.8.1

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-02-15 15:19:53 +08:00
Wenkai Yin
530ba1d27b Fix #6698
This commit fixes the issue #6698: cannot create a same name replication policy after deleting it

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-15 15:17:48 +08:00
jwangyangls
0891300d21
Merge pull request #6927 from jwangyangls/harbor_style_change
change_style and datagrid refresh interface change
2019-02-15 15:04:52 +08:00
danfengliu
b83cf2e4c0
GC function hbas been change, verify criteria must be changed by add manifests (#6934)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-02-15 11:06:22 +08:00
Yogi_Wang
a9db2ab943 fix issue 2923
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-15 10:23:53 +08:00
Yogi_Wang
651a142429 change_style_unitTest
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-14 16:38:05 +08:00
Mia ZHOU
fceedb9976
Merge pull request #6899 from zhoumeina/move_gc
move gc to lib
2019-02-14 15:11:05 +08:00
Meina Zhou
0d239cb1cb move gc to lib and add in registry config
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-02-14 13:45:15 +08:00
wang yan
cd50d85c47 Upgrade migrator base os to photon 2.0
Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-14 11:35:44 +08:00
jwangyangls
faaa531558
Merge pull request #6918 from jwangyangls/privilege_escalation
fixed_ciIssue
2019-02-14 10:46:52 +08:00
He Weiwei
4e2afe3a03 Add doc for permissions
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-02-14 10:23:41 +08:00
Yogi_Wang
06eaa304da fixed_ciIssue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-14 10:21:18 +08:00
Fangyuan Cheng
6d782e0fe4
Merge pull request #6902 from pureshine/cert-link
Download the certificate link by default on ui
2019-02-13 21:24:12 +08:00
Daniel Jiang
81639e2110
Merge pull request #6865 from wy65701436/remove-token
Remove the token attribute from robot table
2019-02-13 19:23:06 +08:00