Commit Graph

6326 Commits

Author SHA1 Message Date
James Zabala
191d0b6c12
Merge pull request #6508 from cd1989/update-doc-for-dco
Add DCO description to CONTRIBUTING.md
2018-12-12 09:38:28 -05:00
Wenkai Yin
5ae7e60b73
Merge pull request #6519 from mweigel/master
Minor corrections to swagger spec
2018-12-12 17:27:31 +08:00
Mario Weigel
187fccae6f Minor corrections to swagger spec
Signed-off-by: Mario Weigel <mario.weigel@gmail.com>
2018-12-12 21:58:24 +13: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
Daniel Jiang
b954393109 Update OSL for 1.7.0 (#6509)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-12-11 16:53:44 +08:00
cd1989
6d9fc4fec0 Add DCO description to CONTRIBUTING.md
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-11 14:29:17 +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
Daniel Jiang
205e85b2b2
Merge pull request #6488 from wy65701436/fix-update-notary
Fix unable to use Notary after updating to v1.6.0
2018-12-09 02:26:18 -08:00
wang yan
7936d14abc fix per comments, add if not exists to create pqsql sequence
Signed-off-by: wang yan <wangyan@vmware.com>
2018-12-08 16:11:30 +08:00
wang yan
0517ecca7a Fix unable to use Notary after updating to v1.6.0
This commit is to fix the issue on notary migrations from mysql to pgsql.
1, alter sequence for the primary key of changeseed, this is missed in v1.6.0 migrator.
2, alter table owners from postgres to notarysigner and notaryserver.

Issue:
https://github.com/goharbor/harbor/issues/6465

Workaround:
https://github.com/goharbor/harbor/issues/6465#issuecomment-445162616

Impacted upgrade path:
1, Upgrade from version older then v1.6.0 with migrator:v1.6.0, and migrates the notarty DB.

No impacted upgrade path:
1, Upgrade from version older than v1.6.0 with migrator:v1.6.0, but without migrates the notarty DB.

Notes:
After merge this fix, we need to provide an new migrator with an new tag, like v1.6.1, and
deprecated the v1.6.0. For those who was impacted by migrator v1.6.0, will open an new PR to build
the workaround into the migrator and expose an specical command for hot-fix.

Signed-off-by: wang yan <wangyan@vmware.com>
2018-12-07 19:33:44 +08:00
Mia ZHOU
06eec7b3ed
Merge pull request #6479 from zhoumeina/fix_scan_log_nightly
quick fix for scan log
2018-12-07 14:39:29 +08:00
Mia ZHOU
0b476b859f
Merge pull request #6478 from zhoumeina/fix_chart_label
fix helm chart did not get global label
2018-12-07 14:37:16 +08:00
Steven Zou
60f0ec594d
Merge pull request #6437 from cd1989/update-retag-user-guide
Update user guide for retag function
2018-12-06 22:34:13 -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
Meina Zhou
7827f19671 quick fix for scan log
This is a quick fix

Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-07 12:29:15 +08:00
Wenkai Yin
c16a9d06f3
Merge pull request #6480 from wy65701436/fix-travis
Fix robot framework version to 3.0.4
2018-12-07 12:27:53 +08:00
wang yan
109350a8c3 Fix robot framework version to 3.0.4
As pip will always install the latest version, to avoid any break change,
just fix the framework to 3.0.4

Signed-off-by: wang yan <wangyan@vmware.com>
2018-12-07 11:45:57 +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
De Chen
60d65a9d86 Block retag requests in read-only mode (#6457)
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-06 18:35:22 +08:00
cd1989
caf07a96fe Give meaningful messages when retag forbided
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-06 16:25:21 +08:00
FangyuanCheng
158fb92745 Remove the border of default label when filtering images by label
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-06 15:35:42 +08:00
Mia ZHOU
657ee8a150
Merge pull request #6469 from zhoumeina/fix_scan_log_viewer
fix #6432 modify scan log to use popup window
2018-12-06 15:11:03 +08:00
Meina Zhou
791646b8b0 fix #6432 modify scan log to use popup window
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-06 14:24:24 +08:00
Mia ZHOU
9100dfdb5f
Merge pull request #6468 from zhoumeina/fix_500_gc
#6440 fix gc will have 500 error when user try to put a new schedule
2018-12-06 14:22:43 +08:00
Wenkai Yin
746d58ceb4 Return the error message when changing password with wrong old password (#6466)
Return a meaningful error message when changing password but the a wrong old password is provided to render on UI

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-06 13:29:30 +08:00
Mia ZHOU
eeb6d4a9b9
Merge pull request #6456 from pureshine/add-user
Modify the error message when adding members
2018-12-06 12:53:44 +08:00
Mia ZHOU
2614306768
Merge pull request #6427 from pureshine/remove-am
Time display using 24-hour system
2018-12-06 12:52:52 +08:00
Mia ZHOU
a16c7b07a9
Merge pull request #6424 from pureshine/scan-now
Don't get the next available time while scan now
2018-12-06 12:44:56 +08:00
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
2a9d46e052 Update no_proxy from 'portal' to 'core' in cfg migrator (#6464)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-12-06 11:49:40 +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
Wenkai Yin
11f0e10d36
Merge pull request #6463 from reasonerjt/update-db-migration-doc
Refine migration guide for 1.7
2018-12-06 10:19:49 +08:00
Mia ZHOU
37e9563f09
Merge pull request #6451 from zhoumeina/fix_javascript
fix #6421 javascript error when user input nothing in the filter logs
2018-12-06 09:40:27 +08:00
陈德
7e9a12fb22 Update user guide for retag function
Signed-off-by: 陈德 <chende@caicloud.io>
2018-12-06 09:23:40 +08:00
Daniel Jiang
c9d51f2a75 Refine migration guide for 1.7
Fixes #6449

1. Simplify the steps for backing up database.
2. Add the missing command to pull migrator image.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-12-05 11:03:09 -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
Daniel Jiang
481bdb01a2
Merge pull request #6409 from ninjadq/upgrade_config_2_170
Feat: Upgrade harbor.cfg from 1.6.0 to 1.7.0
2018-12-04 01:05:59 -08:00