Commit Graph

2946 Commits

Author SHA1 Message Date
Steven Zou
e07e25eeef
Merge pull request #7522 from ywk253100/190426_start_replication
Return immediately after creating the execution record when starting the replication
2019-04-29 15:01:52 +08:00
Daniel Jiang
56c7d55c73
Merge pull request #7593 from reasonerjt/ext-url-systeminfo
Add Ext URL to response of systeminfo API
2019-04-29 14:51:40 +08:00
Wenkai Yin
c53d73775a
Merge pull request #7590 from reasonerjt/oidc-wrong-secret-err
Return more details for error in exchange token
2019-04-29 14:22:37 +08:00
Wenkai Yin
da338806fa
Merge pull request #7583 from ywk253100/190428_replication
Don't fail the process when one tag replication failed
2019-04-29 14:16:07 +08:00
Fangyuan Cheng
cceb624fc2
Merge pull request #7555 from pureshine/loading-filter
Add loading if the fileter is not loaded when creating the replication rule
2019-04-29 13:34:56 +08:00
Daniel Jiang
02cf75c142 Add Ext URL to response of systeminfo API
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-29 13:31:52 +08:00
FangyuanCheng
ab461abe64 Add loading if the fileter is not loaded when creating the replication rule\
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-29 12:44:31 +08:00
Fangyuan Cheng
41e0c5e31a
Merge branch 'master' into fix-vulnerability 2019-04-29 11:32:05 +08:00
Wenkai Yin
c9c2db7c13 Don't fail the process when one tag replication failed
Don't fail the process when one tag replication failed

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-29 10:24:03 +08:00
Steven Zou
f2870272ce add get jobs API to provide powerful job stats management
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-28 22:36:13 +08:00
Fangyuan Cheng
12737bfa7b
Merge branch 'master' into add-loading 2019-04-28 22:23:38 +08:00
FangyuanCheng
1979f3b362 Add loading to the vulnerability page and the gc page
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-28 22:22:28 +08:00
Steven Zou
c9f2bf36eb
Merge pull request #7580 from wy65701436/remove-workaround-500
Remove the workaround for checking chart existence
2019-04-28 21:09:59 +08:00
wang yan
2b99e148d9 Add gc parameters when to update gc schedule
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-28 18:17:08 +08:00
FangyuanCheng
1513f468ae Fix bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-28 17:03:22 +08:00
Fangyuan Cheng
10effb0a02
Merge pull request #7581 from zhoumeina/fix_label_error
fix replication add label console error
2019-04-28 16:24:18 +08:00
Meina Zhou
f4dcac95fe fix replication add label console error
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-28 15:49:28 +08:00
wang yan
b5cb984455 Remove the workaround for checking chart existence
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-28 15:24:17 +08:00
Wang Yan
c26f655bce
add periodic job UUID to upstream job id and use execution log as the… (#7530)
* add periodic job UUID to upstream job id and use execution log as the periodic log

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

* add comments to fix codacy

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

* Update code per comments

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-28 15:09:56 +08:00
Mia ZHOU
630fa48ac8
Merge pull request #7517 from pureshine/loading-num
Get the number of execution status every 10s and refresh the task list
2019-04-28 14:22:36 +08:00
Mia ZHOU
ae922d86e2
Merge pull request #7521 from pureshine/modify-tip
Modify tooltips for creating replication rule
2019-04-28 14:18:29 +08:00
Wenkai Yin
7af679af7e
Merge pull request #7567 from reasonerjt/oidc-google-refresh-token
Persist the new token in DB after login
2019-04-28 14:12:25 +08:00
Daniel Jiang
80176cc354 Check whether user is nil in Prepare() of users API (#7507)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-28 14:06:35 +08:00
Daniel Jiang
15626fcae0 Return more details for error in exchange token
This commit update the response off OIDC callback when there's error in exchange token.
Additionally add comments to clarify that by default 500 error will not
contain any details.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-28 13:41:53 +08:00
Wenkai Yin
2a463016a9 Upgrade the distribution and notary library (#7516)
* Return 404 when the log of task doesn't exist

Return 404 when the log of task doesn't exist

Signed-off-by: Wenkai Yin <yinw@vmware.com>

* Upgrade the distribution and notary library

Upgrade the distribution library to 2.7.1, the notary library to 0.6.1

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-28 12:00:26 +08:00
Daniel Jiang
473fed5689 Persist the new token in DB after login
This commit make sure the token is persist to DB after every time after
a user logs in via OIDC provider, to make sure the secret is usable for
the OIDC providers that don't provide refresh token.

It also updates the authorize URL for google to make sure the refresh
token will be returned.

Also some misc refinement included, including add comment to the
OIDC onboarded user, preset the username in onboard dialog.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-27 23:03:59 +08:00
Daniel Jiang
b9f5f1027c
Merge pull request #7504 from reasonerjt/reload-auth-proxy-cert-verify
Update Transport of HTTP cient in auth proxy client
2019-04-26 23:24:33 +08:00
Daniel Jiang
07d15a8553 Update Transport of HTTP cient in auth proxy client
This commit ensures that the TLS config of the HTTP client for auth
proxy is updated when the configuration is changed.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-26 18:39:28 +08:00
Wenkai Yin
621d2f20f3 Return immediately after creating the execution record when starting the replication
When fetching resources is slow, the starting replication request may timeout, this commit returns immediately after creating the execution record when starting the replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-26 13:28:16 +08:00
Wenkai Yin
3c1be645bf
Merge pull request #7456 from yuanshuhan/replication_ng
fix a small issue, that if there is no manifest in huawei image repos…
2019-04-26 11:27:40 +08:00
FangyuanCheng
e45d402777 Modify tooltips for creating replication rule
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-26 10:54:41 +08:00
FangyuanCheng
4768ad33ed Get the number of execution status every 10s and refresh the task list
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-25 22:01:07 +08:00
Wenkai Yin
6511417ba6
Merge pull request #7495 from stonezdj/const_debts
Replace string with const in metadatalist.go
2019-04-25 17:41:04 +08:00
Mia ZHOU
3296e2acae
Merge pull request #7513 from pureshine/replication-delete
Get delete or replicate failure information directly and display
2019-04-25 17:11:35 +08:00
stonezdj
504eab56c3 Replace string with const in metadatalist.go
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-04-25 17:01:43 +08:00
FangyuanCheng
5e34cd3cf9 Fix some issues of replication
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-25 16:47:31 +08:00
Mia ZHOU
ffadd13ba6
Merge pull request #7487 from pureshine/fix-scan-error
Fix scan task never ends in UI
2019-04-25 12:16:47 +08:00
Mia ZHOU
5a9fa17b0b
Merge pull request #7506 from zhoumeina/fix_gc
use endpoint for gc log
2019-04-25 10:33:25 +08:00
FangyuanCheng
6f055cebc3 Fix Scan task never ends in UI target/1.8.0
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-25 10:27:28 +08:00
Wenkai Yin
7160e411cc
Merge pull request #7498 from ywk253100/190423_docker_hub
Support replicate public repositories from Docker Hub
2019-04-24 17:17:23 +08:00
Meina Zhou
f0d9b41bf5 use endpoint for gc log
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-24 17:04:44 +08:00
Wenkai Yin
66087aac82
Merge pull request #7493 from stonezdj/tech_debts
Remove adminserver in sourcecode
2019-04-24 16:24:59 +08:00
Steven Zou
9bd2de3e35
Merge pull request #7452 from steven-zou/fix_issues_for_jobservice
Fix issues for jobservice
2019-04-24 16:15:43 +08:00
Wenkai Yin
5629bf8546 Support replicate public repositories from Docker Hub
Support replicate the public repositories from Docker Hub without providing the credential

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-24 16:15:31 +08:00
Wenkai Yin
d8da6cb802
Merge pull request #7460 from ywk253100/190419_replication_bug_fix
Fix bug found in replication
2019-04-24 16:12:20 +08:00
jwangyangls
743b3914c3
Merge pull request #7494 from jwangyangls/remove_oidc_ability_to_change_password
Remove OIDC's ability to change passwords
2019-04-24 13:24:54 +08:00
Fangyuan Cheng
24acbcf300
Merge pull request #7485 from pureshine/add-tooltip
Add tooltips for creating replication rule
2019-04-24 13:22:46 +08:00
Mia ZHOU
c4bf07a2ed
Merge pull request #7377 from kofj/fix_history_display
Fix history display
2019-04-24 13:12:14 +08:00
Mia ZHOU
a1230a0ca1
Merge pull request #7490 from pureshine/label-tab
Align all tab spacing between project and configuration pages
2019-04-24 12:45:11 +08:00
Steven Zou
9bcbe2907b fix go vet issues in the code
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-24 07:31:37 +08:00
Wenkai Yin
d8310cc708 Fix replication bugs (#7470)
1. Only return the event based trigger for local Harbor
2. Valid the trigger pattern and cron string when creating/updating policies
3. Set the schema as "http" if it isn't specified when creating/updating registries

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-23 19:34:29 +08:00
Steven Zou
823d9c04a9
Merge pull request #7497 from wy65701436/fix-replc-500
refine chart clint http response
2019-04-23 19:30:36 +08:00
Wenkai Yin
117232c1be Fix bug: cannot update the registry (#7483)
Fix bug: cannot update the registry that has no credential when creating it

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-23 18:45:56 +08:00
wang yan
0d563fda9c refine chart clint http response
Chart client eats the http error if not status ok, after refactor, the
real http response will be catched in core api.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-23 18:22:23 +08:00
Steven Zou
69d9a28860
Merge pull request #7482 from wy65701436/chart-upload
Fix chart upload issue on event based
2019-04-23 17:33:08 +08:00
stonezdj(Daojun Zhang)
e4506604e2 fix error message (#7459)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-04-23 15:53:34 +08:00
Yogi_Wang
32fc76c666 Remove OIDC's ability to change passwords
remove the ability  to change passwords when user login harbor through OIDC.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-23 15:17:59 +08:00
stonezdj
d7798a12d2 Remove adminserver in sourcecode
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-04-23 15:05:29 +08:00
疯魔慕薇
d022ad4cd4 1. Add IsSpecificRepositoryName util method. (#7444)
2. Add IsSpecificRepositoryName unit test case.
3. Add Copyright header comment.

Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-23 13:37:40 +08:00
FangyuanCheng
85bd840ff1 Align all tab spacing between project and configuration pages
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-23 11:20:05 +08:00
jwangyangls
1323fbfa14
Merge pull request #7481 from jwangyangls/oidc_generate_cli
Add generate cli secret in user profile page
2019-04-23 11:10:50 +08:00
wang yan
a3763466b3 Update err message to general information
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-23 10:57:31 +08:00
wang yan
1b4c75af25 Add event into upload ctx
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-23 10:57:31 +08:00
wang yan
df6e0600c9 Fix chart upload issue on event based
Use chart API to load the uploaded chart file to get the name and version

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-23 10:57:31 +08:00
Wenkai Yin
ac4dfd5973
Merge pull request #7473 from pureshine/fix-ping-param
Modify some issues of test ping registry and edit registry
2019-04-23 10:13:39 +08:00
Yogi_Wang
f164738246 Add generate cli secret in user profile page
add cli secret button in user profile page, OIDC users can click this button to regenerate a cli secret, if the user does so, then the past cli secret will be abandoned.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-23 10:11:07 +08:00
FangyuanCheng
8cf0d58f1f Modify some issues of test ping registry and edit registry
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-23 01:31:45 +08:00
FangyuanCheng
1d4a7d8127 Add tooltips for creating replication rule
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-23 00:32:59 +08:00
Steven Zou
ad68a3f79d update the code of other components influenced by the js code change
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-22 22:21:49 +08:00
Steven Zou
3937c8b0dc Merge branch 'master' into fix_issues_for_jobservice 2019-04-22 19:26:51 +08:00
Steven Zou
fae5d1304d add more/refacotr current test cases of job service
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-22 19:24:37 +08:00
Daniel Jiang
1fdc2e6ba9 Provide API to generate CLI secret
This commit provide an API to allow a user that is onboarded via OIDC
authn update his CLI secret.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-22 13:34:12 +08:00
Steven Zou
6f8a80d21c refine the hook event and status update retry approach
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-20 15:00:32 +08:00
Wenkai Yin
aa3b07df69
Merge pull request #7454 from pureshine/fix-duration
Fix failed executions does not show duration
2019-04-20 09:14:16 +08:00
Steven Zou
c6a509b3dd exec dep ensure
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-19 21:22:37 +08:00
Steven Zou
8e734407c0 Merge branch 'master' into fix_issues_for_jobservice 2019-04-19 21:15:21 +08:00
Steven Zou
ea34bcc950 add retry for status switching
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-19 21:14:09 +08:00
FangyuanCheng
f2316601d8 Fix duration missed for failed jobs
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-19 17:48:27 +08:00
Wenkai Yin
5c944d98d5 Fix bug found in replication
Call filterResources direclty if resource isn't null in copy flow

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-19 17:32:50 +08:00
Steven Zou
e92164c886
Merge pull request #7442 from ywk253100/190418_replication_bug_fix
Fix bug in replication
2019-04-19 17:04:34 +08:00
stonezdj(Daojun Zhang)
36d13e8243
Merge pull request #7328 from stonezdj/debts
Fix issue 6450 Test LDAP server error without save configuration
2019-04-19 16:51:57 +08:00
Yuan Lei
8205e87d4d fix a small issue, that if there is no manifest in huawei image repository, should return false rather than err
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-04-19 16:16:10 +08:00
Daniel Jiang
6b45b5ef7c
Merge pull request #7451 from reasonerjt/oidc-logout
Skip verifying OIDC token for local user
2019-04-19 14:55:26 +08:00
Steven Zou
38e6df4edb fix code style issues: missing comments
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-19 14:16:08 +08:00
Steven Zou
f8feaa192e add get scheduled and periodic executions APIs
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-19 13:54:23 +08:00
Wenkai Yin
cf5cd5902f Fix bug in replication
1. Fix bug when creating the namespace
2. Keep the same logic for hiding access secret
3. Filter only push mode policies for event trigger

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-19 13:34:04 +08:00
Wenkai Yin
3738b0a984
Merge pull request #7439 from wy65701436/pin-error
Pin pkg error version to v0.8.1
2019-04-19 13:16:47 +08:00
Daniel Jiang
5292aea89e Skip verifying OIDC token for local user
If a user does not have OIDC meta data in DB, it means he's not
onboarded via OIDC authn, hence, we should not check the token.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-19 13:07:06 +08:00
Steven Zou
d2c4f19a4c
Merge pull request #7450 from yuanshuhan/replication_ng
add huawei adapter to replication module, and adjust some interface a…
2019-04-19 12:52:21 +08:00
Wenkai Yin
059b75e97c
Merge pull request #7392 from reasonerjt/oidc-logout
Handle OIDC user invalidation from OIDC provider.
2019-04-19 12:46:36 +08:00
Fangyuan Cheng
efca5631fe
Merge pull request #7447 from pureshine/fix-bug
Fix replication tasks page cannot pagination
2019-04-19 12:10:50 +08:00
FangyuanCheng
87c2684724 Fix replication tasks page cannot pagination
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-19 11:40:10 +08:00
Yuan Lei
7ee009f1d2 add huawei adapter to replication module, and adjust some interface after testing
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-04-19 10:05:39 +08:00
Daniel Jiang
239b33c5fb Handle OIDC user invalidation from OIDC provider.
Ths commmit ensures that when user's token is invalidated OIDC provider, he
cannot access protected resource in Harbor with the user info in his session.
We share the code path with secret verification b/c the refresh token
can be used only once, so it has to be stored in one place.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-19 01:27:31 +08:00
De Chen
4ce2ba8688 Support image delete in DockerHub adapter (#7422)
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-18 18:24:42 +08:00
De Chen
c3375e4ac2 Fix create ns failure in DockerHub (#7421)
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-18 18:24:28 +08:00
wang yan
d410a964a5 Pin pkg error version to v0.8.1
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-18 17:49:04 +08:00
Steven Zou
608354dd04 refine the returnning errors
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-18 17:15:55 +08:00
Steven Zou
16f97326ad
Merge pull request #7433 from goharbor/replication_ng
Merge the replication ng branch to master
2019-04-18 16:35:45 +08:00
FangyuanCheng
33852973e3 Hide vulnrability if clair is not installed
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-18 16:03:31 +08:00
Steven Zou
1f481e492c Refactor job servcie primary logic to fix related bugs
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-18 16:02:49 +08:00
FangyuanCheng
f7f5298ba2 Fix replication ui relate issues
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-18 15:06:11 +08:00
stonezdj
41a574e55c Fix issue 6450 Test LDAP server error without save configuration
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-04-18 14:24:21 +08:00
wang yan
ba76550d14 Disable throw internal error to UI
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-18 00:04:19 +08:00
慕薇疯魔
bf28e9779b 1. check is repository exist later at filterTags.
2. test case for image not found.

Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-17 23:01:44 +08:00
Wenkai Yin
7196abc77b
Merge pull request #7417 from pureshine/replication-case
Reload the task list when the task status is pending and scheduled
2019-04-17 20:03:36 +08:00
Wenkai Yin
a5cc228781
Merge pull request #7420 from ywk253100/190417_revert_local_harbor
Update the migration sql
2019-04-17 19:58:31 +08:00
Wenkai Yin
eb00c9cb70
Merge pull request #7404 from jwangyangls/replication_C
In add or edit replication page ,disable the mode of pull and push when editing the replication and delete src_namespaces and delete useless code and add a validate content that when I choose scheduled, the cron field is mandatory.
2019-04-17 19:11:46 +08:00
FangyuanCheng
f776e6de2c Reload the task list when the task status is pendding and scheduled
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-17 19:10:23 +08:00
wang yan
ddec7bd645 fix error handlering in job notification
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-17 18:19:01 +08:00
wang yan
e017294f71 merge with master latest
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-17 17:52:39 +08:00
Wenkai Yin
547c2337de Update the migration sql
1. Update the migration sql
2. Rename the ResourceRepository from repository to image

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-17 17:18:03 +08:00
Yogi_Wang
8f152392b5 Change new and edit Replication page about pull and push mode.
1.disable the mode of pull and push when editing the replication;
2.delete src_namespaces
3.delete useless code
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-17 16:57:03 +08:00
Wang Yan
a6af9e9972
Support well-formatted error returned from the REST APIs. (#6957)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-17 16:43:06 +08:00
jwangyangls
cc868aa23e
Merge pull request #7407 from jwangyangls/fixHelmChartRouteIssue
Recovery a test case about 'should filter data by keyword' in the test file named repository-gridview.component.spec.ts
2019-04-17 15:24:56 +08:00
Wenkai Yin
6e0d892963 Support creating project with service account
This commit introduces a solution to workaround the restriction of project creation API: only normal users can create projects

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-17 14:50:32 +08:00
Wenkai Yin
3f7884d9d2 Revert "Add new registry type: LocalHarbor"
This reverts commit 94cacf762a.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-17 14:50:24 +08:00
Wenkai Yin
c754ec054d
Merge pull request #7406 from pureshine/remove-replication
Remove the Replication tab under project view
2019-04-17 11:01:23 +08:00
FangyuanCheng
73e408b851 Fix cron input box and select box not in one line
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-16 22:38:28 +08:00
Wenkai Yin
aa188954ed
Merge pull request #7403 from ywk253100/190416_prepare_for_push
Update the PrepareForPush method
2019-04-16 18:47:42 +08:00
FangyuanCheng
b11c95316f Remove the Replication tab under project view
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-16 17:56:45 +08:00
Wenkai Yin
ea6ca2b8cc
Merge pull request #7399 from ywk253100/190416_match
Use the new package to do the match
2019-04-16 17:25:51 +08:00
Wenkai Yin
613dfee5ee Update the PrepareForPush method
Update the PrepareForPush method to avoid the useless API callings to create namespaces

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-16 17:21:31 +08:00
root
b60b16230e Use the new package to do the match
Use the new package to do the match

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-16 16:07:30 +08:00
Wenkai Yin
0f488e6011
Merge pull request #7393 from pureshine/add-override
Fix replication frontend issues
2019-04-16 15:55:00 +08:00
FangyuanCheng
609f6cbda2 Fix replication frontend issues
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-16 15:20:05 +08:00
Wenkai Yin
94cacf762a Add new registry type: LocalHarbor
The "LocalHarbor" is the type of registry where the replication service is running on

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-16 11:42:36 +08:00
Wenkai Yin
2f1d2257d5 Remove the namespace concept in replication
Update the replication logic to remove the "namespace"

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-16 08:36:42 +08:00
慕薇疯魔
027cf44e82 unit test for native adapter.
Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-15 23:51:20 +08:00
慕薇疯魔
c5045933a1 change to testable.
Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-15 20:39:50 +08:00
Wenkai Yin
7729bca23b
Merge pull request #7382 from wy65701436/replication_ng
Add event trigger to helm deletion replication
2019-04-15 20:36:10 +08:00
wang yan
7a373c2eed Add event trigger to helm upload/deletion replication
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-15 19:02:33 +08:00
Wenkai Yin
d9a2b2b79a
Merge pull request #7380 from cd1989/anonymous-dockerhub
Support anonymous access to dockerhub
2019-04-15 18:41:02 +08:00
Wenkai Yin
24e7019b60
Merge pull request #7384 from kofj/fix_deadlock
fix deadlock when client not exist.
2019-04-15 18:40:10 +08:00
Yogi_Wang
4faea92b04 Release a test case about 'should filter data by keyword'
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-15 17:00:27 +08:00
FangyuanCheng
a95cf813fb Fix when editting the policy, the source registry isn’t shown
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-15 16:17:20 +08:00
慕薇疯魔
47d6e2583a fix deadlock when client not exist.
Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-15 16:12:42 +08:00
cd1989
21c7554644 Support anonymous access to dockerhub
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-14 16:44:24 +08:00
Wenkai Yin
00ecbd459e Fix buf in native docker registry adapter
Check the existence of repository if the name filter contains no * and ?

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-14 14:50:44 +08:00
慕薇疯魔
64cabc0dfc fix #7219
Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-13 22:44:20 +08:00
慕薇疯魔
086926b745 format.
Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-13 22:33:43 +08:00
Wenkai Yin
ba038eb883 Support replication all projects in Harbor
Support replication all projects in Harbor

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-13 20:23:19 +08:00
Wenkai Yin
c222f18fa7 Update replication
1. Refine the health check of docker hub
2. Remove the GetNamespace method from adapter interface

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-13 15:20:06 +08:00
Matt Burdan
7ba51dbac2
Fix misspellings of the word credential
Signed-off-by: Matt Burdan <burdz@burdz.net>
2019-04-12 20:37:41 -07:00
Daniel Jiang
f92bc8076d "Skip verify cert" to "verify cert"
This commit tweaks the attribute for auth proxy mode and OIDC auth mode.
To change it from "Skip verify cert" to "verify cert" so they are more
consistent with other modes.
Additionally it removes a workaround in `SearchUser` in auth proxy
authenticator.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-12 23:25:54 +08:00
Wenkai Yin
1d16e18dff Remove "ng" from source code
Remove "ng" from source code

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-12 22:42:27 +08:00
Wenkai Yin
d4b6eede98
Merge pull request #7331 from cd1989/ng-operation-review
Correct some typos and do some small adjustments
2019-04-12 21:50:42 +08:00
cd1989
8ca5e17c58 Correct some typos and do some small adjustments
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-12 21:17:33 +08:00
慕薇疯魔
a555b09df0 1. Implement native docker registry adapter.
2. register the native adapter.

Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-12 21:08:23 +08:00
Wenkai Yin
f0f92791c7
Merge pull request #7333 from cd1989/check-status-when-add-registry
Check health status when add registry
2019-04-12 20:39:44 +08:00
Wenkai Yin
5ee30c7909
Merge pull request #7127 from cd1989/dockerhub-adaptor
Implement dockerhub adapter
2019-04-12 20:25:18 +08:00
cd1989
7f6f85aab3 Remove ValidResource method
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-12 19:47:27 +08:00
Wenkai Yin
c88eeef07c
Merge pull request #7360 from ywk253100/190412_case
Remove the E2E test cases for replication
2019-04-12 18:44:16 +08:00
Wenkai Yin
174a1f5bfa Remove the E2E test cases for replication
Remove the E2E test cases for replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-12 17:37:14 +08:00
cd1989
cc4f08cc04 Add valid method to adapter to valid resource
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-12 17:33:32 +08:00
cd1989
1231c533db Support name and tag filters
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-12 17:31:32 +08:00
cd1989
ca705275f2 Support pull based replication from Dockerhub
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-12 17:31:32 +08:00
cd1989
b876a576a6 Implement dockerhub adapter
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-12 17:31:32 +08:00
cd1989
a9fa22269c Check health status when add/update registry
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-12 17:29:05 +08:00
Wenkai Yin
271c5ab213
Merge pull request #7357 from ywk253100/190412_harbor_adapter
Add filter support when fetching resources for Harbor adapter
2019-04-12 15:51:58 +08:00
Wenkai Yin
7d4649fc6b
Merge pull request #7163 from yuanshuhan/replication_ng
huawei cloud registry adapter for replication
2019-04-12 15:32:23 +08:00
Wenkai Yin
04883d2b0d Support replication windows images
Skip the foreign layers when do the replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-12 15:28:41 +08:00
Wenkai Yin
2fe207b77d Add filter support when fetching resources for Harbor adapter
Add filter support when fetching resources for Harbor adapter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-12 15:28:41 +08:00
Yogi_Wang
8b82e8925e Add Token Review Endpoint in configuration page
adding token review endpoint to the configuration page allows users to edit token review endpoint when logging in through http auth.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-12 14:29:39 +08:00
Yuan Lei
f8cb2d1e86 huawei cloud adapter for replication
Signed-off-by: Yuan Lei <yuanlei9@huawei.com>
2019-04-12 11:18:23 +08:00
Wenkai Yin
188d66d875
Merge pull request #7350 from ywk253100/190411_bugfix
Fix bug of replication
2019-04-12 08:22:59 +08:00
Wenkai Yin
bc0123662b Fix bug of replication
1. check the disable/enable status before starting the replication
2. process the support_namespace property

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-12 07:59:57 +08:00
Wenkai Yin
1f574e7d10
Merge pull request #7354 from wy65701436/replication_ng_namespace
Add api to get namespaces of registry
2019-04-11 23:44:24 +08:00
wang yan
117c36d52c Add api to get namespaces of registry
To query the namespace of the registry according to its ID.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-11 23:17:33 +08:00
Daniel Jiang
83a2246485
Merge pull request #7335 from reasonerjt/oidc-onboard-e2e
OIDC E2E flow + secret support
2019-04-11 18:13:22 +08:00
Wenkai Yin
a2fcb41b31 Fix bug in ping registry API
Fix bug in ping registry API: accept both ID and other properties

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-11 18:00:44 +08:00
jwangyangls
08ecb87220
Merge pull request #7336 from jwangyangls/loginPageChange
Change the login module
2019-04-11 17:00:34 +08:00
Daniel Jiang
763c5df010 Add UT
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-11 15:30:19 +08:00
Wenkai Yin
b73acde051 Support the migration for scheduled replication rule from previous version of Harbor
Support the migration for scheduled replication rule from previous version of Harbor

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-11 13:14:32 +08:00
Yogi_Wang
94438608a7 Add Cli secret in Harbor user profile
user could copy the CLI secret when login through oidc, and using this cli secret as password when using docker/helm cli to access Harbor.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-11 12:52:15 +08:00
Wenkai Yin
5a047a7eb6 Update the adapter interface
Add ConvertResourceMetadata and PrepareForPush methods

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-10 23:37:11 +08:00
zhoulin xie
cff4df8dfd request change
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-04-10 22:37:02 +08:00
Daniel Jiang
0d18e6c82f Update according to comments
For more context see PR #7335

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-10 19:38:12 +08:00
Daniel Jiang
0a2343f542 Support secret for docker CLI
As CLI does not support oauth flow, we'll use secret for help OIDC user
to authenticate via CLI.
Add column to store secret and token, and add code to support
verify/refresh token associates with secret.  Such that when the user is
removed from OIDC provider the secret will no longer work.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-10 19:38:11 +08:00
Daniel Jiang
08e00744be Fix misc bugs for e2e OIDC user onboard process
This commit adjust the code and fix some bugs to make onboard process
work.
Only thing missed is that the UI will need to initiate the redirection,
because the request of onboarding a user was sent via ajax call and didn't
handle the 302.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-10 19:38:11 +08:00
Yogi_Wang
5df1542c22 Change the login module
change the login module to fix the issue that the nav is being in page when we login harbor again

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-10 14:27:51 +08:00
Meina Zhou
46f78906f7 modify filter to show all the filters in once
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-10 11:15:40 +08:00
Wenkai Yin
7fcc391fed
Merge pull request #7322 from cd1989/update-with-props
Update only specific props in registry update
2019-04-10 09:44:51 +08:00
Wenkai Yin
2644c52926
Merge pull request #7302 from pureshine/registry-update
Fix replication ui related issues
2019-04-09 20:55:44 +08:00
Wenkai Yin
dba9822477
Merge pull request #7323 from zhoumeina/replication_ng
modify filter to show all the filters in once
2019-04-09 20:54:44 +08:00
cd1989
2ad8913e84 Update only specific props in registry update
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-09 19:57:21 +08:00
FangyuanCheng
e76c287a0c Fix replication ui related issues
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-09 17:44:42 +08:00
Wenkai Yin
5a65480594 Handle the policy from previous versions
Handle the policy from previous versions

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-09 17:43:07 +08:00
Meina Zhou
4dac7464cb modify filter to show all the filters in once
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-09 17:28:36 +08:00
Wenkai Yin
580674f3da Merge remote-tracking branch 'upstream/master' into 190409_sync 2019-04-09 17:01:09 +08:00
Wenkai Yin
9e5e723855 Add unit test cases for Harbor adapter
Add unit test cases for Harbor adapter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-09 13:04:04 +08:00
Wenkai Yin
855c0a2a6e
Merge pull request #7194 from stonezdj/remove_error_msg
Remove error message of saving system setting to db
2019-04-09 12:02:17 +08:00
Wenkai Yin
d72a53aa0c
Merge pull request #7318 from ywk253100/190408_upgrade
Upgrade the replication_job table
2019-04-08 22:43:40 +08:00
Wenkai Yin
4ffa0c3da0 Upgrade the replication_job table
This commit migrates the replication_job table, add one execution record and one task record for each job

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-08 22:23:53 +08:00
stonezdj
e8ab7156bc Remove error message of saving system setting to db
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-04-08 18:16:18 +08:00
Yogi_Wang
eec55f18eb Add OIDC onboard page redirect to Harbor url when we login from OIDC and add redirect page address when we login again after logout
1.when we are the first time we login harbor page when we login from OIDC  ,we add the url in onboard-add-username  page.
2.fix the part of issue that we cannot redirect to de origin page when we login

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-08 16:30:32 +08:00
Wenkai Yin
ee6eb41dae
Merge pull request #7303 from zhoumeina/replication_ng
fix frontend issues
2019-04-08 15:50:21 +08:00
Wenkai Yin
7ff46acd25
Merge pull request #7289 from cd1989/add-registry-ping
Add registry ping API
2019-04-08 14:08:53 +08:00
cd1989
5a2d03593f Add helth check method to registry adapter
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-08 10:03:28 +08:00
Wenkai Yin
462aab5a1e
Merge pull request #7307 from cd1989/registry-healthchecker
Wait randomly before registry health checking
2019-04-08 07:11:49 +08:00
cd1989
f71a110bec Add registry ping API
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-06 17:00:52 +08:00
cd1989
07139684ce Wait randomly before registry health checking
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-05 20:46:29 +08:00
Wenkai Yin
e8fe2aa60c Upgrade the registry and replication policy tables
Upgrade the registry and replication tables in database

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-05 13:25:00 +08:00
cd1989
fe004e1bfc Init replication in core
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-04 21:58:31 +08:00
cd1989
2450dacecb Use policy controller in registry deletion
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-04 21:26:27 +08:00
Wenkai Yin
4116433de8
Merge pull request #7306 from ywk253100/190404_cleanup
Remove the useless replication code
2019-04-04 21:18:04 +08:00
Wenkai Yin
c2f702be2a Remove the useless replication code
This commit removes the useless replication code

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 20:56:25 +08:00
Wenkai Yin
58a73de3e5
Merge pull request #7299 from ywk253100/190404_sync
Sync with master branch
2019-04-04 17:33:11 +08:00
Meina Zhou
0028dc0d62 fix frontend issues
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-04 17:08:59 +08:00
Wenkai Yin
dc35be09c4
Merge pull request #7301 from ywk253100/190404_agent
Filter the events triggerred by replication
2019-04-04 16:50:23 +08:00
Wenkai Yin
02dd4e500a Clear up the table before doing dao test
Clear up the table before doing dao test

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 16:46:16 +08:00
Wenkai Yin
1c735a7464 Filter the events triggerred by replication
Filter the events triggerred by replication pull

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 16:03:38 +08:00
jwangyangls
ca846ad031
Merge pull request #7297 from jwangyangls/fix_oidc_ui_save
Fix issue of oidc configuration save button is always disabled.
2019-04-04 15:56:06 +08:00
Wenkai Yin
b66b1f341e Merge remote-tracking branch 'upstream/master' into 190404_sync 2019-04-04 14:55:09 +08:00
Wenkai Yin
78fc2846bd Stop a replication execution
Implement the function to support to stop the replication execution

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 14:51:37 +08:00
Yogi_Wang
311af5d217 Fix issue of oidc configuration save button is always disabled and incorrect character
when we login Harbor width OIDC ,we cannot click the save  button of oidc config page

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-04 14:34:18 +08:00
jwangyangls
a27df46fb6
Merge pull request #7292 from jwangyangls/fix_login_robot_issue
Fix nightly test case failed when login harbor.
2019-04-04 12:14:43 +08:00
Yogi_Wang
4416e1810e fix login harbor issue with test case
Solve the problem that when we log on to the harbor page, the automation test will click on an incorrect button, which results in the test page being unable to log in.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-04 09:58:46 +08:00
Wenkai Yin
3ed8d87406
Merge pull request #7294 from pureshine/replication-ui
Fix cannot search for replication tasks
2019-04-04 09:52:04 +08:00
Wenkai Yin
48f02d0605
Merge pull request #7291 from cd1989/registry-with-empty-credential
Handle registry with empty credential
2019-04-03 21:35:32 +08:00
Yan
da0e20ec60
Add controller to onboard oidc user (#7286)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-03 20:47:22 +08:00
cd1989
e2c86f8f59 Handle registry with empty credential
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-03 20:33:26 +08:00
cd1989
8968e82675 Allow edit registry description
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-03 19:47:14 +08:00
Fangyuan Cheng
89b72906f4
Merge branch 'master' into move-scan/gc 2019-04-03 16:07:35 +08:00
Meina Zhou
6b3f2bbf74 modify frontend replication UI to apply api changes. use dest registry as object
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-03 15:45:42 +08:00
FangyuanCheng
8a1f3b7c00 Fix cannot search for replication tasks
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-03 15:38:18 +08:00
Wenkai Yin
0c171c642b
Merge pull request #7244 from wy65701436/oidc_user
add the dao funcs for OIDC onboard user
2019-04-03 15:23:05 +08:00
FangyuanCheng
82716d492d move vulnerability and gc ui
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-03 14:39:46 +08:00
jwangyangls
beeb8b53d7
Merge pull request #7281 from jwangyangls/oidc_step3_onboard_tpl
Add the OIDC onboard page
2019-04-03 14:11:25 +08:00
wang yan
dcf1d704e6 fix dao UT issue and refine the error of onboard OIDC user
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-03 14:05:18 +08:00
jwangyangls
cf391e74ad
Merge pull request #7267 from jwangyangls/oidc_step2_onboard
Add links to OIDC login
2019-04-03 13:18:18 +08:00
Yogi_Wang
3bf644012c Add the OIDC onboard page
When a user logs in to Harbor for the first time through OIDC, the user will enter an onboard page, prompting the user to add the user name of Harbor. After the user name is entered, click save, and the user successfully logs in to Harbor through OIDC.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-03 12:58:11 +08:00
Yogi_Wang
da3620816f Add links to OIDC login
In the login page ,we add button to jump to OIDC login page.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-03 12:33:18 +08:00
wang yan
41018041f7 remove oidc controller and add more UTs
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-03 09:54:21 +08:00
Yan
0de5999f52 add the controller for ocdi onboard user
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-03 09:52:22 +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
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
8d6299fed9
Merge pull request #7257 from reasonerjt/oidc-controllers-p2
Add callback controller for OIDC
2019-04-02 13:37:00 +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
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
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
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
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
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
FangyuanCheng
5dd200fa00 cron validator
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-28 13:25:25 +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
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
017bba8dc1 Merge remote-tracking branch 'upstream/master' into 190327_sync 2019-03-27 11:43:51 +08:00
Meina Zhou
d9bff2f269 add filter logic
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-26 17:09:23 +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
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
FangyuanCheng
dada47c07e Refactoring vulnerability ui support cron
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-23 20:58:45 +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
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
Wenkai Yin
39485efc9a
Merge pull request #7212 from ywk253100/190324_sync
Sync with master branch
2019-03-24 14:18:23 +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
Wenkai Yin
49cf50adb1 Merge remote-tracking branch 'upstream/master' into 190324_sync
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-22 15:55:52 +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
Yogi_Wang
3f9fd7010a movoHelmChart
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-22 15:52:13 +08:00
Wenkai Yin
c3b02dd104 Implement deletion for image transter
This commit implements the delete function for image transfer

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-22 15:44:35 +08:00
Qian Deng
ba4764c61d
Merge pull request #6755 from ninjadq/refactor_prepare
Refactor the prepare script
2019-03-22 14:54:30 +08:00
Wenkai Yin
1120368c9c Add support for replicating the delation of resource
This commit refines the replication flows and provides the support for replicating resource deletion

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-22 12:37:39 +08:00
FangyuanCheng
7b7cc5c0a3 fix bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-21 16:14:09 +08:00
Meina Zhou
80b8440564 fix unit test
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-21 14:58:47 +08:00
Meina Zhou
130e132f86 Merge branch 'master' into replication_ng
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-21 14:16:33 +08:00
Wenkai Yin
8e870de976
Merge pull request #7192 from heww/fix-users-api-pagination
Fix pagination for users and users search apis
2019-03-21 14:16:12 +08:00
He Weiwei
79235fffd1 Fix pagination for users and users search apis
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-03-21 13:03:30 +08:00
Meina Zhou
90c28198eb add validation message
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-21 12:24:35 +08:00
Mia ZHOU
204c139dbd
Merge pull request #7166 from ninjadq/oracle_ldap_support
Add membership item in LDAP config
2019-03-21 08:35:42 +08:00
Wenkai Yin
224f059993
Merge pull request #7183 from ywk253100/190320_filter
Update listing/getting replication adapter API
2019-03-20 18:50:18 +08:00
wang yan
25d1e69802 Remove unused files from vendor by dep v0.5.1
As for dep upgrade to v0.5.1, it removes all of unused files for vendor.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-03-20 18:27:26 +08:00
FangyuanCheng
03c9bf8ceb new endpoint
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-20 14:52:40 +08:00
Wenkai Yin
bb76a4d97d
Merge pull request #7178 from ywk253100/190315_chart
Replicate helm charts
2019-03-20 14:29:35 +08:00
Meina Zhou
242406ce47 modify create replication rule
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-20 13:51:47 +08:00
Wenkai Yin
f78fd54d96
Merge branch 'replication_ng' into registry-management 2019-03-20 11:50:04 +08:00
FangyuanCheng
839f68f5fc replication-ng
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-20 10:53:27 +08:00
Wenkai Yin
c65d5e6669 Update listing/getting replication adapter API
This commit updates the listing/getting replication adapter API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-20 05:30:15 +08:00
Wenkai Yin
fb394c2c7a Replicate helm charts
This commit provides the capability for Harbor to replicate helm charts

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-20 00:35:15 +08:00
Wenkai Yin
08c20c5ca5
Merge pull request #7170 from wy65701436/gc-untagged
Enable docker registry to clean untagged revisions
2019-03-19 18:01:30 +08:00
Daniel Jiang
a73b499988 Expose HTTP auth proxy infor in systeminfo API (#7164)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-03-19 15:54:40 +08:00
wang yan
44c290c0ed Enable docker registry to clean untagged revisions
As registry v2.7.1 has introduced the possibility to clean untagged manifests,
enable it in the registryctl api.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-03-19 15:13:00 +08:00
Yogi_Wang
c84d55f1f8 fix 6951 user permission is project Admin the user list donot show when user input
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-19 13:42:36 +08:00
Qian Deng
ea6989847f Add membership item in LDAP config
Add a item ldap_membership to LDAP config

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-19 10:45:43 +08:00
Wenkai Yin
79217e2485
Merge branch 'replication_ng' into replication_ng_execution_upgrade 2019-03-18 18:12:22 +08:00
jwangyangls
7ae7f9f23f
Merge pull request #7135 from jwangyangls/PromiseToObservable
change promise to observable
2019-03-18 13:11:04 +08:00
Yogi_Wang
b16711f4f7 change promise to observable
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-18 12:32:57 +08:00
peimingming
3f64a3b337 Execution updateStatus logic upgrade
Signed-off-by: peimingming <peimingming@corp.netease.com>
2019-03-15 16:21:39 +08:00
stonezdj(Daojun Zhang)
7060747d5b ldap_url and ldap_base_dn not exist in user config (#7115)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-03-15 15:20:12 +08:00
wang yan
73d68903d6 update robot account return attribute
Signed-off-by: wang yan <wangyan@vmware.com>
2019-03-14 13:57:50 +08:00
Wenkai Yin
cabef73980 Add Harbor adapter for replication
Implement the replication adapter for Harbor registry

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-13 21:39:39 +08:00
peimingming
4efad287ce Add execution and hooks
Signed-off-by: peimingming <peimingming@corp.netease.com>
2019-03-13 09:35:01 +08:00
Wenkai Yin
185525e9c8 Implement a default image registry client
Provide a default implemmentation for image registry interface, other adapters can use it directly

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-12 20:21:58 +08:00
Wenkai Yin
7ab21db26a Update the job ID in flow controller
Update the job ID for the task if it is scheduled successfully

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-12 15:42:16 +08:00
Wenkai Yin
772367498f Merge remote-tracking branch 'upstream/master' into 190311_sync 2019-03-11 20:34:49 +08:00
FangyuanCheng
e32a34048a Fix returning internal error when setting cron for gc
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-11 15:43:46 +08:00
Wenkai Yin
258b22a9a5 Fix bug in replication
This commit fixes bugs found in the implement of replciation NG

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-10 20:57:59 +08:00
Wenkai Yin
d1f4c20e64 Implement replication policy management API
This commit implements the replication policy management API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-09 01:32:51 +08:00
Wenkai Yin
272508e509 Provide a null implementation for Harbor adapter
This commit provides a null implementation for Harbor adapter to fill data for the listing adapter API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-09 01:10:25 +08:00
慕薇疯魔
1039800fa9 1. Migration for policy manager.
2. Clear test database after run test.
3. UT for policy manager and dao.

Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-03-11 16:01:31 +08:00
Frank Kung
5bd5d59a4f 1. Define ng persist replication policy model.
2. Add ng replication policy CURD methods.
3. Implement ng policy manger.

Signed-off-by: Frank Kung <kfanjian@gmail.com>
Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-03-11 11:13:10 +08:00
Qian Deng
5f80fe7b8a Refacotr the prepare script base on the proposal https://github.com/goharbor/community/pull/22
Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-08 16:46:13 +08:00
Wenkai Yin
0b08291a2f
Merge branch 'replication_ng' into 190227_adapter_interface 2019-03-08 13:01:39 +08:00
Wenkai Yin
6742e0ceda Refactor the adapter interface
This commit refactors the Adapter interface and adjust the code in the flow controller and repository handler

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-08 12:26:17 +08:00
Wenkai Yin
ec2a7f9239 Implement replication operation API
This commit implements the replication operation related APIs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-08 10:06:33 +08:00
jwangyangls
fc0654f028
Merge pull request #7088 from jwangyangls/proxyAuthenticator
add http auth proxy selection in system configuration
2019-03-07 17:26:59 +08:00
Fangyuan Cheng
41f443d3e3
Merge pull request #7083 from pureshine/support-cron
Refactoring gc ui support cron
2019-03-07 16:52:44 +08:00
Yogi_Wang
e281b6523e add http auth proxy selection in system configuration
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-07 16:52:17 +08:00
Wenkai Yin
db7a709aad
Merge pull request #7063 from heww/users-search
Add users search API
2019-03-07 15:58:26 +08:00
FangyuanCheng
0d242fc0ba Refactoring gc ui support cron
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-07 13:31:09 +08:00
stonezdj(Daojun Zhang)
f7745baf30
Merge pull request #6599 from stonezdj/pr6161
Add new parameter ldap_group_membership_attribute (PR#6161)
2019-03-07 13:26:26 +08:00
He Weiwei
20556aebd2 Add users search API
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-03-07 12:47:26 +08:00
Wenkai Yin
7f49151115 Implement replication adapter API
This commit implements the replication adapter API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-06 15:01:33 +08:00
Daniel Jiang
002094dbbb
Merge pull request #7075 from wy65701436/cron-str
update gc api to support raw cron string
2019-03-06 13:36:52 +08:00
Qian Deng
b68f09cf41 Fix: global search not work when chart enabled
Global search result data does not contain the chart info when chart is empty

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-06 10:37:41 +08:00
wang yan
e373167546 update gc api to support raw cron string
Signed-off-by: wang yan <wangyan@vmware.com>
2019-03-05 16:31:35 +08:00
De Chen
2bc2a44db8
Merge branch 'replication_ng' into registries-management 2019-03-05 16:22:34 +08:00
cd1989
b00098d492 Add unit tests and fix CI
Signed-off-by: cd1989 <chende@caicloud.io>
2019-03-05 15:37:36 +08:00
Wenkai Yin
937ee46ae0
Merge branch 'replication_ng' into replication_ng 2019-03-05 15:20:21 +08:00
stonezdj(Daojun Zhang)
dffb971366
Merge pull request #7055 from stonezdj/bug7038
Remove verify_remote_cert
2019-03-05 14:54:02 +08:00
cd1989
b851c3476a Use baseURL from config
Signed-off-by: cd1989 <chende@caicloud.io>
2019-03-05 14:30:06 +08:00
stonezdj
4dfee0c1f0 Remove verify_remote_cert
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-03-05 14:04:10 +08:00
Wenkai Yin
77688c90b9
Merge pull request #7061 from stonezdj/bug6767
Search local DB first when adding a project member with username
2019-03-05 12:56:19 +08:00
Mia ZHOU
76a07eb5fe
Merge pull request #7059 from ninjadq/fix_global_search_issue
Fix global search issue
2019-03-05 08:41:30 +08:00
Mia ZHOU
ccf6280365
Merge pull request #7066 from ninjadq/fix_charts_count_displayed_when_disable
Fix: Should not display helm chart counts if it's not enabled
2019-03-05 08:40:23 +08:00
Qian Deng
4ba012ab8e Fix: global search not work issue
Both Frontend and Backend should not send chart data when chartmusuem not enabled

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-04 17:44:34 +08:00
Qian Deng
b6fea75099 Fix: Should not display helm chart counts if it's not enabled
Should not display the counts of chart if it's not enabled

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-04 17:36:27 +08:00
Mia ZHOU
685e590514
Merge pull request #7062 from jwangyangls/userListPermission
fix get users list about permission issue
2019-03-04 16:46:09 +08:00
Yogi_Wang
1e17036b04 fix get user list about permission issue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-04 14:59:06 +08:00
stonezdj
3fdc0fd9ba Search local DB first when adding a project member with username
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-03-04 11:22:37 +08:00
stonezdj
cf134bc80e Add new parameter ldap_group_membership_attribute
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-03-03 10:03:22 +08:00
zhoulin xie
33b7c41f8b Fix some misspells in file
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-03-01 15:13:30 +08:00
Daniel Jiang
321874c815 Move Settings of HTTP auth proxy (#7047)
Previously the settings of HTTP authproxy were set in environment
variable.
This commit move them to the configuration API

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-03-01 14:11:14 +08:00
Fangyuan Cheng
f79895b6d8
Merge pull request #7034 from pureshine/robot-expiration
Implement Robot account expiration
2019-03-01 10:04:26 +08:00
jwangyangls
b3c4d1688d
Merge pull request #7011 from jwangyangls/fix_6950
fix 6950 about the default option is not displayed When we click the add-member button, the default option is not displayed.
2019-02-28 14:07:07 +08:00
He Weiwei
053a18a490 Skip transfer blob for foreign layers
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-02-27 16:14:17 +08:00
FangyuanCheng
a2cd2e50fc Implement Robot account expiration
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-27 14:16:07 +08:00
cd1989
8732a20709 Rewrite registry manager with new interface
Signed-off-by: cd1989 <chende@caicloud.io>
2019-02-27 11:54:04 +08:00
cd1989
6bdf3053a7 Implement registries manager
Signed-off-by: cd1989 <chende@caicloud.io>
2019-02-27 11:54:04 +08:00
Wenkai Yin
95888b3dc2
Merge branch 'replication_ng' into 190130_transfer_repo 2019-02-27 11:00:42 +08:00
Yuan Lei
253600ad39 sync from upstream and merge the conflic
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-02-27 10:52:03 +08:00
Wenkai Yin
79d34c6f80 Create dao folder in replication
This commit creates a new folder called dao under replication to hold dao codes

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-26 14:54:16 +08:00
Daniel Jiang
f69e4f9a4a
Merge pull request #7004 from wy65701436/robot-expiration-time
add expiration of robot account
2019-02-25 13:48:11 +08:00
Yogi_Wang
11d7989ee3 fix_6950
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-25 12:36:03 +08:00
wang yan
91aa67a541 Update expiration variable name to expiresat/tokenduration
Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-25 11:55:42 +08:00
zhoulin xie
b2ed619e1e Fix some misspells in code
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-02-24 01:43:53 +08:00
wang yan
36a778b482 Update expiration schema to bigint and default unit to minute
Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-22 18:42:43 +08:00
wang yan
47a09b5891 add expiration of robot account
This commit is to make the expiration of robot account configurable

1, The expiration could be set by system admin in the configuation page or
by /api/config with robot_token_expiration=60, the default value is 30 days.
2, The expiration could be shown in the robot account infor both on UI and API.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-22 18:42:34 +08:00
stonezdj(Daojun Zhang)
4cb49e5388
Merge pull request #6963 from stonezdj/remove_container
Remove everything of adminserver container
2019-02-22 18:27:43 +08:00
stonezdj
0cba36d79f Remove everything of adminserver
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-22 16:34:39 +08:00
Nguyen Quang Huy
eda6c47b3e add signoff for DCO gate (#6981)
Some variable name, function name is colliding with builtin function.

Signed-off-by: Nguyen Quang Huy <huynq0911@gmail.com>
2019-02-22 15:00:18 +08:00
Wenkai Yin
8894a27d2d Implement the operation controller
This commit implements the operation controller. The operation controller wraps the flow controller and execution manager to provide capabilities for the upper level

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-22 10:12:14 +08:00
Wenkai Yin
a3e4772fe9
Merge pull request #6983 from reasonerjt/new-bump-up-notary-migrate
Bump up the migrate tool of notary
2019-02-21 18:03:17 +08:00
Daniel Jiang
1832699e93 Bump up the migrate tool of notary
fixes #5863
The migrate binary that we include in notary is quite out dated.
Additionally it introduced a breaking change, more details see #5863

In this commit a go program was added to workaround this issue to ensure the
migration process works, and refined bootstrap scripts and make process accordingly.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-02-21 00:36:24 -08:00
Daniel Jiang
321adc8362
Merge pull request #6941 from ywk253100/190213_replication_policy
Fix #6698: cannot create a same name replication policy after deleting it
2019-02-21 16:03:55 +08:00
Wenkai Yin
e3a9264162 Refactor the Scheduler interface
This commit refactors the Scheduler interface and does the corresponding changes to the flow controller

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-21 15:34:57 +08:00
Wenkai Yin
0c0c833dda Merge remote-tracking branch 'upstream/master' into 190220_sync 2019-02-20 17:21:38 +08:00
jwangyangls
c8c0ee623d
Merge pull request #6954 from jwangyangls/skipped_tests_fix
fix_skipped_tests
2019-02-20 10:13:18 +08:00
Yogi_Wang
60aecf2a1a fix_skipped_tests
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-19 09:43:23 +08:00
stonezdj
7a5fbf718f Revise code with review comments
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 15:20:54 +08:00
stonezdj
880051c08a Add load for user settings in core/config/config.go
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
stonezdj
36e1c13a43 fix ut error in systeminfo_test.go
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
stonezdj
1ae5126bb4 Refactor adminserver stage 3: replace config api and change ut settings
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
Yuan Lei
7108b5c58c update scheduler interface to follow the new standard
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-02-18 11:40:58 +08:00
Wenkai Yin
f0f2e77fb4 Implement the repository transfer
This commit implements the Transfer interface for resource repository

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-15 17:49:35 +08:00
Yogi_Wang
4ee5ebe442 skipped_tests_fix
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-15 16:52:34 +08:00
jwangyangls
d28b8355ef
Merge pull request #6930 from jwangyangls/issue-6923
fix issue 2923
2019-02-15 15:53:51 +08:00
Wenkai Yin
530ba1d27b Fix #6698
This commit fixes the issue #6698: cannot create a same name replication policy after deleting it

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-15 15:17:48 +08:00
jwangyangls
0891300d21
Merge pull request #6927 from jwangyangls/harbor_style_change
change_style and datagrid refresh interface change
2019-02-15 15:04:52 +08:00
Wenkai Yin
4ceaf3e6c9 Merge remote-tracking branch 'upstream/master' into 190215_syncmaster 2019-02-15 14:15:00 +08:00
Yogi_Wang
a9db2ab943 fix issue 2923
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-15 10:23:53 +08:00
Yogi_Wang
651a142429 change_style_unitTest
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-14 16:38:05 +08:00
Meina Zhou
0d239cb1cb move gc to lib and add in registry config
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-02-14 13:45:15 +08:00
Wenkai Yin
e12da7264a Implement the replication flow controller
1. Implement the replication flow controller
2. Implement the registry adapter management
3. Define the interface for PolicyManager, RegistryManager, ExecutionManager, TaskManager and Scheduler

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-14 11:34:12 +08:00
Yogi_Wang
06eaa304da fixed_ciIssue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-14 10:21:18 +08:00
Fangyuan Cheng
6d782e0fe4
Merge pull request #6902 from pureshine/cert-link
Download the certificate link by default on ui
2019-02-13 21:24:12 +08:00
Daniel Jiang
81639e2110
Merge pull request #6865 from wy65701436/remove-token
Remove the token attribute from robot table
2019-02-13 19:23:06 +08:00
Fangyuan Cheng
04c76d7f09 Modify the ui name and token that cannot be displayed due to backend api changes (#6914)
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-13 18:57:49 +08:00
Yuan Lei
bd84f5f490 sperate the logics to two part: 1,tasks generating. 2,tasks submit
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-02-13 17:47:07 +08:00
FangyuanCheng
54f74ff91d Download the certificate link by default on ui
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-13 15:16:45 +08:00
Yan
e9556a4cec
Add post response for robot account API (#6906)
This commit is to do:
1, Add post response on creating robot account
2, Lower-case the attribute of response

Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-13 14:40:04 +08:00
SDBrett
90529832a2 Additional unit tests for base.go (#6888)
Increased coverage for http functions in base.go.

Signed-off-by: Brett Johnson <brett@sdbrett.com>
2019-02-12 16:06:20 +08:00
Yuan Lei
956a4c4f05 scheduler module to schedule the transfer job of resouce
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-02-11 16:49:25 +08:00
jwangyangls
a95586034e
Merge pull request #6885 from jwangyangls/privilege_escalation
PermissionMasterRoleWithIsue
2019-02-01 21:17:48 +08:00
He Weiwei
f7218f80e0
Merge pull request #6852 from heww/protect-api-using-rbac
Protect API using rbac
2019-02-01 21:11:26 +08:00
Yogi_Wang
1b80e79ec4 fixPermissionIssue
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-02-01 20:48:38 +08:00
He Weiwei
1c4b9aa346 Protect API using rbac
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-02-01 18:55:06 +08:00
System Administrator
1a551690d3 promission reset
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-31 18:06:49 +08:00
wang yan
5d6a28d73e Remove the token attribute for robot table
This commit is to remove the token attribute as harbor doesn't store the token in DB.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-30 23:56:23 +08:00
FangyuanCheng
dacc0bd6bc Fixed display problems caused by formatting
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-30 10:29:49 +08:00
Fangyuan Cheng
829bfe031e
Merge pull request #6823 from pureshine/robot-account
Support Robot account in Harbor
2019-01-29 18:36:26 +08:00
wang yan
f4f4535304 Fix action and resouce of RBAC change
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-29 17:05:15 +08:00
Daniel Jiang
bf663df0e7
Merge pull request #6820 from wy65701436/robot-service
Add robot account authn & authz implementation
2019-01-29 16:08:25 +08:00
FangyuanCheng
404ee307f3 Support Robot account in Harbor
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-29 15:49:15 +08:00
Wenkai Yin
759cb5467b Refine the replication job
1. Refine the replication job
2. Define the Transfer interface
3. Define the common models

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-01-29 15:48:02 +08:00
Wenkai Yin
daf81e2413
Merge pull request #6841 from heww/standard-rbac-actions
Standard actions for rbac
2019-01-29 13:49:41 +08:00
He Weiwei
6e95b98108 Standard actions for rbac
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-29 11:59:11 +08:00
Mia ZHOU
f202e5f738
Merge pull request #6827 from pureshine/tag-col
The tag column sets the Maximum  width
2019-01-29 11:09:56 +08:00
He Weiwei
1da0a66fe5
Merge pull request #6781 from heww/user-permissions-api
Implement api for get current user permissions
2019-01-29 01:58:51 +08:00
He Weiwei
0ab7c93e16 Replace casbin builtin keyMatch2 with custom match func
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-29 01:26:38 +08:00
wang yan
2d7ea9c383 update codes per review comments
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-28 21:26:06 +08:00
He Weiwei
8b5e68073d Implement api for get current user permissions
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-28 18:06:52 +08:00
Yan
71f37fb820 * Add robot account authn & authz implementation.
This commit is to add the jwt token service, and do the authn & authz for robot account.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-28 17:39:57 +08:00
Daniel Jiang
20db0e737b Provide HTTP authenticator
An HTTP authenticator verifies the credentials by sending a POST request
to an HTTP endpoint.  After successful authentication he will be
onboarded to Harbor's local DB and assigned a role in a project.

This commit provides the initial implementation.
Currently one limitation is that we don't have clear definition about
how we would "search" a user via this HTTP authenticator, a flag for
"alway onboard" is provided to skip the search, otherwise, a user has
to login first before he can be assigned a role in Harbor.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-01-28 15:43:44 +08:00
FangyuanCheng
fe5820efee The tag column sets the minimum width
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-27 23:47:41 +08:00
Yogi_Wang
ebda1cda22 style_change
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-25 13:36:48 +08:00
He Weiwei
3f8e06a8bc Support master role for project member create and update apis (#6780)
* Support master role for project member create and update apis

Signed-off-by: He Weiwei <hweiwei@vmware.com>

* Fix description for role_id in swagger.yaml

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-23 14:56:23 +08:00
He Weiwei
ae061482ae Add Can method to securty.Context interface (#6779)
* Add Can method to securty.Context interface

Signed-off-by: He Weiwei <hweiwei@vmware.com>

* Improve mockSecurityContext Can method

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-23 14:32:37 +08:00
Mia ZHOU
1ca9fb59b5
Merge pull request #6770 from ninjadq/fix_issue_global_search_cannot_reload_data
Fix: data not reload when global serach navigate to same location
2019-01-18 14:30:36 +08:00
Qian Deng
276202cfa9 Fix issue data not reload when global serach going to a location that has the same url
Just add a reload option on router module. This feature is introduced in angular5, we can solve this issue easily.

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-01-18 13:34:32 +08:00
wang yan
903e15235e Update validation and error message per comments 2019-01-17 15:33:05 +08:00
wang yan
4cde11892a update the conflict check with DB unique constrain error message
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-17 13:13:55 +08:00
Yan
1af0f3c3b9 Add API implementation of robot account
Add API implementation of robot account

1. POST /api/project/pid/robots
2, GET /api/project/pid/robots/id?
3, PUT /api/project/pid/robots/id
4, DELETE /api/project/pid/robots/id

Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-17 13:13:55 +08:00
He Weiwei
8dab10bbed
Merge pull request #6765 from heww/rename-ram
Rename ram to rbac
2019-01-17 11:50:14 +08:00
He Weiwei
bacfe64979 Rename ram to rbac
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-16 18:20:30 +08:00
Wenkai Yin
f8d9653419
Merge pull request #6737 from ywk253100/190109_health_check
Implement the unified health check API
2019-01-16 18:14:14 +08:00
He Weiwei
76bee7a9fc
Merge pull request #6710 from heww/security-by-ram
Implement current security interfaces using ram
2019-01-16 17:47:13 +08:00
Wenkai Yin
be4455ec1b Implement the unified health check API
The commit implements an unified health check API for all Harbor services

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-01-16 17:21:04 +08:00
He Weiwei
ebd26c0105 Implement current security interfaces using ram
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-16 16:08:17 +08:00
Steven Zou
464bdf71cd
Merge pull request #6727 from wy65701436/robot-dao
Add dao of robot account
2019-01-14 19:34:23 +08:00
wang yan
d349c256e8 add support for query nil
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-11 16:19:42 +08:00
Daniel Jiang
a1d4bfd332
Merge pull request #6344 from reasonerjt/bump-up-golang
Bump up golang to 1.11.2
2019-01-11 16:15:59 +08:00
Daniel Jiang
5d59d6fab8 Bump up golang to 1.11.2
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-01-11 14:44:32 +08:00
wang yan
6bd6fbd4ad Add fuzzy match and delete funt per review comments
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-11 14:26:49 +08:00
System Administrator
27c180bf20 fix_bug
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-11 11:00:46 +08:00
wang yan
c6ae1388ec Add dao of robot account
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-10 14:51:33 +08:00
Daniel Jiang
80af81154c
Merge pull request #6702 from wy65701436/robot-db-scheme
Add DB table for robot account
2019-01-10 14:25:58 +08:00
wang yan
db09f9f101 Update token length and upper case the sql key words
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-09 10:00:54 +08:00
wang yan
362a0638d0 Add DB table for robot account
This commit is to add DB scheme for robot account and update the db orm releated.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-08 18:46:16 +08:00
Daniel Jiang
b5788f0695
Merge pull request #6671 from heww/ram
Add ram pkg
2019-01-08 15:39:36 +08:00
Mia ZHOU
45685b49d6
Merge pull request #6708 from zhoumeina/cherry_pick_disable_retag
disable retag function if with admiral
2019-01-08 15:04:10 +08:00
Meina Zhou
b7153798b5 disable retag function if with admiral
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-01-08 13:49:54 +08:00
Yogi_Wang
10d74eabd7 upgrade clarity components to 1.0 and fix issue
Signed-off-by: Yogi_Wang <Yogiwang@Yogi-WangdeMacBook-Pro.local>
2019-01-08 12:50:26 +08:00
Wenkai Yin
f9c1a528cb
Merge pull request #6689 from jkroepke/patch-1
Remove user agent check for docker notifications
2019-01-04 18:23:09 +08:00
He Weiwei
79f786ecbe Add ram pkg
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-04 13:17:13 +08:00
Fangyuan Cheng
5967537daa
Merge pull request #6609 from pureshine/devcenter-btn
Modify the location to open the Developer Center
2019-01-04 11:24:02 +08:00
Jan-Otto Kröpke
8b65e4f424
Remove user agent check for docker notifications
Fixes #5729

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
2019-01-03 21:17:29 +01:00
Wenkai Yin
75d45ebd9d
Merge pull request #6547 from cd1989/retag-input-validation
Validate repo and tag names in retag
2019-01-03 17:45:44 +08:00
FangyuanCheng
7a22f895ab Modify the location to open the Developer Center
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-03 14:57:26 +08:00
Yogi_Wang
aee07fff96 upgrade clarity components to 1.0
Signed-off-by: Yogi_Wang <Yogiwang@Yogi-WangdeMacBook-Pro.local>
2019-01-03 10:32:52 +08:00
Mia ZHOU
4f291e34eb
Merge pull request #6630 from pureshine/refactor-config
Config component nav tabs to use clarity component
2018-12-26 12:18:54 +08:00
Fangyuan Cheng
1456d1d326
Merge pull request #6628 from zhoumeina/add_swagger_title
add harbor swagger title for api explorer
2018-12-26 10:37:57 +08:00
Meina Zhou
92539a4bec add harbor swagger title for api explorer
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-26 09:41:54 +08:00
FangyuanCheng
4ad66b6d9b Config component nav tabs to use clarity component
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-25 18:36:18 +08:00
FangyuanCheng
a4e17ec183 When harbor is deployed in http mode, the registry certificate download button is not displayed in the project page.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-25 14:31:29 +08:00
cd1989
c117a23133 Validate repo and tag names in retag
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-24 16:49:39 +08:00
FangyuanCheng
256289810d Fix download certificate link bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-24 00:06:04 +08:00
Daniel Jiang
93c0a18b06
Merge pull request #6537 from stonezdj/ref_admin_driver
Refactor config settings stage2
2018-12-21 15:12:56 +08:00
stonezdj
2446878f6b Refactor config settings stage2
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-12-21 10:59:11 +08:00
He Weiwei
f403e50234
Merge pull request #6577 from heww/master
Include os version in image tag detail page
2018-12-20 18:18:44 +08:00
Qian Deng
c4ecd4e0f6 Fix i18n switch issue (#6579)
This issue is caused by error formated json file

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-12-20 15:52:59 +08:00
He Weiwei
e7f09643bd Include os version in image tag detail page
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2018-12-20 15:12:19 +08:00
Qian Deng
1430a24b55 Update i18n files of project_detail
Add `helmchart` item in `project_detail` entry

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-12-20 10:09:26 +08:00
Meina Zhou
66c1beb467 fix retag project list can not select
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-19 14:39:49 +08:00
Mia ZHOU
ac47500eb6
Merge pull request #6552 from pureshine/inline-css
Move inline css style to scss
2018-12-19 13:40:16 +08:00
Mia ZHOU
2062c436d3
Merge pull request #6553 from zhoumeina/fix_retag_ui
show retag tooltip use regex, reset the dialog form when retagged
2018-12-19 13:32:07 +08:00
Meina Zhou
a3e357bb7f show retag tooltip use regex, reset the dialog form when retagged
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-19 13:07:46 +08:00
Fangyuan Cheng
bb15f67316
Merge branch 'master' into inline-css 2018-12-19 10:07:21 +08:00
FangyuanCheng
c36e9daea1 Move inline css style to scss
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-18 21:19:08 +08:00
Wenkai Yin
b28bca7af4
Merge pull request #6541 from salkin/proxy-transport
Add support for http proxy in transport
2018-12-18 15:46:29 +08:00
Niklas Wik
138bc69f0f Add support for http proxy in transport
Signed-off-by: Niklas Wik <niklas.wik@nokia.com>
2018-12-17 10:35:27 +02:00
Mia ZHOU
da0f1d2831
Merge pull request #6525 from zhoumeina/dev-center1
add developer center in swagger ui way
2018-12-13 16:27:55 +08:00
Meina Zhou
d45ccbbb29 add developer center in swagger ui way
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-13 15:17:38 +08:00
SDBrett
0e260d180c Added tests for failure conditions (#6501)
Added unit tests for registryctl auth to cover failure conditions to increase test coverage.
New tests cover no secret specified and incorrect harbor secret prefix

Signed-off-by: Brett Johnson <brett@sdbrett.com>
2018-12-13 11:35:17 +08:00
stonezdj(Daojun Zhang)
13511d74ed Refactor config settings encrypt + metadata (#6387)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-12-12 12:14:33 +08:00
Wenkai Yin
f7a28ee2a2 Remove the duplicate http error struct (#6516)
There are two different types to represent http error in the current code. This commit updates the codes to keep only one.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-12 11:51:19 +08:00
Wenkai Yin
5388eb4db6 Read ssl mode param from the adminserver to init the connection with database (#6504)
This commit adds the ssl mode as a param when establishing the connection with database

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-11 13:58:37 +08:00
Fangyuan Cheng
7f4dac2101
Merge pull request #6497 from pureshine/error-message
Modify the error message when deleting a signed images in harbor-helm
2018-12-11 11:29:47 +08:00
Mia ZHOU
e9a34224e4
Merge pull request #6499 from cd1989/retag-button-for-guest
Enable retag button to project guest
2018-12-11 10:55:50 +08:00
Mia ZHOU
53858fe2f1
Merge pull request #6482 from pureshine/default-version
Return unknow when about dialog cannot get harbor version
2018-12-11 10:30:40 +08:00
Mia ZHOU
4fc0716005
Merge pull request #6500 from pureshine/svg-format
Change the image in png format to the image in svg format
2018-12-11 10:24:04 +08:00
cd1989
fdddb37545 Enable retag button to project guest
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-10 15:46:48 +08:00
FangyuanCheng
892a76c27e Modify the error message when deleting a signed images in harbor-helm
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-10 14:39:04 +08:00
FangyuanCheng
cce22d569d Return unknow when about dialog cannot get harbor version
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-10 13:20:20 +08:00
FangyuanCheng
13686cbe83 Change the image in png format to the image in svg format
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-07 13:54:13 +08:00
Meina Zhou
073cacd9b3 fix helm chart did not get global label
The root cause is helm chart does not get glboal labels

Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-07 12:33:25 +08:00
Mia ZHOU
f2a9e8ae9b
Merge pull request #6472 from pureshine/filter-tag
Remove the default label when filtering images by label
2018-12-07 08:24:43 +08:00
Wenkai Yin
bcd6947fcc
Merge pull request #6470 from cd1989/retag-problem
Give meaningful error messages when retag is forbidden
2018-12-06 18:47:58 +08:00