Commit Graph

7135 Commits

Author SHA1 Message Date
Yogi_Wang
9deeee5425 Add test button in configration width oidc mode
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-26 10:54:48 +08:00
jwangyangls
fe9eb9da20
Merge pull request #8339 from jwangyangls/quotaPerProject2
Add project quotas  page in configration ,project
2019-07-26 10:25:05 +08:00
wang yan
676b922c95 merge with latest master code with quota branch
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-26 01:32:45 +08:00
Wang Yan
b9ea3731f7
Merge pull request #8350 from wy65701436/blob-flow-dev
Add size middleware to support quota
2019-07-26 01:25:40 +08:00
Wang Yan
1dfc47d24e Add size middleware to support quota
[Add]:
1, size middleware for quota size
2, count middleware for quota artifact count

[Support]:
1, put, patch, mount blob
2, put manifest

[Refactor]:
1, Add handle response for middlerware
2, Remove the modifyResponse for registry proxy
3, Use the custom response writer to recored status

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-26 00:28:36 +08:00
Yogi_Wang
b1b915354e Add project quotas in configration page
include quotas page and edit quota page
add quota field  when create project

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-25 18:49:49 +08:00
Wenkai Yin
2e9521ad45 Support to stop one execution of retention
Support to stop one execution of retention

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-25 16:48:00 +08:00
Steven Zou
57cc6bad1d
Merge pull request #8396 from steven-zou/feature/add_dryrun_2_retention
support dry run of retention
2019-07-25 16:28:18 +08:00
He Weiwei
f3a2280033
Merge pull request #8384 from heww/quota-apis
feat(quota,api): APIs for quotas
2019-07-25 15:19:46 +08:00
Wang Yan
a2fa4cdcf6
Merge pull request #8380 from danfengliu/change-image-for-vulnerability-scanning
Replace image from haproxy to postgres for vulnerability scanning
2019-07-25 13:58:04 +08:00
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
Steven Zou
584dcd8571 support dry run of retention
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-25 12:53:19 +08:00
Steven Zou
b6c4ffee95
Merge pull request #8244 from mmpei/7980-chartReplication
Support helm chart replication from helmhub
2019-07-25 10:30:20 +08:00
danfengliu
8665274406 In nighly test case <Project Level Image Serverity Policy>, scan result of haproxy image is nolonger high but medium, it should be a bug of clair, so we replace haproxy by postgres, and also we pull postgres with sha256 to make sure the image under test is alway the specific one.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-25 10:27:10 +08:00
jwangyangls
de6c2d51cf
Merge pull request #8370 from jwangyangls/fixUtIssue
Fix UT issue about it should support pagination
2019-07-25 10:22:40 +08:00
jwangyangls
8a6a4addb1
Merge pull request #8369 from jwangyangls/fixSomeIssue
Fix issue
2019-07-25 10:20:05 +08:00
wang yan
4763864dae merge with latest master code with quota feature branch
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-24 08:47:05 -07:00
Steven Zou
5bfa7a6515
Merge pull request #8374 from goharbor/feature/tag_retention
[WIP]Feature/tag retention
2019-07-24 18:46:42 +08:00
Steven Zou
c44747fd3c merge code from master and fix conflicts
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-24 17:27:37 +08:00
Wenkai Yin(尹文开)
cd411f6588
Merge pull request #8385 from ywk253100/190724_task_hook
Implement the webhook handler for retention task
2019-07-24 17:22:57 +08:00
Ziming
43c2af9857 map retention with policy (#8313)
Signed-off-by: Ziming Zhang <zziming@vmware.com>

Implement the API and controller of tag retention
 - API handler
 - retention controller
 - dao
2019-07-24 17:22:26 +08:00
Wenkai Yin
e2808f12cf Implement the webhook handler for retention task
Implement the webhook handler for retention task

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-24 14:32:05 +08:00
Steven Zou
9437b489ac
Merge pull request #8383 from ywk253100/190724_retention_client
Create retention client with the configurations got from jobservice config
2019-07-24 14:13:27 +08:00
Wenkai Yin
1adf5c976e Create retention client with the configurations got from jobservice config
As the retention client is only used in job which running in jobservice, the configurations that needed to init the client should be read from jobservice

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-24 13:10:10 +08:00
Wenkai Yin(尹文开)
94f0fb506b
Merge pull request #8134 from chlins/refactor/small-refactor-for-huawei-adapter
refactor: adjust some logic in huawei adapter
2019-07-24 12:13:23 +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
Wenkai Yin(尹文开)
c4836727be
Merge pull request #8377 from steven-zou/feature/tag_retention-logs
print rich logs in the retention job
2019-07-24 09:54:19 +08:00
Steven Zou
09c56bfa08 print rich logs in the retention job
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-24 09:02:51 +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
Wenkai Yin(尹文开)
dc4e4a8dac
Merge pull request #8366 from ywk253100/190723_task
Implement the task management in retention manager
2019-07-23 20:58:01 +08:00
Wenkai Yin
03cc8046eb Implement the task management in retention manager
Implement the task management in retention manager

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-23 19:23:04 +08:00
Wenkai Yin(尹文开)
388f8311f5
Merge pull request #8352 from ywk253100/190717_scheduler
Implement a common scheduler
2019-07-23 19:00:17 +08:00
Wenkai Yin
7362fae7cc Implement a common scheduler
Implement a common scheduler that can be used globally

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-23 17:20:31 +08:00
Wenkai Yin(尹文开)
8a96f39caa
Merge pull request #8367 from steven-zou/feature/tag_retention-job-enhancement
support stop in the retention job and register it
2019-07-23 13:06:44 +08:00
Yogi_Wang
93c336c17d Fix UT issue about it should support pagination
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-23 12:30:12 +08:00
Yogi_Wang
54c142d555 Fix the quoestion of the file setting.json
Clear the error message when Api failed

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-23 11:56:44 +08:00
Steven Zou
ccad9c0a29 support stop in the retention job and register it
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-23 11:05:22 +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
Steven Zou
6401314a3d
Merge pull request #8356 from steven-zou/feature/tag_retention-ut
add missing UT cases for index and builder components
2019-07-22 12:47:38 +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
Steven Zou
1e79c08321
Merge pull request #8357 from nlowe/feat/retention/GH-6658-always-retain
Retention: Implement Rule: Always Keep
2019-07-22 11:00:32 +08:00
Nathan Lowe
b4e169db26
Fix logger line() call if built outside of the repo root
If harbor is built (or `go test`'d) in a different folder than the repo
root, the call to common/utils/log/line(...) will panic with an index
out of range runtime error because the separator can't find `harbor/src`
in the path.

Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-21 22:30:17 -04:00
Nathan Lowe
a15be60946
Retention: Implement Rule: Always Keep
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-21 22:16:47 -04:00
Steven Zou
01d3243156 add missing UT cases for index and builder components
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-22 10:05:50 +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
Steven Zou
42a462de47
Merge pull request #8349 from steven-zou/feature/tag_retention-performer
Feature/tag retention performer
2019-07-20 09:37:45 +08:00
Steven Zou
deb021eb48 rebase and fix name conflicts among packages and vars
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-19 22:37:54 +08:00