Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 18:55:18 +01:00
Code Issues Projects Releases Wiki Activity
6,288 Commits 48 Branches 317 Tags 353 MiB
2fe207b77d
Commit Graph

6288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jwangyangls
a06d711edd
Merge pull request #7251 from jwangyangls/OIDC_step1 
Oidc step1--Configuration enables users to change information after login through OIDC
 2019-04-01 14:42:18 +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
Yogi_Wang
363d8dd208 Configuration enables users to change information after login through OIDC provider smoothly. 
In the configration auth mode section, we add an option, OIDC.When the user logs in using OIDC mode, the system defaults to auth mode to select OIDC, where the user can modify the name, endpoint, scope, clientId, clientSecret and skipCertVerify of the OIDC. After the modification, the user clicks the Save button to save the changes
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-04-01 13:13:02 +08:00
Daniel Jiang
587acd33ad Add callback controller for OIDC 
This commit add callback controller to handle the redirection from
successful OIDC authentication.
For E2E case this requires callback controller to kick off onboard
process, which will be covered in subsequent commits.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-04-01 12:35:31 +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
Daniel Jiang
4b82b0e364
Merge pull request #7245 from zhoumeina/update_guide 
add new version info for contributing guide
 2019-03-29 17:16:25 +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
Meina Zhou
c59e0b2aeb add new version info for contributing guide 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-29 14:12:52 +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
Fangyuan Cheng
a2051354c6
Merge pull request #7232 from pureshine/cron-validator 
Add cron regular expression
 2019-03-29 10:23:40 +08:00
Daniel Jiang
f6820b5ae3
Merge pull request #7242 from reasonerjt/oidc-controllers 
Add controller to handle oidc login
 2019-03-29 00:50:26 +08:00
danfengliu
3db3f3a62e
add test cases for jenkins upgrade project, wrap test cases body into new keywords, so that case body appears only in one single place (#7243) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-28 14:37:03 +08:00
FangyuanCheng
5dd200fa00 cron validator 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-28 13:25:25 +08:00
Qian Deng
d81dabc208
Merge pull request #7240 from ninjadq/fix_upstream_config_file_of_notary 
Fix: copy upstream file to nginx config file
 2019-03-28 13:23:43 +08:00
Daniel Jiang
9ce98f4acd Add controller to handle oidc login 
The controller will redirect user to the OIDC login page based on
configuration.
Additionally this commit add some basic code to wrap `oauth2` package
and `provider` in `go-oidc`, and fixed an issue in UT to make
InMemoryDriver for config management thread-safe.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-03-28 11:29:05 +08:00
Fangyuan Cheng
2787306d47
Merge pull request #7076 from cd1989/update-api-basepath 
Use baseURL from config
 2019-03-28 09:40:23 +08:00
Wenkai Yin
c0faa9d4aa
Merge pull request #7227 from zhoumeina/replication_ng 
add filter logic
 2019-03-28 08:43:43 +08:00
Qian Deng
cb846bd936 Fix: copy upstream file to nginx config file 
Copy notary.upstream.conf to nginx config file

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-27 17:56:31 +08:00
danfengliu
6b19b99c97
test case Disable Scan Schedule failed at page should contain part, it missing wait until and retry, so add one (#7228) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-03-27 15:33:31 +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
Yan
03709e4ec1
add authn proxy (#7199) 
* add authn proxy docker login support

User could use the web hook token issued by k8s api server to login to harbor.
The username should add a specific prefix.

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

* update code per review comments

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

* Add UT for auth proxy modifier

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-03-27 12:37:54 +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