Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 10:45:45 +01:00
Code Issues Projects Releases Wiki Activity
6,180 Commits 48 Branches 317 Tags 352 MiB
382558167c
Commit Graph

6180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wenkai Yin
382558167c
Merge pull request #7275 from ywk253100/190402_delete_image 
Call Harbor API to delete the images in Harbor adapter
 2019-04-02 18:22:33 +08:00
Wenkai Yin
5219073c49 Call Harbor API to delete the images in Harbor adapter 
Call Harbor API to delete the images in Harbor adapter to avoid the inconsistent between the different versions of Harbor

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-02 17:02:15 +08:00
Wenkai Yin
68803313d9
Merge pull request #7272 from ywk253100/190402_trigger_operation 
Fix replication related issues
 2019-04-02 16:12:16 +08:00
Wenkai Yin
4484bca756 Fix replication related issues 
1. Add operation property for tasks
2. Add trigger property for executions
3. Update the getting registry info API to allow passing 0 as ID to get the info of local Harbor registry

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-02 14:26:17 +08:00
Wenkai Yin
18dbd807a4
Merge pull request #7270 from ywk253100/190401_transport 
Provide a util function to return a common HTTP transport
 2019-04-02 07:24:53 +08:00
Wenkai Yin
b42ae1c994 Provide a util function to return a common HTTP transport 
1. Provide a util function to return a shared HTTP transport
2. Read secretkey from the configuration of replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-01 19:52:37 +08:00
Wenkai Yin
1513c37ac2
Merge pull request #7269 from ywk253100/190401_registry_client 
Update the registry client to support pulling public images from docker hub without login
 2019-04-01 19:51:50 +08:00
Wenkai Yin
74efee569e Update the registry client to support pulling public images from docker hub without login 
Only add the authentication info when the username is provided to support pulling public images from docker hub without login

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-01 19:15:07 +08:00
Wenkai Yin
df2ae63308
Merge pull request #7262 from ywk253100/190401_harbor_adapter 
Use the secret to auth the replication for local Harbor
 2019-04-01 17:26:56 +08:00
Wenkai Yin
bd2308b91a Use the secret to auth the replication for local Harbor 
1. Use the secret to do the auth between the components when replicating
2. Handle internal core URL and token service URl when the instance is local Harbor

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-01 16:24:06 +08:00
Wenkai Yin
d6eb700077
Merge pull request #7264 from mmpei/replication_ng_bugfix_endtime 
Fix execution end time bug
 2019-04-01 16:09:16 +08:00
peimingming
92488bd27e Fix execution end time bug 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2019-04-01 14:28:01 +08:00
Wenkai Yin
52cfea7e06
Merge pull request #7256 from pureshine/update_replication_data 
Get registry detail  from listing policies API
 2019-04-01 12:10:27 +08:00
FangyuanCheng
cb438d0029 Update replication data 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-31 23:26:26 +08:00
Wenkai Yin
82e02fc734
Merge pull request #7254 from ywk253100/190329_api 
Update the replication API
 2019-03-30 21:28:38 +08:00
Wenkai Yin
f74a9c7ab2
Merge pull request #7253 from pureshine/get-adapter 
Fix cannot get adapters
 2019-03-30 21:27:13 +08:00
Wenkai Yin
71b706e60a Update the replication API 
1. Add getting execution by ID API
2. Return registry detail info in listing policies API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-30 20:46:02 +08:00
FangyuanCheng
163909579e fix get adapter bug 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-29 18:27:00 +08:00
Wenkai Yin
1491cf1846
Merge pull request #7224 from pureshine/replication_ng 
Refactor replication-task page according to the new design
 2019-03-29 17:19:31 +08:00
FangyuanCheng
0b7f68388f Refactor replication-task page 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-29 15:33:42 +08:00
Wenkai Yin
8c7b63bac2
Merge pull request #7248 from ywk253100/190326_event 
Add event based trigger and scheduled trigger
 2019-03-29 14:58:09 +08:00
Wenkai Yin
4f8e283e8e Add event based trigger and scheduled trigger 
This commit implements the event based trigger and scheduled trigger in replilcation

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-29 13:48:34 +08:00
Wenkai Yin
c0faa9d4aa
Merge pull request #7227 from zhoumeina/replication_ng 
add filter logic
 2019-03-28 08:43:43 +08:00
Wenkai Yin
0e9bdbc09c
Merge pull request #7225 from ywk253100/190326_structure 
Adjust the file structure of replication package
 2019-03-27 13:08:05 +08:00
Wenkai Yin
a49c0dd18c
Merge pull request #7235 from ywk253100/190327_sync 
Sync with master branch
 2019-03-27 12:04:33 +08:00
Wenkai Yin
017bba8dc1 Merge remote-tracking branch 'upstream/master' into 190327_sync 2019-03-27 11:43:51 +08:00
Qian Deng
7d0f77e986
Merge pull request #7234 from wy65701436/update-node 
Upgrade node version to 10.15
 2019-03-27 11:16:11 +08:00
wang yan
1ba1c5726a Upgrade node version to 10.15 
To fix the issue https://lists.debian.org/debian-devel-announce/2019/03/msg00006.html,
it needs to upgrade node to 10.15, which has pitched the fix.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-03-27 10:47:13 +08:00
Meina Zhou
d9bff2f269 add filter logic 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-26 17:09:23 +08:00
Qian Deng
215149fc2f
Merge pull request #7206 from ninjadq/update_pyyaml_version 
Fix: upgrade pyyaml version to 4.2b1
 2019-03-26 15:11:42 +08:00
Wenkai Yin
de4eb0369a Adjust the file structure of replication package 
Move the scheduler, execution, hook and flow package into operation

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-26 14:59:58 +08:00
Wenkai Yin
690f868d15
Merge pull request #7216 from zhoumeina/replication_ng 
Create replication rule -- remove project logic and add dynamic trigger logic.
 2019-03-26 10:39:05 +08:00
Mia ZHOU
542c460e3d
Merge pull request #7214 from jwangyangls/fixHelmChartIssue 
moveHelmChartIssue
 2019-03-26 10:25:37 +08:00
Wenkai Yin
1d4cf53462
Merge pull request #7220 from ywk253100/190324_adapter 
Update the registry adapter interface
 2019-03-25 21:59:04 +08:00
Meina Zhou
2df11a773e add trigger logic and remove project code 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-25 14:19:47 +08:00
Fangyuan Cheng
37ddaf9ecf
Merge pull request #7138 from pureshine/vul-cron 
Refactoring vulnerability ui support cron
 2019-03-25 12:30:28 +08:00
Daniel Jiang
49aae76205 Onbard settings for OIDC provider (#7204) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-03-25 12:24:39 +08:00
Yogi_Wang
309696b575 movoHelmChartIssue 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-03-25 11:11:10 +08:00
Meina Zhou
b0ce3da8bd remove the project related code 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-25 10:20:55 +08:00
Wenkai Yin
084ae573ad
Merge pull request #7213 from ywk253100/190324_status 
Convert job status to replication task status
 2019-03-24 18:32:36 +08:00
Wenkai Yin
39485efc9a
Merge pull request #7212 from ywk253100/190324_sync 
Sync with master branch
 2019-03-24 14:18:23 +08:00
Wenkai Yin
bdab2fef69
Merge pull request #7211 from ywk253100/190324_delete 
Implement deletion for image transter
 2019-03-24 14:12:41 +08:00
FangyuanCheng
dada47c07e Refactoring vulnerability ui support cron 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-23 20:58:45 +08:00
Wenkai Yin
791aecddfa
Merge pull request #7210 from ywk253100/190321_delete 
Add support for replicating the delation of resource
 2019-03-23 20:08:13 +08:00
Wenkai Yin
b37f4018a6 Update the registry adapter interface 
This commit adds the Info() method to the registry adapter interface

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-23 07:49:59 +08:00
Qian Deng
df2425a02b Fix: upgrade pyyaml version to 4.2b1 
Because previous version has security issue

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-22 19:05:16 +08:00
Qian Deng
e538a4c448 Fix: install.sh failure if $host env is setted (#7203) 
Fix sed replace cmd

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-22 19:04:40 +08:00
Wenkai Yin
679b0d3d6a Convert job status to replication task status 
This commits converts job status to task status

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-22 18:16:27 +08:00
Yan
8d3946a0e2
Refactor scan all api (#7120) 
* Refactor scan all api

This commit is to let scan all api using admin job to handle schedule
management. After the PR, GC and scan all share unified code path.

Signed-off-by: wang yan <wangyan@vmware.com>

* update admin job api code according to review comments

Signed-off-by: wang yan <wangyan@vmware.com>

* Update test code and comments per review

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-03-22 17:52:21 +08:00
Mia ZHOU
05e0289f84
Merge pull request #7200 from jwangyangls/movoHelmChartAndOptimizationUserPermission 
moveHelmChart
 2019-03-22 16:48:21 +08:00