Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-17 15:55:26 +01:00
Code Issues Projects Releases Wiki Activity
9,103 Commits 49 Branches 315 Tags 351 MiB
3ad5b2ba06
Commit Graph

9103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Zou
3ad5b2ba06
fix(job currency):introduce max corrency of job (#11589) 
- update Job interface to introdcue MaxCurrency method for declaring the max currency of the specified job
- change the downstream jobs to implement the new interface method
  - GC and sample jobs are set to 1
  - other jobs are set to 0 that means unlimited
- add max currency optiot when doing job registration
- resolve issue #11586
  - probably resolve issue #11281
  - resolve issue #11570

Signed-off-by: Steven Zou <szou@vmware.com>
 2020-04-13 18:07:54 +08:00
Wenkai Yin(尹文开)
45518d5daa
Merge pull request #11573 from ywk253100/200410_artifact 
Remove the duplicated const definition
 2020-04-13 17:43:40 +08:00
Wenkai Yin
7553845b4d Remove the duplicated const definition 
Remove the duplicated const definition for artifact type

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-04-13 17:02:23 +08:00
He Weiwei
49c9e4f696
Merge pull request #11585 from heww/cleanup-quota 
refactor(quota): cleanup code for quota
 2020-04-13 15:11:17 +08:00
Will Sun
009662a317
Merge pull request #11426 from AllForNothing/nightly-tag 
Add new nightly cases for tag CRUD
 2020-04-13 12:15:18 +08:00
He Weiwei
0b87eaf039
Merge pull request #11505 from heww/revert-registry-authorization-type-support 
feat(scan): revert bearer token support for scanner
 2020-04-13 11:19:02 +08:00
He Weiwei
c0349da812 refactor(quota): cleanup code for quota 
1. Remove `common/quota` package.
2. Remove functions about quota in `common/dao` package.
3. Move `Quota` and `QuotaUsage` models from `common/models` to
`pkg/quota/dao`.
4. Add `Count` and `List` methods to `quota.Controller`.
5. Use `quota.Controller` to implement quota APIs.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-04-12 16:16:06 +00:00
Daniel Jiang
93f316ccfe
Merge pull request #11582 from heww/fix-issue-11564 
fix(blob): delete project blob with project_id
 2020-04-12 18:00:54 +08:00
He Weiwei
c585e22d18 fix(blob): delete project blob with project_id 
Closes #11564

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-04-12 04:23:18 +00:00
Wang Yan
740b1e46b4
fix artifact trash filter issue (#11575) 
fixes #11533

GC jobs will use the filter results to call registry API to delete manifest.

In the current imple, the filter function in some case does not return the deleted artifact as it's using digest as the filter condition.

Like: If one artifact is deleted, but there is another project/repo has a image with same digest with the deleted one, filter func will
not mark the deleted artifact as candidate. It results in, GC job does not call API to remove the manifest.

To fix it, update the filter to use both digest and repository name to filter candidate.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-04-12 03:11:49 +08:00
Daniel Jiang
8822e6cdba
Merge pull request #11572 from ywk253100/200410_replication_insecure 
Use insecure transport when creating the adapter for local instance in replication
 2020-04-12 00:34:14 +08:00
He Weiwei
1ce0a76bd1
Merge pull request #11555 from reasonerjt/exclude-deleted-projects 
Exclude deleted groups when counting groups associated with group ID
 2020-04-11 16:52:35 +08:00
He Weiwei
4623cec1e5 feat(scan): revert bearer token support for scanner 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-04-11 08:45:29 +00:00
Daniel Jiang
1a798e833f
Merge pull request #11580 from reasonerjt/fix-codecov 
Make sure codecov reports are merged
 2020-04-11 16:05:16 +08:00
Daniel Jiang
b72823af15 Make sure codecov reports are merged 
The codecov.yml has to be moved according to latest update in
codecov-action:
https://github.com/codecov/codecov-action#arguments
It also does some clean up and add flags to group the reports.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-04-11 12:00:07 +08:00
danfengliu
dd55cdc51a
Merge pull request #11577 from danfengliu/modify-quotas-prompt-info 
Modify quota error info due to product changed
 2020-04-10 21:47:27 +08:00
danfengliu
a869bba59f Modify quota error info due to product changed 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-04-10 21:06:05 +08:00
Daniel Jiang
32ae0a6fa6 Exclude deleted projects when counting projects associated with group ID 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-04-10 19:07:08 +08:00
Wenkai Yin(尹文开)
81a4e7d468
Merge pull request #11569 from ywk253100/200410_replication 
Add "delete" into the action map if the action in token is "*"
 2020-04-10 18:06:47 +08:00
jwangyangls
e28b5811f7
Merge pull request #11176 from jwangyangls/change-helm-version 
Separate swagger to get v2.0 swagger and chart swagger
 2020-04-10 17:12:00 +08:00
jwangyangls
5d76f1ea4b
Merge pull request #11530 from jwangyangls/200408-fix-bug-round2 
[Fixed] fix part issue of round2
 2020-04-10 17:11:43 +08:00
Wenkai Yin
df1f52dba4 Use insecure transport when creating the adapter for local instance in replication 
Use insecure transport when creating the adapter for local instance in replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-04-10 16:45:57 +08:00
Yogi_Wang
33ed4fb67e Separate swagger to get v2.0 swagger and chart swagger 
1. Partial helm api version number clear
2. Separate swagger to get v2.0 swagger and chart swagger
3. router add chart swagger

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2020-04-10 16:25:30 +08:00
Yogi_Wang
3c771670ca [Fix] Fix part issue of round2 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2020-04-10 16:15:42 +08:00
Wenkai Yin
847a513cea Add "delete" into the action map if the action in token is "*" 
Fixes #11563, add "delete" into the action map if the action in token is "*"

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-04-10 16:11:44 +08:00
Wenkai Yin(尹文开)
12fa69120c
Merge pull request #11566 from ywk253100/200409_case 
Uncomment the verification logic in the ldap group test case
 2020-04-10 16:06:34 +08:00
He Weiwei
f4821e96b3
Merge pull request #11527 from heww/refresh-quota-ignore-limitation 
feat(quota): ignore limitation support for quota RefreshMiddleware
 2020-04-10 15:29:41 +08:00
Daniel Jiang
56b404bfb7
Get digest in content trust middleware (#11554) 
This commit removes the EnsureArtifactDigest as its implementation is
problematic: the artifactinfo in context is immutable.
When the content trust middleware needs the digest it will retrieve it
via artifact controller.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-04-10 14:11:56 +08:00
Qian Deng
0846425b8a
Merge pull request #11553 from ninjadq/fix_internal_tls_issues 
Fix internal tls issues
 2020-04-10 14:07:04 +08:00
Wenkai Yin
812ea7814b Uncomment the verification logic in the ldap group test case 
Fixes #11094, uncomment the verification logic in the ldap group test case

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-04-10 14:02:11 +08:00
Steven Zou
6986af6e74
Merge pull request #11558 from danielpacak/fix/issue_11310/preserve_default_scanner 
fix(scanner): Do not override the default scanner on init
 2020-04-10 12:42:39 +08:00
Steven Zou
7b8293ad0f
Merge pull request #11456 from danielpacak/fix/issue_11373/trivy_cicd_failure 
chore(trivy): Bump up trivy to 0.5.4
 2020-04-10 12:41:06 +08:00
Steven Zou
5661ff937b
Merge pull request #11493 from steven-zou/fix/js_ut_case_failure 
fix(js UT cases):fix the cron spec bug
 2020-04-10 10:16:05 +08:00
Daniel Pacak
0eb5528d84 chore(trivy): Bump up trivy to 0.5.4 
In this version of Trivy we improved error handling
when Trivy cannot open the Trivy DB file. If it fails,
the  error is catched to retry the DB file download.

Resolves: #11373

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
 2020-04-09 18:02:18 +02:00
Daniel Pacak
dcbf0726e5 fix(scanner): Do not override the default scanner on init 
Resolves: #11310

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
 2020-04-09 17:56:07 +02:00
Daniel Jiang
87587b66b1
Merge pull request #11547 from reasonerjt/update-ci-badge 
Update the link of CI badge
 2020-04-09 21:31:08 +08:00
DQ
e907cbe2b6 Fix health check for jobservice and regctl 
need cert when mTLS is enabled

Signed-off-by: DQ <dengq@vmware.com>
 2020-04-09 20:35:46 +08:00
DQ
08ff622310 Remove lines not needed 
volume already defined above

Signed-off-by: DQ <dengq@vmware.com>
 2020-04-09 20:06:51 +08:00
Wenkai Yin(尹文开)
340027a882
Merge pull request #11484 from ywk253100/200407_replication_hairpin 
Fix replication failure in kubernetes with hairpin mode disabled
 2020-04-09 16:50:46 +08:00
Daniel Jiang
775d7d0bbb Update the link of CI badge 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-04-09 16:31:31 +08:00
Wenkai Yin
8ee3421176 Fix replication failure in kubernetes with hairpin mode disabled 
Fixes #11480
Fixes #11461
Fix replication failure in kubernetes with hairpin mode disabled

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-04-09 15:10:25 +08:00
Will Sun
71821a1c9a
Merge pull request #11497 from AllForNothing/css 
Fix css bugs of label 'target2.0'
 2020-04-09 14:20:30 +08:00
Wenkai Yin(尹文开)
8fb46d4bc7
Just log the signature not found error in debug mode (#11529) 
Fixes #11510, just log the signature not found error in debug mode when deleting artifacts

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-04-09 14:17:40 +08:00
Wenkai Yin(尹文开)
1b2efac156
Merge pull request #11528 from ywk253100/200409_swagger 
Add version API to swagger
 2020-04-09 11:59:17 +08:00
Wenkai Yin
208c6f6223 Add version API to swagger 
1. Add version API to swagger
2. Update the description for query

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-04-09 11:03:42 +08:00
He Weiwei
d0cd103e02
Merge pull request #11518 from heww/fix-vulnerable-msg 
fix(vulnerable): fix the wrong count of vulnerabilities in message
 2020-04-09 10:50:31 +08:00
AllForNothing
a411879196 Fix css bugs of label 'target2.0' 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-04-09 10:32:07 +08:00
He Weiwei
0b26b36737 feat(quota): ignore limitation support for quota RefreshMiddleware 
1. Ignore limitation when refresh quota for project.
2. Return 403 when quota errors occurred.
3. Add test for Refresh method of quota controller.

Closes #11512

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-04-08 19:17:41 +00:00
danfengliu
5ec8ff70b2
Merge pull request #11474 from danfengliu/add-multi-scanner-robot 
Add Multi-Scanner test file
 2020-04-08 20:45:05 +08:00
He Weiwei
20115b92c7 fix(vulnerable): fix the wrong count of vulnerabilities in message 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-04-08 09:06:31 +00:00