Commit Graph

6895 Commits

Author SHA1 Message Date
He Weiwei
e625f2aa11 feat(quota,api): APIs for quotas
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-25 13:40:26 +08:00
Wenkai Yin(尹文开)
5d59ea266c
Merge pull request #8299 from heww/new-project-with-quota
feat: Quota support for new project API
2019-07-24 09:57:07 +08:00
He Weiwei
ce58c58c01 feat(quota,api): quota support for create project API
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-24 01:02:51 +08:00
wang yan
2292954a31 Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-22 15:46:09 +08:00
wang yan
88dc1d493e Merge branch 'project-quota-dev' of https://github.com/wy65701436/harbor into project-quota-dev 2019-07-22 15:45:47 +08:00
Wang Yan
e8565a4539
Merge pull request #8335 from reasonerjt/add-oidc-ping-api
Add API to ping OIDC endpoint
2019-07-22 14:30:24 +08:00
Daniel Jiang
4f00c0e227 Fix error in swagger doc for ping OIDC API
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-22 12:52:28 +08:00
Wang Yan
834e604ec0
Merge pull request #8246 from ninjadq/fix_chart_museum_500_error
Fix: Internal server error with messy code when chartmuseum not work
2019-07-22 11:07:55 +08:00
Wenkai Yin(尹文开)
893de67eb9
Merge pull request #8353 from randomswdev/jobservice-proxy
Make jobservice use the proxy env variables (including no_proxy)
2019-07-22 08:50:55 +08:00
Bernardo Pastorelli
791394a2b1 Make jobservice use the proxy env variables (including no_proxy)
Signed-off-by: Bernardo Pastorelli <berpast@hotmail.com>
2019-07-19 16:32:17 +02:00
Will Sun
d38a08b15a
Merge pull request #8341 from AllForNothing/robot-ui
UI Modification: When New Robot
2019-07-19 16:59:14 +08:00
AllForNothing
bd5b195019 UI Modification: When New Robot
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-19 14:47:30 +08:00
Will Sun
ec9c216274
Merge pull request #8332 from AllForNothing/time-error
fix issue : time shown for scheduled scanning is incorrect
2019-07-19 11:32:50 +08:00
stonezdj(Daojun Zhang)
41031dee1d
Merge pull request #8333 from stonezdj/fix_onboard_group
Fix OnBoardGroup issue
2019-07-19 10:31:15 +08:00
He Weiwei
9c9b8d3a6d Merge branch 'master' into project-quota-dev 2019-07-19 10:02:51 +08:00
Daniel Jiang
96e2e0b145 Add API to ping OIDC endpoint
This commit adds an API to help admin verify the OIDC endpoint is a
valid one.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-18 19:32:12 +08:00
stonezdj
13772b859e Fix OnBoardGroup issue
Signed-off-by: stonezdj <stonezdj@gmail.com>

Fix issue when adding a HTTP user group to a project member, returns HTTP 500 error.
2019-07-18 19:19:09 +08:00
wang yan
1785affdd6 Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-18 19:06:43 +08:00
AllForNothing
9404810a1c fix issue : time shown for scheduled scanning is incorrect
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-18 18:05:01 +08:00
Will Sun
6f62a44a17
Merge pull request #8328 from AllForNothing/cve-link
The item in CVE whiltelist should be a click-able link
2019-07-18 17:22:21 +08:00
AllForNothing
4979c4a49c The item in CVE whiltelist should be a click-able link
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-18 16:17:43 +08:00
Wang Yan
04d63f887d
Merge pull request #8324 from ninjadq/ci_build_prepare_locally
Travis ci build prepare container in local
2019-07-18 15:14:10 +08:00
DQ
5adc29c07f Travis ci build prepare container in local
build prepare container before running ut case

Signed-off-by: DQ <dengq@vmware.com>
2019-07-18 14:46:05 +08:00
Daniel Jiang
e0e6a1d30b
Merge pull request #8301 from ninjadq/external_endpoint_support
Add supoort for external endpoint
2019-07-18 01:36:08 +08:00
Qian Deng
739b4723db
Merge pull request #8308 from ninjadq/upgrade_chartmuseum_2_v0_9_0
Upgrade chartmuseum from v0.8.1 to v0.9.0
2019-07-17 16:48:52 +08:00
danfengliu
554b0771fe
Due to adding new feature for white list, xpath of configuration changed, it caused failure of nightly tests, so it should be fixed. (#8307)
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-07-17 16:46:26 +08:00
DQ
6cf4596292 Add supoort for external endpoint
Add config item in harbor.yml
Make fowarding rule configurable

Signed-off-by: DQ <dengq@vmware.com>
2019-07-17 16:23:37 +08:00
Wang Yan
4cdb6fb975
Merge pull request #8239 from bitsf/fix_replication_dockerhub_tls
fix replication dockerhub skip tls
2019-07-17 15:35:29 +08:00
danfengliu
9b61bf4fce
In nightly test case 'list helm chart', delete chart (#8280)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-17 15:32:10 +08:00
Wenkai Yin(尹文开)
a64e089773
Merge pull request #8210 from stonezdj/http_group_dao2
Add HTTP group support
2019-07-17 15:22:36 +08:00
DQ
af58195a29 Fix: Internal server error with messy code when chartmuseum not work
log err when doesn't get data from chart museum

Signed-off-by: DQ <dengq@vmware.com>
2019-07-17 15:14:50 +08:00
Qian Deng
5cd3594f20 Upgrade chartmuseum from v0.8.1 to v0.9.0
Signed-off-by: Qian Deng <dengqian0826@gmail.com>
2019-07-17 06:45:23 +00:00
Wang Yan
31c3413ddf
Merge pull request #8288 from wy65701436/mf-workflow-base
Add quota workflow for manifest
2019-07-17 11:25:30 +08:00
Will Sun
8ea339f882
Merge pull request #8297 from AllForNothing/cve-whitelist
modify UT for cve-whitelist UI
2019-07-16 17:14:08 +08:00
stonezdj
bb2ae7c093 Add HTTP group feature
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-07-16 15:38:46 +08:00
Shijun Sun (c)
140a3da238 modify UT for cve-whitelist UI
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
2019-07-16 15:24:15 +08:00
wang yan
105518fe12 Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-16 14:51:37 +08:00
Wang Yan
8ac6bdbbb0 Add quota workflow for quota
1, apply count for manifest if it's a new image
2, insert data for artifact and artifact_blob

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-16 14:48:05 +08:00
danfengliu
a8300d91e6
Add a nightly test case helm CLI, in this case, we verify help repo add and helm push. (#8240)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-16 14:00:30 +08:00
Will Sun
3cfb626b0d
Merge pull request #8245 from AllForNothing/cve-whitelist
Cve whitelist
2019-07-15 21:22:13 +08:00
Shijun Sun (c)
274ab7bcff add CVE-Whitelist
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
2019-07-15 19:47:46 +08:00
De Chen
b7123cd4c2
Merge pull request #8171 from rvanbutselaar/prepare_selinux
Add SELinux label to all volumes inside prepare script
2019-07-15 13:48:24 +08:00
wang yan
f066d986b9 merge with latest master code 2019-07-11 20:21:15 +08:00
Wang Yan
b98ca7bf0b
Merge pull request #8237 from wy65701436/redis-locker
add redis lock
2019-07-11 20:10:16 +08:00
wang yan
ef14f0cf35 add redis lock, it will be used to lock digest in the quota scenario
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-11 19:24:24 +08:00
Wenkai Yin(尹文开)
3bebf7bc64
Merge pull request #8238 from reasonerjt/project-cve-whitelist
Enable project level CVE whitelist
2019-07-10 14:41:01 +08:00
jwangyangls
432f08b5b5
Merge pull request #8241 from jwangyangls/fixReplicationLabelFilterbug
Fix bug when no labels
2019-07-10 14:38:51 +08:00
jwangyangls
c73fa851ff
Merge pull request #8221 from jwangyangls/addGroupInhttpMode
Add user group when http auth mode
2019-07-10 14:38:31 +08:00
Yogi_Wang
6ef82d4db9 Fix bug when no labels
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-10 13:02:34 +08:00
Wang Yan
155b0b0acd
Merge pull request #8175 from heww/quota-manager
Add manager for quota
2019-07-10 11:03:57 +08:00