Commit Graph

2036 Commits

Author SHA1 Message Date
Meina Zhou
5db765ea10 #6440 fix gc will have 500 error when user try to put a new schedule
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-06 12:43:24 +08:00
Daniel Jiang
29d5b5da72 Return 409 when there is a scan all job running (#6460)
* Return 409 when user trigger another "scan all"

This commit fixes #6418, that when multiple "scan all" jobs are
triggered, the API should not return 500.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>

* Update swagger to add 409 to scanAll API

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-12-06 11:46:38 +08:00
FangyuanCheng
b866344310 Modify the error message when adding members
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-05 19:37:01 +08:00
FangyuanCheng
f09002a26c Time display using 24-hour system
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-05 18:26:23 +08:00
Meina Zhou
87cf6527c7 fix #6421 javascript error when user input nothing in the filter logs
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-05 18:16:24 +08:00
Wenkai Yin
538082ceb6 Remove the permission checking for getcert API (#6436)
The Harbor root cert can be downloaded by all users now, so the permission checking is not needed anymore

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-05 12:15:23 +08:00
FangyuanCheng
2e0fcab6ee Don't get the next available time while scan now
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-04 16:44:31 +08:00
peimingming
585d7b2b01 Add unit test for JobService Logger
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-12-03 16:20:03 +08:00
Daniel Jiang
ae240df031 Remove the Scan all in-memory marker (#6399)
Previously there was a in-memory marker to prevent user from frequently
calling the "scan all" API.  This has become problematic in HA
deployment, and is no longer needed after enhancement in jobservice.

This commit removes the marker for "scan all" api, however, we need to
review the mechanism and rework to make it stateless.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-12-02 15:40:50 +08:00
Steven Zou
9c76c375ac
Merge pull request #6396 from steven-zou/unique_job
Support unique job constraints (both unique queue and running jobs)
2018-11-30 17:03:43 +08:00
Qian Deng
1de52e28ae
Merge pull request #6398 from ninjadq/fix_i18n_of_delete_project_failure_msg
Fix: i18n issues of deleting project failure info
2018-11-30 16:44:11 +08:00
Mia ZHOU
a90fb5219c
Merge pull request #6394 from ninjadq/fix_robot_cases_for_global_search
Fix xpath in go to project robot case
2018-11-30 16:43:55 +08:00
Mia ZHOU
42fe0ec30a
Merge pull request #6397 from ninjadq/fix_helm_chart_api_in_ui
Fix: helmchart api change caused problems
2018-11-30 16:43:19 +08:00
Wenkai Yin
a81346a4ba
Merge pull request #6386 from heww/session
change session cookie name to sid
2018-11-30 16:13:45 +08:00
Steven Zou
84d864607c Add UT cases for new added code
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-30 16:08:15 +08:00
Qian Deng
9020cd6cd2 Fix: i18n issues of deleting project failure info
Fix i18n issues that may confuse people

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-30 15:40:26 +08:00
Qian Deng
9dd509e0eb Fix xpath in go to project robot case
Global search bug fix introduced test case failure, fix it by edit xpath

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-30 15:33:14 +08:00
Qian Deng
2a583fccfe Fix: helmchart api change caused problems
Adapter ui to new backend API

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-30 15:28:28 +08:00
Steven Zou
ec2ad4d0b8
Merge pull request #6093 from cd1989/replication-record-id
Add op uuid to image replication
2018-11-30 14:54:43 +08:00
Mia ZHOU
b3d0d64ebd
Merge pull request #6392 from pureshine/nav-logo
Add harbor logo to navigation bar
2018-11-30 14:42:55 +08:00
Steven Zou
ccd486a0ad Support unique job constraints (both unique queue and running jobs)
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-30 14:14:21 +08:00
Wenkai Yin
9d5cf57373 Check the existence of name when creating replication rule and fix bugs in testing library (#6381)
1. Fix #5102 by checking the existence of name when creating/editing replication rule
2. Add unique constraint to the name of replication policy and target
3. Fix bugs of testing library

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-11-30 13:32:20 +08:00
FangyuanCheng
566fc5de02 Add harbor logo to navigation bar
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-29 23:18:26 +08:00
stonezdj
3b165d41d4 Fix LDAP search error
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-11-29 18:37:23 +08:00
Steven Zou
68b1b98f0a
Merge pull request #6375 from steven-zou/fix_global_search_502_issue
Fix global search 502 issue happened when chart repo is not enabled
2018-11-29 16:29:08 +08:00
Daniel Jiang
a3f424f5f3
Merge pull request #6378 from cd1989/retag-status-code-fix
Fix status code for permission check in retag, use 403
2018-11-29 16:00:34 +08:00
Steven Zou
d82482499b
Merge pull request #6371 from mmpei/6144-JSLoggerInDB
6144 js logger in db
2018-11-29 15:58:20 +08:00
Steven Zou
e7ffaecca5 Fix global search 502 issue happened when chart repo is not enabled
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-29 15:53:09 +08:00
He Weiwei
00a3948fff change session cookie name to sid
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2018-11-29 15:18:15 +08:00
Wenkai Yin
3ff4402a35
Merge pull request #6379 from steven-zou/add_retry_to_connect_redis
Add retry with backoff when creating redis cache for chart server
2018-11-29 13:52:43 +08:00
Mia ZHOU
3c000f10a0
Merge pull request #6338 from ninjadq/fix_chart_ui_related_issues
Fix chart ui related issues
2018-11-29 10:11:44 +08:00
Steven Zou
5ccfa9f8ad Add retry with backoff when creating redis cache for chart server
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-28 22:23:03 +08:00
陈德
f72c7766ae Fix status code for permission check in retag, use 403
Signed-off-by: 陈德 <chende@caicloud.io>
2018-11-28 19:48:25 +08:00
peimingming
238dbc0347 Add UT and review comments and issue fix (#6144)
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-11-28 17:43:14 +08:00
Steven Zou
b895fda13a Fix the malformat json data of chart list API
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-28 17:07:17 +08:00
peimingming
c67fdc40f5 Support store job log in DB (#6144)
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-11-28 15:09:29 +08:00
Qian Deng
59b47ba29b Enhance: the header of add label component will passed by parant
Make the header word of label to be a input argument.

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-27 14:45:08 +08:00
Mia ZHOU
f78660ff84
Merge pull request #6356 from pureshine/fix-iconbug
Fix the bug that markdown icon does not display on the page
2018-11-27 11:27:29 +08:00
FangyuanCheng
f39cd17003 Fix the bug that markdown icon does not display on the page
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-27 10:16:14 +08:00
Daniel Jiang
ca79a98f17 Add dependencies to Gopkg.toml (#6343)
During the legal process for 1.7.0 I found some dependencies are not tracked in
Gopkg.toml.
This commit explicitly add depedencies on these packages.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-11-27 09:27:12 +08:00
Qian Deng
d484025fa1 Fix: helm chart results style
1. Do not show chart results if chart is not enabled
2. Fix style in scroll of results page

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-23 17:38:51 +08:00
Qian Deng
259b984755 Fix: change label style in helm chart summary page
1. Add label style
2. Fix style

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-23 16:36:03 +08:00
Qian Deng
213dd39b5b Fix: strange string in cmd input in the chart summary
Should using backquotes instead of doublequotes to string that need interpreted.

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-23 16:28:51 +08:00
Qian Deng
31f45ae908 Fix: i18n issue in add label filter header in chart version
In chart version view, wrong description appeared in add label button's header

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-23 16:07:04 +08:00
Qian Deng
405565b744 Enhance: Add helm chart count number in the project list
Project API return the helm chart count now, so put it to UI.

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-12 15:47:51 +08:00
Qian Deng
6a3fe60d55
Merge pull request #6246 from zhoumeina/refactor_registry_for_admiral
Refactor registry for admiral
2018-11-09 13:48:43 +08:00
Meina Zhou
6bcc803588 modify registry component using tabs
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-09 12:58:26 +08:00
Wenkai Yin
32c42be677
Merge pull request #6241 from steven-zou/logger_framework_job_service
Uncomment the harbor configuration injection code block
2018-11-09 10:41:52 +08:00
Steven Zou
01bb7f4abb Uncomment the harbor configuration injection code block
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-09 10:19:14 +08:00
Steven Zou
8f0e8d083a Fix typo in the README doc of jobservice
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-08 18:24:41 +08:00
Steven Zou
b3c87673a6
Merge pull request #6215 from steven-zou/logger_framework_job_service
Build logger framework to support configurable loggers/sweepers/getters
2018-11-08 18:15:36 +08:00
Steven Zou
093bf9fc8a Update the job service config yaml in the installation template
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-08 10:40:39 +08:00
Steven Zou
e6d4c024ee Update README of job service to reflect latest updates
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-08 10:35:12 +08:00
Mia ZHOU
db3088ae4d
Merge pull request #6218 from zhoumeina/upgrade_package_version
upgrade package version to rc6
2018-11-07 12:46:40 +08:00
James Zabala
ae1196ec8a
Merge pull request #6229 from ninjadq/change_title_wording
Fix:Vmware is appeared in ihe title of loading page
2018-11-06 08:55:48 -05:00
Daniel Jiang
abe728325b Wait for manifest in notification handler
There's an issue in registry 2.6.x, that when the webhook is sent the
manifest of the image may not be written.
For details: https://github.com/docker/distribution/issues/2625

This will cause issue in "scan on push" or replication.
This commit mitigates the issue by adding retries in notification
handler.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-11-06 19:23:54 +08:00
Qian Deng
5210aecc76 Fix:Vmware is appeared in ihe title of loading page
Should change it to Harbor

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-06 19:00:46 +08:00
Steven Zou
e9194ca107 Add/update unit test cases for the new implemented job logger framework
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-06 14:43:06 +08:00
Qian Deng
35f3346948
Merge pull request #6155 from mmpei/6086-UserNameLength
Support longer UserName
2018-11-06 10:50:50 +08:00
Meina Zhou
5143943ced upgrade package version to rc6
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-06 10:23:08 +08:00
Steven Zou
7b106d06c5 Build logger framework to support configurable loggers/sweepers/getters
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-06 09:31:31 +08:00
Meina Zhou
f594c44045 refactor system settings and fixed bug of system settings
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-06 08:43:34 +08:00
Daniel Jiang
163fc11b7f
Merge pull request #6198 from ywk253100/181101_replication
Pass internal core URL as source in replication
2018-11-02 12:29:53 +08:00
Mia ZHOU
a20d49359b
Merge pull request #6195 from pureshine/labels-btn
Ordinary user login is forbidden to add labels in images.
2018-11-02 10:03:10 +08:00
FangyuanCheng
7430ae7426 Ordinary user login is forbidden to add labels in images.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-01 18:15:38 +08:00
Wenkai Yin
88aa413fe6 Pass internal core URL as source in replication
Currently, we pass the external URL as the source registry and set insecure as true in replication, this causes security issue. This commit replaces the URL with the internal one and set insecure to false. Fixes #6109.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-11-01 17:13:38 +08:00
Mia ZHOU
4894d1f46f
Merge pull request #6190 from zhoumeina/fix_nightly
fix nightly test
2018-11-01 15:16:26 +08:00
Meina Zhou
0ba9856c66 fix nightly test
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-01 14:07:55 +08:00
Qian Deng
e19616a99d
Merge pull request #6192 from ninjadq/fix_session_expire_issue
Fix: When session expire can not click anything
2018-11-01 13:59:49 +08:00
FangyuanCheng
74046cb5e1 Let the retag error prompt show complete
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-01 13:13:22 +08:00
Qian Deng
558638f912 Fix: When session expire can not click anything
This is casued that not handle 401 err on member routing guard

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-01 13:12:48 +08:00
Steven Zou
e37e275a77
Merge pull request #6183 from steven-zou/use_separate_conn
Use separate redis conn for the lock mechanism in the periodic enqueuer
2018-10-31 15:55:18 +08:00
Steven Zou
300977d539 Use separate redis conn for the lock mechanism in the periodic enqueuer
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-31 15:19:11 +08:00
Qian Deng
d517320c78
Merge pull request #6182 from zhoumeina/remove_switch_tab_confirm
remove switch tab confirmation
2018-10-31 15:15:41 +08:00
Meina Zhou
7991387eb8 remove switch tab confirmation
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-31 14:46:49 +08:00
Steven Zou
646cf282ba
Merge pull request #6181 from steven-zou/add_test_on_borrow_func
Add TestOnBorrow check func of redis pool to verify the getting conn
2018-10-31 14:10:33 +08:00
Mia ZHOU
1287b0d1b1
Merge pull request #6173 from zhoumeina/refactor_config
refactor configuration
2018-10-31 14:02:59 +08:00
Steven Zou
58eefb9c17 Add TestOnBorrow check func of redis pool to verify the getting conn
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-31 13:30:29 +08:00
Steven Zou
b48748492e Fix the issue of stopping periodic job (#6174)
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-31 11:43:46 +08:00
Wenkai Yin
5d585c7c65
Merge pull request #6176 from steven-zou/support_health_check_js
Support health check free call in job service
2018-10-31 09:42:42 +08:00
Mia ZHOU
c530f65ba9
Merge pull request #6170 from cd1989/portal-retag-permission
Allow retag in portal only for developer or above role
2018-10-31 09:40:47 +08:00
Steven Zou
8341aa14b0 Support health check free call in job service
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-30 17:35:07 +08:00
FangyuanCheng
f55666d593 Let the repository description support the markdown format.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-30 17:17:24 +08:00
Meina Zhou
e3e15dbc65 refactor configuration
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-30 15:45:04 +08:00
Fangyuan Cheng
e7e2312e16
Merge pull request #6160 from pureshine/datepicker
Change Datapicker on replication to clarity widget
2018-10-30 10:58:18 +08:00
FangyuanCheng
ae71673cf0 Change Datapicker on replication to clarity widget
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-30 10:14:13 +08:00
陈德
4bf5962e35 Allow retag in portal only for developer or above role
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-29 19:43:43 +08:00
Steven Zou
1b1ab60802
Merge pull request #6152 from mmpei/5178-jibSupporting
5178 jib supporting
2018-10-29 16:34:13 +08:00
Wenkai Yin
af17c2c3fd
Merge pull request #6154 from wy65701436/fix-gc-redis
Fix gc jobs issues
2018-10-29 16:29:57 +08:00
Steven Zou
dde6c39e80
Merge pull request #6169 from steven-zou/fix_issue_of_periodic_conflicts
Return 409 conflict error in liue of 200 with ID of existing one
2018-10-29 16:18:40 +08:00
peimingming
59f777d82c Adjust length of UserName to 255
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-10-29 16:03:43 +08:00
peimingming
d3a617efd6 Support longer UserName
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-10-29 15:59:17 +08:00
Daniel Jiang
4dc89f57f2
Merge pull request #6167 from steven-zou/fix_issue_of_duplicated_schedule
Fix the issue of duplicated periodic job scheduling
2018-10-29 15:56:03 +08:00
Steven Zou
408b751ae6 Return 409 conflict error in liue of 200 with ID of existing one when submmiting periodic job
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-29 15:40:31 +08:00
wang yan
903d3906ab Fix per comments by wk
Signed-off-by: wang yan <wangyan@vmware.com>
2018-10-29 15:29:14 +08:00
Steven Zou
d32e51052e Fix the issue of duplicated periodic job scheduling
Signed-off-by: Steven Zou <szou@vmware.com>

Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-29 14:52:45 +08:00
Qian Deng
4aa625e1a6 Fix: Centering Label in the dropdown item
Label in drop down should position in ther vertical center

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-29 10:54:09 +08:00
Qian Deng
0c756d8df9 Fix: Icon is not at the center of button
Icon in the action bar button need be a certer position

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-29 10:54:09 +08:00
Mia ZHOU
a745922b77
Merge pull request #6153 from zhoumeina/fix_robot_for_replication
modify test case since replication log change to popup a new page
2018-10-29 08:43:35 +08:00
wang yan
566169f59a Fix gc jobs issues.
This commit is to fix two problems in the gc job,
1, in order to support redis cluseter, gc job should delete the keys only
for docker reigstry instead of all keys. It because that in the redis cluster,
only db 0 is supported.
2, to restore the real status of read only not just to set it to false.

Signed-off-by: wang yan <wangyan@vmware.com>
2018-10-26 18:37:20 +08:00