upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 08:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,957 Commits 51 Branches 310 Tags 355 MiB
1840b89993
Commit Graph

9957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
danfengliu
094242b902 Fix typo in upgrade prepare scritp 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-28 10:33:42 +08:00
Qian Deng
cd3c4164d1
Fix internal tls config upgrade issue (#13133) 
internal tls config upgrade is not included in template, this pr is to add it.

Signed-off-by: DQ <dengq@vmware.com>
 2020-09-23 10:35:12 +08:00
danfengliu
37d8e2e6f0
Merge pull request #13121 from danfengliu/cherry-pick-to-2.1-add-2.0-and-2.1-upgrade-pipeline 
Add 2.0 & 2.1 upgrade pipeline in nightly
 2020-09-22 15:16:02 +08:00
danfengliu
ad6f2702ef cherry-pick-to-2.1-for-add-2.0-and-2.1-upgrade-pipeline 
1. cherry-pick-to-2.1-for-add-2.0-and-2.1-upgrade-pipeline;
2. Some UI text display changed, it cause failure in nightly, text changed in tag retension dry run.
 2020-09-22 14:07:57 +08:00
danfengliu
f6a9af967a
Merge pull request #13122 from danfengliu/cherry-pick-to-2.1-recover-nightly-setup 
Recovery nightly setup
 2020-09-22 13:37:38 +08:00
danfengliu
b4c9c4e63a Recovery nightly setup 
1. Recovery nightly setup;
2. Add retry for replication rule selection.
3. Add retry for CNAB test.
4. Rerun keyword of push CNAB

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-22 12:08:16 +08:00
danfengliu
5416950b5b Add 2.0 & 2.1 upgrade pipeline in nightly 
1. Add 2.0 upgrade pipeline in nightly;
2. Add 2.1 upgrade pipeline in nightly.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-22 10:31:40 +08:00
Will Sun
afc04aef84
Merge pull request #13105 from AllForNothing/release-2.1.0 
Improve i18n for tag deletion
 2020-09-18 11:01:13 +08:00
AllForNothing
6d0976019d Improve i18n for tag deletion 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-18 09:49:13 +08:00
Will Sun
6f4666ec6d
Merge pull request #13073 from AllForNothing/release-2.1.0 
[Cherry-pick]Disable endpoint input for docker-hub and helm-hub
 2020-09-17 10:42:56 +08:00
AllForNothing
499d50ff2e Disable endpont input fot docker-hub and helm-hub 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-16 15:03:19 +08:00
Wenkai Yin(尹文开)
a3eca103eb
Merge pull request #13054 from reasonerjt/fix-ldap-admingroup-2.1.0 
[Cherrypick-2.1]Revert "Store User ID in session instead of the whole user model (#12…
 2020-09-15 13:12:01 +08:00
Will Sun
58ff1b6723
Merge pull request #13056 from AllForNothing/release-2.1.0 
[Cherry-pick]Improve notary cmd on UI
 2020-09-15 10:49:54 +08:00
Daniel Jiang
0c0e38e8c3 Revert "Store User ID in session instead of the whole user model (#12984)" 
This reverts commit 6fc0c9d75a.

Because this erases the AdminRoleInAuth attribute in user model as it is
not stored in DB and it will break the admin group of LDAP.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-15 10:04:18 +08:00
AllForNothing
343af79337 Improve notary cmd on UI 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-15 10:03:28 +08:00
Daniel Jiang
0c5db69240
fix(webhook): fix the verify cert logic of webhook endpoint (#13032) 
Signed-off-by: chlins <chlins.zhang@gmail.com>

Co-authored-by: chlins <chlins.zhang@gmail.com>
 2020-09-11 12:35:14 +08:00
Will Sun
804a76d5e7
Merge pull request #13026 from AllForNothing/release-2.1.0 
[Cherry-pick]Change EXECUTE button to uppercase
 2020-09-11 11:00:26 +08:00
AllForNothing
de1ba3d8fc Change EXECUTE button to uppercase 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-10 11:13:03 +08:00
Daniel Jiang
447c218dcf
Escape the query string in list user (#13012) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-09 20:52:08 +08:00
stonezdj(Daojun Zhang)
12f356d1bf
Add ldap filter syntax validation when create search filter (#13008) 
Correct ldap search filter is enclosed with '(' and ')'
Search ldap group with the ldap group base DN instead of group DN
Fixes #12613 LDAP Group Filter and Group Base DN have no affect

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-09-09 14:37:51 +08:00
Qian Deng
b0877327c7
Merge pull request #12998 from ninjadq/fix_upgrade_trivy_2_1 
Fix trivy setting in upgrading script
 2020-09-08 17:27:23 +08:00
DQ
0e0e7afce0 Fix trivy setting in upgrading script 
Signed-off-by: DQ <dengq@vmware.com>
 2020-09-08 15:52:49 +08:00
Wenkai Yin(尹文开)
2326899518
Merge pull request #12994 from heww/cherry-pick-fix-issue-12968 
[Cherry pick]fix(project): change to use user id to query projects of member
 2020-09-08 10:20:08 +08:00
Will Sun
c22a47a864
Merge pull request #12991 from AllForNothing/release-2.1.0 
[Cherry-pick]Fix UI issues found on testing day
 2020-09-08 01:11:43 +08:00
Steven Zou
4223f38bb0
Merge pull request #12917 from chlins/cherry-pick/project-deletion-needs-delete-preheat-policy 
[CHERRY-PICK]fix(p2p): delete all preheat policies before delete project
 2020-09-07 18:14:55 +08:00
He Weiwei
33d5f0945b fix(project): change to use user id to query projects of member 
We know the user id when query projects by member, so use the user id
as entity_id directly in project_member, no need to join harbor_user
table.

Closes #12968

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-07 08:19:27 +00:00
AllForNothing
cdd54944ec Fix UI issues found on testing day 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-07 13:33:00 +08:00
He Weiwei
55148facf1
Merge pull request #12990 from heww/cherry-pick-ignore-enable-content-trust-for-proxy-cache 
[Cherry pick]feat(project): ignore enable_content_trust for proxy project
 2020-09-07 12:42:51 +08:00
He Weiwei
b0f807ecea
Merge pull request #12966 from heww/cherry-pick-to-fix-12938 
[Cherry pick]fix(scanner): move RemoveImmutableScanners before EnsureScanners
 2020-09-07 12:26:57 +08:00
chlins
86bc64a7f1 fix(p2p): delete all preheat policies before delete project 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-09-07 12:14:21 +08:00
Wang Yan
7fe1df22ef
fix gc log issue (#12969) 
1, Do not log redis url, just log the user input from UI.
2, Format the artifact trash items.

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

fix
 2020-09-07 12:02:42 +08:00
He Weiwei
d6d793166e feat(project): ignore enable_content_trust for proxy project 
Ignore enable_content_trust metadata for proxy cache project, see
https://github.com/goharbor/harbor/issues/12940 to get more info

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-07 03:52:32 +00:00
He Weiwei
e9cbfd4594 fix(scanner): move RemoveImmutableScanners before EnsureScanners 
RemoveImmutableScanners may delete the default scanner, so move it
before the EnsureScanners.

Closes #12938

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-07 03:30:52 +00:00
Daniel Jiang
dd47079c3c
Merge pull request #12987 from reasonerjt/session-user-id-2.1 
[CherryPick - 2.1] Store User ID in session instead of the whole user model
 2020-09-07 11:21:09 +08:00
Wenkai Yin(尹文开)
70488884d8
Merge pull request #12954 from ywk253100/200902_replication_2.1 
[cherry-pick-2.1]retry several times when failed to copy blob during the replication
 2020-09-07 11:01:45 +08:00
Wenkai Yin
65d658a059 retry several times when failed to copy blob during the replication 
Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-07 10:09:11 +08:00
Daniel Jiang
a569791325 Store User ID in session instead of the whole user model 
This commit makes a change so that the user id will be stored in sessoin
after user login instead of user model to avoid data inconsistency when
user model changes.

Fixes #12934

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-07 03:07:57 +08:00
Daniel Jiang
7bcfb502d2
Merge pull request #12973 from reasonerjt/content-trust-check-tag-2.1 
Check the tag in isArtifactSigned func -- cherrypick to 2.1
 2020-09-06 13:38:48 +08:00
Qian Deng
a8f0dc0aeb
Merge pull request #12979 from danfengliu/fix-ci-python-package-installation-issue-in-2.1 
Merge pull request #12965 from danfengliu/cherry-pick-2.1.0-fix-git-a…
 2020-09-05 17:32:39 +08:00
Daniel Jiang
a6cc336383 Check the tag in isArtifactSigned func 
This commit ensures that when CLI is pulling a tag, the content trust middleware check the data in notary to ensure the particular tag is signed, not only the digest.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-05 17:01:37 +08:00
stonezdj(Daojun Zhang)
c3c4a5ef6c Merge pull request #12965 from danfengliu/cherry-pick-2.1.0-fix-git-action-ci-missing-site-packages-issue 
Fix git action CI missing python sit packages issue
 2020-09-03 20:50:16 +08:00
stonezdj(Daojun Zhang)
4cf6e5ca50
Merge pull request #12965 from danfengliu/cherry-pick-2.1.0-fix-git-action-ci-missing-site-packages-issue 
Fix git action CI missing python sit packages issue
 2020-09-03 19:44:29 +08:00
danfengliu
cb2296f7d8 Fix git action CI missing python sit packages issue 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-03 17:39:50 +08:00
Daniel Jiang
58f8e6d305
Return basic auth challenge for /v2/_catalog (#12958) 
Fixes #12192

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-03 11:31:40 +08:00
danfengliu
6371ba2e79
Merge pull request #12949 from danfengliu/cherry-pick-to-2.1-fix-swagger-package-missing-issue 
Fix issue of missing swagger package for python API test
 2020-09-02 18:09:24 +08:00
danfengliu
d36400efa6 Fix issue of missing swagger package for python API test 
1. Python API test can't import packages from swagger maker, the reason is that python install packages to site-packages instead of dist-packages,
   so the current solution is to copy pakages from site back to dist, I will try to find a way of using ENV variable to fix this;

2. Remove a python library no longer be used.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-02 16:49:45 +08:00
Steven Zou
1e337a6fea
Merge pull request #12907 from steven-zou/cherry-pick/preheat-job-fix 
[CHERRY-PICK]fix(preheat):handle fail case of preheat in job
 2020-08-31 14:46:42 +08:00
Steven Zou
3e291c4ef6 fix(preheat):handle fail case of preheat in job 
Signed-off-by: Steven Zou <szou@vmware.com>
 2020-08-28 18:05:21 +08:00
Wenkai Yin(尹文开)
560eba7bd1
Merge pull request #12894 from stonezdj/200827_dockerhub_offline 
Fallback to local repo on errors when proxy to remote repo
 2020-08-28 15:14:21 +08:00
danfengliu
fb23db395c
Merge pull request #12868 from danfengliu/add-p2p-preheat-ui-test 
Add P2P Preheat UI Test
 2020-08-28 14:53:43 +08:00