Commit Graph

6679 Commits

Author SHA1 Message Date
Wenkai Yin
21dbc48609
Merge pull request #7792 from ninjadq/cherry-pick-180-fix_chart_url
Cherry pick 180 fix chart url
2019-05-15 11:35:09 +08:00
jwangyangls
6b5c9047eb
Merge pull request #7790 from jwangyangls/add_way_to_oidc_1.8
Add a way to login to OIDC by clicking login button
2019-05-14 16:18:57 +08:00
Qian Deng
194c306a2d Fix frontend failure caused by absolute path
Fix failures because front downlowd chart using relative path

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-14 15:05:22 +08:00
Qian Deng
ab5cc7ee35 Add chart absolute url item in config
Add a config item to enable and disalbe chart_url

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-14 15:00:19 +08:00
Qian Deng
6f0a74a90d Enable absolute url in helm chart
assign public_url to chart-url
remove namespace merge in index.yaml

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-14 14:59:38 +08:00
Daniel Jiang
4877100a84
Merge pull request #7786 from reasonerjt/oidc-login-403-v1.8.0
Update login controller to return 403 for redirection - cherrypick to 1.8 branch
2019-05-14 14:56:03 +08:00
Yogi_Wang
a33dcb327e Add a way to login to OIDC by clicking login button
add a way to login to OIDC by clicking login button through response status 403

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-14 14:25:08 +08:00
stonezdj(Daojun Zhang)
a9234971ce
Merge pull request #7771 from ninjadq/cherry-pick-180-fix-typo
Typo in registry config - cherrypick to 1.8
2019-05-14 13:57:09 +08:00
Daniel Jiang
7e825e221f
Merge pull request #7785 from ninjadq/cherry-pick-180-defaultalias-issue
Fix issue caused by notary default_alias
2019-05-14 13:52:34 +08:00
Mia ZHOU
6ab2f3277b
Merge pull request #7776 from jwangyangls/fix-schedule-ui-1.8
Fix_cron schedule bug when call api ' get/schedule ' error
2019-05-14 13:37:21 +08:00
Daniel Jiang
9809847e25 Update login controller to return 403 for redirection
As the UI cannot handle 302, update the login controller to return 403
and put the redirection URL in a json response body.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-14 11:22:27 +08:00
Qian Deng
d911d6db68 Fix issue caused by notary default_alias
Fix notary issue

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-13 18:58:47 +08:00
Daniel Jiang
129983a5ed
Merge pull request #7769 from ywk253100/190509_cherrypick_doc
Update the replication part in user guide (#7746)
2019-05-13 18:48:19 +08:00
Yogi_Wang
b1d3f8502d Fix_cron schedule bug when call api ' get/schedule ' error
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-13 14:09:36 +08:00
Qian Deng
3aec2316c9 Typo in registry config
it should be disable not disabled

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-10 23:19:56 +08:00
Wang Yan
34f02189d7
Enable migrator in offline installer (#7766)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-10 19:02:25 +08:00
Wenkai Yin
718d7a3655 Update the replication part in user guide (#7746)
Update the replication part in user guide. Fixes #7133, fixes #7601

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-10 18:41:49 +08:00
Steven Zou
7576800eb2
Merge pull request #7370 from burdzwastaken/fix/spelling-credentail
Fix misspellings of the word credential
2019-05-10 17:28:50 +08:00
Wenkai Yin
a2e7692f10 Document how to use the external database in installation guide (#7761)
Document how to use the external database in installation guide. Fixes #7189

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-10 17:16:58 +08:00
Wang Yan
e7f5954c71
Fix migrator scan all schedule from v1.7.0 (#7763)
In v1.7.0, it creates an record for scan all but without cron string, just update the record with the cron in properties.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-10 17:08:52 +08:00
Daniel Jiang
d81afe274c Add filter to handle request with ID token (#7759)
This commit allows request with a valid ID token to access the API.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-10 16:58:25 +08:00
Qian Deng
439b44c61f Fix public url shoud not display port is it's default value (#7760)
if https port is 443 or http port is 80, then only showing url

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-10 16:53:25 +08:00
Wenkai Yin
7ee9063c2b
Merge pull request #7758 from ywk253100/190509_bug_fix
Fixes bug in replication
2019-05-10 16:49:19 +08:00
Qian Deng
eba20baba5
Merge pull request #7612 from ninjadq/fix_tls_related_issues
Fix tls related issues
2019-05-10 16:36:51 +08:00
Daniel Jiang
0b0fad04e9
Merge pull request #7757 from reasonerjt/install-sh-chk
Fix a bug of checking docker version in install.sh
2019-05-10 15:42:34 +08:00
Qian Deng
d255e66604 Remove -it in docker run
Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-10 15:31:58 +08:00
Qian Deng
286167ad74
Merge pull request #7755 from ninjadq/fix_rendering_none_in_jinja
Fix None rendered in jinja2
2019-05-10 14:59:21 +08:00
danfengliu
8a2ee784a4
Missing modification in keyword <Create A New Endpoint>, due to changing of docker-hub select item, it must be modified. (#7754)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-05-10 14:24:12 +08:00
Wenkai Yin
8348c1fa4b
Merge pull request #7635 from heww/validation-failed-status-code
Return 400 status code for validation failed
2019-05-10 14:22:05 +08:00
Wenkai Yin
a7384fc881 Fixes bug in replication
Use internal service name rather than 127.0.0.1 when calling APIs of core in jobservice jobs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-10 14:18:57 +08:00
Daniel Jiang
b802f14e1f Fix a bug of checking docker version in install.sh
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-10 13:55:04 +08:00
Wang Yan
ef4afff8b0
Update default value of external_database (#7756)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-10 13:41:47 +08:00
stonezdj(Daojun Zhang)
978c7027a1 Add document for admin server refactor (#7479)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-05-10 13:25:36 +08:00
Qian Deng
f9f9661acd New type of bind volume
using long style bind volume

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-10 13:18:48 +08:00
Qian Deng
cd9932db23 Update the path of server.key and server.crt
change the path of cert key paris to prevent futrue issues.

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-10 13:18:48 +08:00
Qian Deng
3dfebed98e Enhance: Add an empty cert files if not exist
To avoid confusion error message

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-10 13:18:48 +08:00
Qian Deng
6ea0514bb7 Revert "Set default mode to https"
This reverts commit 8a308a63e2.

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-10 13:18:48 +08:00
Steven Zou
e091916d54 fix UT case failure (#7734)
Signed-off-by: Steven Zou <szou@vmware.com>
2019-05-10 13:15:44 +08:00
Daniel Jiang
64b16c8915 Enable cfg migration from v1.8.0 (#7751)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-10 13:14:46 +08:00
Daniel Jiang
bae6f17ad3 Update migration guide for v1.8.0 (#7752)
Make necessary updates to reflect the new command to migrate
configuration file from harbor.cfg to harbor.yml

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-10 13:03:01 +08:00
Qian Deng
96bb638067
Merge pull request #7749 from reasonerjt/install-sh-chk
Update the version check in install.sh
2019-05-10 12:56:37 +08:00
Qian Deng
0aaccf62b2 Fix None rendered in jinja2
jinja2 render None to empty string

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-10 12:17:02 +08:00
Qian Deng
bb66358df8 Update migratrion script (#7728)
* Fix migration script

1. port is string when parsed from configparser
2. remove index and db_user in if condition

Signed-off-by: Qian Deng <dengq@vmware.com>

* Add port to public_url

Add port to public_url

Signed-off-by: Qian Deng <dengq@vmware.com>

* Customized value for notary and clair

db config in notary and clair is hardcoded

Signed-off-by: Qian Deng <dengq@vmware.com>

* Add notary and clair db config in harbor.yml

Add notary clair config to harbor.yml and fix related regression

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-10 10:44:05 +08:00
jwangyangls
4218206b59
Merge pull request #7753 from jwangyangls/addOidcMoreLink
Add Oidc more info link in configration
2019-05-10 10:37:52 +08:00
He Weiwei
58cbaaace8 Return 400 status code for validation failed
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-05-10 10:35:25 +08:00
Wenkai Yin
ae3b75d33b
Merge pull request #7657 from zhoumeina/swagger_guide
add swagger user guide
2019-05-10 10:30:05 +08:00
Fangyuan Cheng
aa68471dfa
Merge pull request #7743 from pureshine/modify-text
Modify the prompt for deleting resources when creating a replication rule.
2019-05-10 00:17:47 +08:00
Yogi_Wang
cd42637f51 Add Oidc more info link in configration
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-10 00:04:33 +08:00
Daniel Jiang
4b6e2946c3
Merge pull request #7738 from reasonerjt/cfg-yml-migrator
Require output path for harbor.cfg->harbor.yml migration
2019-05-09 22:33:04 +08:00
Wang Yan
774a9f8d75
Remove unused configure item cfg_expiration (#7744)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-09 22:07:18 +08:00