Commit Graph

8239 Commits

Author SHA1 Message Date
stonezdj(Daojun Zhang)
7ac0eefc32
Merge pull request #14374 from danfengliu/replace-python-to-python-handy-switch
Replace pybot to robot and upgrade python to v3.6
2021-03-05 12:15:18 +08:00
danfengliu
642471f820 Replace pybot to python handy switch way
Signed-off-by: danfengliu <danfengl@vmware.com>
2021-03-05 01:48:51 +00:00
Wenkai Yin(尹文开)
3cb5c32f42
Merge pull request #14009 from reasonerjt/tokenreview-rm-header-1.10
Remove raw token from header in token review reuqest - 1.10.x
2021-01-14 18:29:37 +08:00
Daniel Jiang
4d23dd3f03 Remove raw token from header in token review reuqest
The server to handle token-review may have a limitation for the size of
the header.  When the token is huge the token review may fail.
This commit remove the necessary header to harden the flow.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2021-01-14 17:17:04 +08:00
Daniel Jiang
ac80a832df
Merge pull request #13871 from reasonerjt/token-scopes-1.10
Refine the token scope generation -- cherrypick to 1.10
2021-01-12 14:11:49 +08:00
Daniel Jiang
94b3fb99fe Refine the token scope generation
This commit directly maps the actoin permission in security context to
the scope generated by the token service in harbor-core.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2021-01-12 13:45:25 +08:00
danfengliu
71fa84edde
Merge pull request #13603 from danfengliu/add-docker-credential-to-1.10.0
Add docker credential for harbor 1.10.0
2021-01-11 15:25:48 +08:00
danfengliu
0e752d8cf8 Add docker credential for harbor 1.10.0 and fix docker api issue
1. Move LDAP API test out of robot script, LDAP API test will be triggered in Jenkins job independently;
2. Docker api returned from function before analyze the return message for expected error.

Signed-off-by: danfengliu <danfengl@vmware.com>
2021-01-11 14:06:25 +08:00
Qian Deng
52b6a5333a
Add san for notary cert (#13939)
Signed-off-by: DQ <dengq@vmware.com>
2021-01-11 11:41:52 +08:00
Wang Yan
c6814f2bcc
move ci from travis to gitaction (#13891)
1, deprecate travis, and use the gitaction for instread.
2, upgrade golang version to v1.15.6

Signed-off-by: Wang Yan <wangyan@vmware.com>
2021-01-06 15:30:54 +08:00
danfengliu
490042d8d9
Add docker-hub login in build package (#13528)
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-11-16 19:36:49 -08:00
danfengliu
341b8f0c7e
Add login for docker-hub in package build proces (#13526)
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-11-16 18:55:49 -08:00
danfengliu
aa61f66d0b
Add docker login with credential before building harbor package (#13520)
Due to docker hub access limitation, add docker login with credential
before building harbor package

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

Co-authored-by: wang yan <wangyan@vmware.com>
2020-11-16 22:20:26 +08:00
Wang Yan
c2512c0075
bump up base version to v1.10.6 (#13516)
Signed-off-by: Wang Yan <wangyan@vmware.com>
2020-11-16 15:36:27 +08:00
He Weiwei
ae8d82e5be
Merge pull request #13407 from heww/cherry-pick-fix-max-open-conns
[Cherry pick]fix(db): set max open conns of sql.DB manually
2020-11-03 07:41:06 +08:00
Ziming Zhang
a01a0c1b94 feature(tag) add a thread pool for tag list
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-11-02 14:59:50 +08:00
He Weiwei
aee98ac0a0 fix(db): set max open conns of sql.DB manually
Due to the issues of beego v1.12.1 and v1.12.2, we set the max open conns
ourselves.

Closes #12403

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-11-02 14:39:40 +08:00
He Weiwei
b5a4ebacd6
Merge pull request #13411 from heww/cherry-pick-remove-helmhub-testcase
Remove UT for helm hub adapter (#13255)
2020-11-02 14:38:40 +08:00
Daniel Jiang
172b8e84e0 Remove UT for helm hub adapter (#13255)
The helm hub adapter will not work due to the shift to artifact hub and
the API has changed. more details see #13244
Remove the UT for helm hub adapter to unblock CI.
Later we need to rework the adapter to replicate from artifact hub.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-11-02 10:48:08 +08:00
danfengliu
a55c3ae3e7
Merge pull request #12686 from danfengliu/upgrade-python-for-1.10
Upgrade python and robot framework
2020-09-10 17:38:52 +08:00
danfengliu
10be591f14 Merge branch 'upgrade-python-for-1.10' of https://github.com/danfengliu/harbor into upgrade-python-for-1.10 2020-09-07 16:42:31 +08:00
danfengliu
5dca7fb867 Upgrade python and robot framework
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-09-07 06:26:21 +00:00
danfengliu
ed7029d0cc Upgrade python and robot framework
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-09-06 20:06:17 +08:00
Steven Zou
c35ef7d924
Merge pull request #12955 from ywk253100/200823_jobservice
[cherry-pick-1.10]retry several times when failed to copy blob during the replication
2020-09-02 17:45:24 +08:00
Wenkai Yin
be8cbf8944 retry several times when failed to copy blob during the replication
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-09-02 17:19:03 +08:00
Will Sun
2dd5b19629
Merge pull request #12887 from AllForNothing/release-1.10.0
Fix repos refresh bug
2020-08-28 10:50:37 +08:00
AllForNothing
a2051ee57b Fix repos refresh bug
Signed-off-by: AllForNothing <sshijun@vmware.com>
2020-08-28 00:22:41 +08:00
He Weiwei
b2a7b81cd0
Merge pull request #12829 from reasonerjt/refresh-ca-1.10
Refresh CA cert - cherrypick to 1.10
2020-08-20 19:04:12 +08:00
Daniel Jiang
798b6469d8 Refresh CA cert
This commit refresh the harbor_ca.crt

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-08-20 15:41:40 +08:00
Qian Deng
b29faa4e8a
Merge pull request #12588 from ninjadq/extending_chart_client_timeout_1_10
Enhance: Prolong the timeout of chartclient
2020-08-04 16:28:36 +08:00
Wenkai Yin(尹文开)
e046d87f6b
Merge pull request #10754 from chlins/cherry-pick/huawei-adapter-authorization
[CHERRY-PICK]fix(replication): huawei adapter multi authorization
2020-08-04 16:08:48 +08:00
DQ
79b73f094c Enhance: Prolong the timeout of chartclient
In some perspectives to reduce the too many charts performence issue

Signed-off-by: DQ <dengq@vmware.com>
2020-08-04 15:50:27 +08:00
chlins
bc16a5aefc fix(replication): huawei adapter multi authorization
Signed-off-by: chlins <chlins.zhang@gmail.com>
2020-08-04 15:20:11 +08:00
Daniel Jiang
7cca4315fa
Merge pull request #12655 from bitsf/update_version_1.10.5
update version 1.10.5
2020-08-04 14:01:25 +08:00
Ziming Zhang
2b1c01b2ed update version 1.10.5
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-08-04 12:52:42 +08:00
Wang Yan
417e12ecaf
bump up version to v1.10.4 (#12447)
Signed-off-by: wang yan <wangyan@vmware.com>
2020-07-10 10:41:43 +08:00
He Weiwei
fc34a99de3
Merge pull request #12424 from heww/fix-issue-12292
fix(quota): fix internal server error when delete project
2020-07-08 19:50:03 +08:00
He Weiwei
d9a15be95b fix(quota): fix internal server error when delete project
1. Clear cache for projects loader in quota driver of project which will
ensure that load project will raise error after project deleted.
2. Delete quota of the project before the deletion of the project.

Closes #12292

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-07-08 08:26:42 +00:00
danfengliu
8363b9d25b
Merge pull request #12242 from danfengliu/add-version-verification-case
Add harbor version verification case
2020-06-16 14:47:13 +08:00
danfengliu
3f17cd5615 Add harbor version verification case
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-06-16 10:18:13 +08:00
danfengliu
afab4169f6
Merge pull request #12113 from danfengliu/remove-close-scanner-prompt-header-step
remove close scanner prompt header step
2020-06-04 11:27:29 +08:00
danfengliu
4d31de1d5e remove close scanner prompt header step
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-06-01 19:52:36 +08:00
Daniel Jiang
6990ccaa31
Merge pull request #12104 from reasonerjt/fix-pgsql-healthcheck-1.10
Update health check script for harbor-db (#12103) - Cherrypick to 1.10
2020-06-01 18:52:57 +08:00
Daniel Jiang
4f5f8a3961 Update health check script for harbor-db (#12103)
This patch remove the trailing space of the hostname introduced by
`hostname -i`.

The trailing space will cause resolution error after this patch is
applied to glibc in photon:
https://github.com/vmware/photon/blob/2.0/SPECS/glibc/glibc-fix-CVE-2019-10739.patch

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-06-01 11:10:45 +08:00
Will Sun
52edc28690
Merge pull request #12098 from AllForNothing/release-1.10.0
Fix permission control for webhook
2020-05-29 14:50:49 +08:00
AllForNothing
abf4321762 Fix permission control for webhook
Signed-off-by: AllForNothing <sshijun@vmware.com>
2020-05-29 12:23:50 +08:00
He Weiwei
15bd5acc7e
Merge pull request #12081 from heww/fix-issue-11951-in-1.10.x
[Cherry pick]fix(cve-whitelist): fix panic in `Get` method of whitelist manager
2020-05-27 19:15:43 +08:00
He Weiwei
006f9d321a fix(cve-whitelist): fix panic in Get method of whitelist manager
Closes #11951

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-05-27 10:20:09 +00:00
Steven Zou
7bf9888b34 Merge pull request #12070 from ninjadq/chartrepo_enumeration
Fix: chart repo response code inconsistent
2020-05-27 17:00:07 +08:00
stonezdj(Daojun Zhang)
aae70811f0
Merge pull request #12068 from ninjadq/add_timeout_in_nginx_config_1_10_0
Add timount on nginx configs
2020-05-27 16:57:39 +08:00