Commit Graph

8296 Commits

Author SHA1 Message Date
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
Daniel Jiang
8dfc5ef185
Merge pull request #12069 from ninjadq/upgrade_chartversion_1_10
Enhance: Upgrade chartmuseum version
2020-05-27 16:41:15 +08:00
Wang Yan
0e163e8c58
bump up version to v1.10.3 (#12059)
Signed-off-by: wang yan <wangyan@vmware.com>
2020-05-27 13:00:22 +08:00
DQ
712ac4fb5b Add timount on nginx configs
set timeout to 900

Signed-off-by: DQ <dengq@vmware.com>
2020-05-26 16:25:31 +08:00
Wang Yan
3e39914951
cherry-pick udpate clair version to v2.1.3 (#12042)
Signed-off-by: wang yan <wangyan@vmware.com>

Co-authored-by: Leo Le Bouter <leo.lebouter-ext@aphp.fr>
2020-05-26 15:56:17 +08:00
DQ
f42a43e495 Enhance: Upgrade chartmuseum version
Upgrade chartmuseum version 0.12.0

Signed-off-by: DQ <dengq@vmware.com>
2020-05-26 15:24:53 +08:00
DQ
b9a5f19b13 Fix: chart repo response code inconsistent
Response code should consistent whether namespace is existed or not

Signed-off-by: DQ <dengq@vmware.com>
2020-05-26 15:16:27 +08:00
Daniel Jiang
83bbdca166
Merge pull request #12016 from reasonerjt/project-name-401-1.10
Change to repositories api
2020-05-26 12:13:54 +08:00
Ziming Zhang
f16a816a47 fix build_base_docker
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-05-26 12:12:45 +08:00
Daniel Jiang
d8336c4549 Change to repositories api
Update to repositories API so it will not differentiate if a project
does not exist or the user doesn't have permission to access it.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-05-26 01:11:16 +08:00
Daniel Jiang
d6cab4fb8e
fix: set root password never expire (#11851)
Signed-off-by: Yiyang Huang <huangyiyang@caicloud.io>

Co-authored-by: Yiyang Huang <huangyiyang@caicloud.io>
2020-05-08 11:35:35 +08:00
Qian Deng
23fdb7fa81
Merge pull request #11804 from ninjadq/add_gcs_key_to_regctl_1_10
Fix: GCS storage gc issue
2020-04-29 16:16:18 +08:00
DQ
ac04806336 Fix: GCS storage gc issue
Mount gcs key to registryctl

Signed-off-by: DQ <dengq@vmware.com>
2020-04-29 15:21:50 +08:00
He Weiwei
1f66d016be
Merge pull request #11567 from reasonerjt/exclude-deleted-projects-1.10
Exclude deleted projects when counting groups associated with group ID - cherrypick to 1.10
2020-04-11 16:52:06 +08:00
Daniel Jiang
7d54fab816 Exclude deleted projects when counting projects associated with group ID
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-04-10 19:08:02 +08:00
danfengliu
fdbd59daf4
Merge pull request #10517 from danfengliu/click-out-infomation-popup-frame
Close scan plugin popup message to avoid interfereing logout operation
2020-04-03 12:32:44 +08:00
Danfeng Liu (c)
3def601f7c Close scan plugin popup message to avoid interfereing logout operation
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2020-04-03 11:47:17 +08:00
He Weiwei
d0189beddd
fix(prepare): not accpet items of false value in external_redis configurations (#11405)
Item in yaml without value will be as None in python, which will make
the password of redis as `None` in `get_redis_configs`. This fix will
not accept items of `false value` in `external_redis` configurations.

Closes #11367

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-04-03 11:39:25 +08:00
Daniel Jiang
9a8efdb8eb
Merge pull request #11345 from reasonerjt/rm-notary-signer-certs-1.10
Remove the certs of notary signer - 1.10
2020-04-01 08:50:43 +08:00
Daniel Jiang
a99609e375 Remove the certs of notary signer
Since `prepare` generates the certs as needed during installation, these
certs should not exist in the repo.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-03-27 19:27:51 +08:00
Ziming Zhang
b566375d58 Bump up version to v1.10.2
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-03-23 15:34:04 +08:00
Ziming Zhang
bd2d3ecc81 feat(cicd) fix build_base_docker and prepare image
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-03-23 12:03:48 +08:00
Daniel Jiang
1c29f39e93 Refresh notary test data for 1.10 branch
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-03-23 11:17:06 +08:00
Qian Deng
1df8810a58
Merge pull request #11066 from ninjadq/release-1.10.0
Fix: fix logrotate is dir issue
2020-03-17 09:56:12 +08:00
DQ
4bbf391d3b Fix: fix logrotate is dir issue
Change it to bind command

Signed-off-by: DQ <dengq@vmware.com>
2020-03-13 15:34:07 +08:00
Daniel Jiang
23d2a10961
Merge pull request #10925 from bitsf/fix_version_tag_1.10
use unified version as tag name for 1.10.2
2020-03-09 23:48:36 +08:00
Ziming Zhang
d80322c3b4 feat(cicd) use unified version as tag name, clean more
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-03-09 16:51:45 +08:00
Will Sun
5cf4072269
Merge pull request #10901 from jwangyangls/fix-xsrf-release1.10
Fix xsrf error status bug when after beego update 1.10
2020-03-04 16:13:53 +08:00
Ziming Zhang
abfafc29f1 feat(cicd) use unified version as tag name
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-03-03 20:51:49 +08:00
Yogi_Wang
917497eef4 Fix xsrf error status bug when after beego update
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2020-03-02 10:13:33 +08:00
Wang Yan
f3e11715ee Merge pull request #10671 from wy65701436/release-1.10.0-beego
upgrade beego to version v1.12.1
2020-02-10 13:57:23 +08:00
wang yan
5f8ad4f490 upgrade beego to version v1.12.1
Signed-off-by: wang yan <wangyan@vmware.com>
2020-02-09 17:08:20 +08:00
Wang Yan
edefbe8c78
Merge pull request #10654 from danfengliu/use-external-registry-goharbor-1.10
Fix project quotas API test issue
2020-02-06 18:43:20 +08:00
danfengliu
af456e66ee Fix project quotas API test issue
In project quotas API test, pull images from goharbor namespace instead of library:
1. Replace image source in API test;
2. Modify criteria for verify project configuration modification.

Signed-off-by: danfengliu <danfengl@vmware.com>
2020-02-06 16:44:46 +08:00
Wang Yan
507ad93982
Merge pull request #10651 from wy65701436/10.1
Bump up version to v1.10.1
2020-02-06 14:47:44 +08:00
wang yan
b0af52ccbf Bump up version to v1.10.1
Signed-off-by: wang yan <wangyan@vmware.com>
2020-02-06 13:25:18 +08:00
Wang Yan
b0342d1fd5
Merge pull request #10649 from steven-zou/cherry/job_hung_issue
[CHERRY-PICK] fix[jobservice]:job status is hung after restart
2020-02-06 13:17:56 +08:00
Wang Yan
7a1f663229
Merge pull request #10640 from wy65701436/release-1.10.0-cp-10636
[cherry-pick]fix issue on listing robot accounts
2020-02-06 11:40:18 +08:00
Steven Zou
5a24fdcd58 fix[jobservice]:job status is hung after restart
- improve the status hook sending/resending approach
- improve the status compare and set approach
- simplify the relevant flow
- add reaper to fix the out of sync jobs
- fix #10244 , fix #9963

Signed-off-by: Steven Zou <szou@vmware.com>
2020-02-06 10:35:45 +08:00
wang yan
c1e0c41497 Merge branch 'release-1.10.0' of https://github.com/goharbor/harbor into release-1.10.0-cp-10636 2020-02-05 21:01:32 +08:00
Wang Yan
8207e71145
Merge pull request #10644 from danfengliu/cherry-pick-1.10-quotas-robot-account
[Cherry-Pick To 1.10] Fix description issue of test in robot account and quotas API test
2020-02-05 21:00:02 +08:00
danfengliu
b2b41a8de7 Fix description issue of test in robot account API test and issue of Helm3 test
1. Fix issue that test step descriton was mismatch with test step;
2. Wrong helm command was used in Helm3 test, replace helm with helm3;
3. In API test, images were pulled from docker-hub registry, images size changed sometime, so we like to use internal registry.

Signed-off-by: danfengliu <danfengl@vmware.com>
2020-02-05 20:29:48 +08:00
wang yan
58bb56f1f7 remove the expirations field from the robot test code in cherry pick
Signed-off-by: wang yan <wangyan@vmware.com>
2020-02-05 15:19:23 +08:00
wang yan
5c657f0216 fix issue on listing robot accounts
Update the query FuzzyMatch when to list robot accounts per project

Signed-off-by: wang yan <wangyan@vmware.com>
2020-02-05 13:34:50 +08:00