Commit Graph

7257 Commits

Author SHA1 Message Date
wang yan
a947a4259d Fix quota switch fail to get project size
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 22:32:32 +08:00
stonezdj(Daojun Zhang)
032d57d8b2
Merge pull request #8656 from reasonerjt/cve_whitelist_apitest
API test for system level CVE whitelist
2019-08-14 18:26:06 +08:00
Wenkai Yin
2a57424f9d Fix bug in native replication adapter
Use the stardard token authentication work flow even though the credentail isn't provided

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-14 18:17:38 +08:00
Wang Yan
54cb39b7a7
Merge pull request #8655 from wy65701436/log-size
Add log in quota size handler
2019-08-14 16:09:45 +08:00
Pedro Laguna
3c34675e0f Close <a> tag in error template
The error template is missing a closing <a> tag in the link to the harbor portal.

Signed-off-by: Pedro Laguna <44469313+vmlaguna@users.noreply.github.com>
2019-08-14 08:37:44 +01:00
Daniel Jiang
d01597ba23 API test for system level CVE whitelist
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-14 14:59:58 +08:00
He Weiwei
98e1f68468 feat(configuration,db): connection pool configs for db
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-14 14:30:34 +08:00
Daniel Jiang
a545b460ed
Merge pull request #8642 from reasonerjt/swagger-doc-update
Fix issue in API swagger doc
2019-08-14 14:23:59 +08:00
Daniel Jiang
ca585f8b9c
Merge pull request #8640 from ninjadq/fix_permission_of_nginx_cert
Fix permission of nginx cert
2019-08-14 14:23:40 +08:00
wang yan
9601c9f206 Add log in quota size handler
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 14:10:09 +08:00
Ziming Zhang
2ca0b6bd1f use fix root CA for test
Change-Id: Ic663de04287d0cf963de71c3c18b43ed71f8139f
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-14 13:58:20 +08:00
Wang Yan
c252ca0b74
Merge pull request #8645 from wy65701436/quota-switch-api
Enable usage sync when switch quota setting
2019-08-14 13:48:33 +08:00
jwangyangls
b2b5d74456
Merge pull request #8623 from jwangyangls/replication-task-paging
Add paging from backend in replication task ui
2019-08-14 13:08:38 +08:00
wang yan
838a923d23 fix code by review
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 12:47:12 +08:00
wang yan
9e0addee55 Enable usage sync when switch quota setting
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 12:47:12 +08:00
jwangyangls
679bab9f80
Merge pull request #8638 from jwangyangls/quota-color-yellow
Add the warning color in quota when used/hard >0.7
2019-08-14 12:28:38 +08:00
danfengliu
1f53a47102
add replication testcase in api_db.robot file (#8636)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-14 10:45:20 +08:00
Wang Yan
bf58c6adcf
Merge pull request #8654 from wy65701436/disable-coverall
temporary disable coverall service in travis ci
2019-08-14 01:13:25 +08:00
wang yan
76c52c2332 append commit to fix core compile error introduced by pr #8606
Signed-off-by: wang yan <wangyan@vmware.com>

Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 00:22:55 +08:00
wang yan
699a935c05 temporary disable result checking on coverall service in travis ci
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-13 23:29:26 +08:00
Ziming Zhang
d7e9924a01 remove tag retention rule always
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Ide98d58f64596e8110fbb9eb0d73df6ccbd99c80
2019-08-13 21:10:57 +08:00
Steven Zou
1adc3a9469
Merge pull request #8606 from ywk253100/190807_stuck
Fix replication tasks stuck in "InProgress" issue
2019-08-13 15:59:20 +08:00
stonezdj(Daojun Zhang)
3e0191be5a
Merge pull request #8621 from stonezdj/project_sort
Sort project by name
2019-08-13 14:13:29 +08:00
Wenkai Yin(尹文开)
a6445c1ebe
Merge pull request #8472 from kofj/feature/proxy
Proxy
2019-08-13 12:27:19 +08:00
Qian Deng
b4975d8601 Fix nginx permission issue
* mount root of host
* copy file to data dir and change ownership and permission

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-08-13 02:59:27 +00:00
stonezdj(Daojun Zhang)
1bfba278f2
Merge pull request #8565 from reasonerjt/update-gc-api-doc
Update the swagger doc for GC API
2019-08-13 10:34:38 +08:00
Daniel Jiang
50875593ba Fix issue in API swagger doc
This commit add `reuse_sys_cve_whitelist` to project metadata, and fixes
a few issues in APIs related webhook.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-13 01:05:24 +08:00
Wang Yan
2a3192b5c1
Merge pull request #8633 from heww/quota-switch
feat(quota,middleware): enable or disable quota per project by config
2019-08-12 19:36:38 +08:00
Wenkai Yin(尹文开)
34f845b804
Merge pull request #8594 from ywk253100/190731_replicate_chart
Fix bug in Helm Hub and Harbor adapter for replicating chart
2019-08-12 17:48:11 +08:00
Yogi_Wang
bf55c37956 Add the warning color in quota when used/hard >0.7
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-12 17:36:38 +08:00
Wenkai Yin(尹文开)
67a60df033
Merge pull request #8609 from ywk253100/190808_replicate_meta
Only replicate "public" metadata when creating project in Harbor
2019-08-12 17:31:02 +08:00
cd1989
da370bb331 List simple tags when detail set to false
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-12 15:16:19 +08:00
jwangyangls
fd6a422bf8
Merge pull request #8605 from jwangyangls/fix-Link-to-license-hardcoded
Fix issue width Link to license in the about dialog should not be hardcoded to master
2019-08-12 10:50:18 +08:00
Yogi_Wang
1530aa119a Add paging from backend in replication task ui
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-12 10:47:29 +08:00
He Weiwei
c1cea42089 feat(quota,middleware): enable or disable quota per project by config
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-12 00:02:26 +00:00
疯魔慕薇
3e8a73ca1e Proxy
1. Global proxy config for components.
2. Prepare proxy configure for clair, core and jobservice.

Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com>
2019-08-11 00:24:18 +08:00
Wang Yan
d663796b3d
Merge pull request #8612 from BeHappyF/webhook-dev-ui
Add webhook UI
2019-08-10 20:03:15 +08:00
方彬
44ca591582 Add webhook UI
Signed-off-by: 方彬 <fang_bingo@163.com>
2019-08-09 20:18:08 +08:00
jwangyangls
cc51703cf0
Merge pull request #8618 from jwangyangls/replication-task
Add pull-time and push time in repositories image
2019-08-09 17:59:47 +08:00
stonezdj
65dc665717 Sort project by name
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-09 16:22:55 +08:00
Wang Yan
54a39c7159
Merge pull request #8597 from heww/size-quota
refactor(quota,middleware): implement size quota by quota interceptor
2019-08-09 15:44:33 +08:00
Steven Zou
d2fbb98a8d
Merge pull request #8592 from bitsf/tag_retention_conflict_rule
check rule conflict
2019-08-09 13:59:46 +08:00
Yogi_Wang
53bd4d7897 Fix issue width Link to license in the about dialog should not be hardcoded to master
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-09 13:26:43 +08:00
Yogi_Wang
b66c5d05cd Add pull-time and push time in repositories image
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-09 12:51:54 +08:00
jwangyangls
4dce75c25e
Merge pull request #8318 from JakubOnderka/patch-1
Fixed typo in en-us-lang.json
2019-08-09 12:06:19 +08:00
Wang Yan
20cb8e514f
Merge pull request #8608 from danfengliu/replicaiton-ng-api-adapt-1
API test for replication should be back to travis
2019-08-09 11:10:17 +08:00
He Weiwei
e62c29123d refactor(quota,middleware): implement size quota by quota interceptor
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-08 23:55:54 +00:00
Qian Deng
a935823e3d
Merge pull request #8362 from ninjadq/non-root-contaienr
Non root contaienr
2019-08-08 17:34:25 +08:00
danfengliu
1b0931c034 Since harbor 1.8 released, API test for replication was not update yet, so in this PR, replicaiton test will be adapt for harbor 1.8.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-08 17:06:37 +08:00
Wenkai Yin
96a1ad89fa Only replicate "public" metadata when creating project in Harbor
This commit filters the metadata when creating project in replication to avoid replicate unnecessary properties, such as retention policy

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-08 16:19:09 +08:00