Commit Graph

6275 Commits

Author SHA1 Message Date
De Chen
2bc2a44db8
Merge branch 'replication_ng' into registries-management 2019-03-05 16:22:34 +08:00
Wenkai Yin
e1a7bfa32d
Merge pull request #6917 from yuanshuhan/replication_ng
scheduler module for replication
2019-03-05 16:15:31 +08:00
danfengliu
98c6889053 Configuration item verify_remote_cert is no longer useful, so it was delete from data population script
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-03-05 15:53:14 +08:00
cd1989
b00098d492 Add unit tests and fix CI
Signed-off-by: cd1989 <chende@caicloud.io>
2019-03-05 15:37:36 +08:00
Wenkai Yin
937ee46ae0
Merge branch 'replication_ng' into replication_ng 2019-03-05 15:20:21 +08:00
stonezdj(Daojun Zhang)
dffb971366
Merge pull request #7055 from stonezdj/bug7038
Remove verify_remote_cert
2019-03-05 14:54:02 +08:00
cd1989
b851c3476a Use baseURL from config
Signed-off-by: cd1989 <chende@caicloud.io>
2019-03-05 14:30:06 +08:00
stonezdj
4dfee0c1f0 Remove verify_remote_cert
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-03-05 14:04:10 +08:00
Wenkai Yin
77688c90b9
Merge pull request #7061 from stonezdj/bug6767
Search local DB first when adding a project member with username
2019-03-05 12:56:19 +08:00
Daniel Jiang
7be9c54c27 Add items to exemptlabels in stale.yml (#7058)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-03-05 10:52:44 +08:00
Mia ZHOU
76a07eb5fe
Merge pull request #7059 from ninjadq/fix_global_search_issue
Fix global search issue
2019-03-05 08:41:30 +08:00
Mia ZHOU
ccf6280365
Merge pull request #7066 from ninjadq/fix_charts_count_displayed_when_disable
Fix: Should not display helm chart counts if it's not enabled
2019-03-05 08:40:23 +08:00
Qian Deng
4ba012ab8e Fix: global search not work issue
Both Frontend and Backend should not send chart data when chartmusuem not enabled

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-04 17:44:34 +08:00
Qian Deng
b6fea75099 Fix: Should not display helm chart counts if it's not enabled
Should not display the counts of chart if it's not enabled

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-04 17:36:27 +08:00
Mia ZHOU
685e590514
Merge pull request #7062 from jwangyangls/userListPermission
fix get users list about permission issue
2019-03-04 16:46:09 +08:00
Yogi_Wang
1e17036b04 fix get user list about permission issue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-04 14:59:06 +08:00
stonezdj
3fdc0fd9ba Search local DB first when adding a project member with username
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-03-04 11:22:37 +08:00
stonezdj
cf134bc80e Add new parameter ldap_group_membership_attribute
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-03-03 10:03:22 +08:00
danfengliu
62bb10d2e4
Nightly test case <List Helm Charts> is not stable, due to keyword <Go Back To Versions And Delete> failed at delete button click on a rare occasion, so I wrap 2 related action into one transaction, it does help. (#7050)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-03-01 18:25:45 +08:00
Daniel Jiang
321874c815 Move Settings of HTTP auth proxy (#7047)
Previously the settings of HTTP authproxy were set in environment
variable.
This commit move them to the configuration API

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-03-01 14:11:14 +08:00
Fangyuan Cheng
f79895b6d8
Merge pull request #7034 from pureshine/robot-expiration
Implement Robot account expiration
2019-03-01 10:04:26 +08:00
jwangyangls
b3c4d1688d
Merge pull request #7011 from jwangyangls/fix_6950
fix 6950 about the default option is not displayed When we click the add-member button, the default option is not displayed.
2019-02-28 14:07:07 +08:00
He Weiwei
f5c3d308b2
Merge pull request #7035 from heww/windows-image-replicate
Skip transfer blob for foreign layers
2019-02-28 10:28:06 +08:00
He Weiwei
053a18a490 Skip transfer blob for foreign layers
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-02-27 16:14:17 +08:00
danfengliu
340577076c
add a jenkins job for migrate harbor from 1.6 to the latest, make some modification in prepare.py to adapt harbor 1.6 (#7025)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-02-27 14:27:39 +08:00
FangyuanCheng
a2cd2e50fc Implement Robot account expiration
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-27 14:16:07 +08:00
Wenkai Yin
5b2846ef05
Merge pull request #6956 from ywk253100/190130_transfer_repo
Implement the repository transfer
2019-02-27 12:32:45 +08:00
cd1989
8732a20709 Rewrite registry manager with new interface
Signed-off-by: cd1989 <chende@caicloud.io>
2019-02-27 11:54:04 +08:00
cd1989
6bdf3053a7 Implement registries manager
Signed-off-by: cd1989 <chende@caicloud.io>
2019-02-27 11:54:04 +08:00
Wenkai Yin
95888b3dc2
Merge branch 'replication_ng' into 190130_transfer_repo 2019-02-27 11:00:42 +08:00
Wenkai Yin
681453720f
Merge pull request #7023 from ywk253100/190226_replication_dao
Create dao folder in replication
2019-02-27 11:00:02 +08:00
Yuan Lei
253600ad39 sync from upstream and merge the conflic
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-02-27 10:52:03 +08:00
danfengliu
4dc983d419 In nightly tests, keyword <Multi Delete Object> failed on a rare occasion, so add retry for elemnet click in this keyword. (#7022)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-02-26 18:43:24 +08:00
Wenkai Yin
d199a94724
Merge pull request #7001 from ywk253100/190222_policy_upgrade
Update the upgrade sql to fix #6698
2019-02-26 16:27:41 +08:00
Wenkai Yin
b530905b40 Update the upgrade sql to fix #6698
This commit updates the upgrade sql script to fix #6698: cannot recreate the same name replication policy after it is deleted

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-26 15:15:08 +08:00
Wenkai Yin
79d34c6f80 Create dao folder in replication
This commit creates a new folder called dao under replication to hold dao codes

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-26 14:54:16 +08:00
danfengliu
a9b27b0071 In nightly test, 2 errors occurred, chrome webdrive initializtion failed, and delete repoitory on card view failed too, so add a retry for ffailure and add some sleep. (#7012)
Add retry in keyword "Delete Repo".

Signed-off-by: danfengliu <danfengl@vmware.com>
2019-02-26 13:37:16 +08:00
Daniel Jiang
091ed91ad8 Install psycopg2 via photon's repo (#7018)
The psycopg2 installed by pip has very old `.so` files.
This commit will mitigate such issue by using `tdnf` to install this package.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-02-26 10:58:05 +08:00
Steven Zou
68e071c6d5
Merge pull request #6988 from ywk253100/190221_operation_controller
Implement the operation controller
2019-02-25 15:03:34 +08:00
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