Commit Graph

9920 Commits

Author SHA1 Message Date
Daniel Jiang
5e8506831a 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-04 13:42:56 +08:00
Qian Deng
591d4eeab8
Merge pull request #13816 from ninjadq/cherry_pick_python_yaml_load_210
Fix pythom yaml load to safe_load
2021-01-04 10:51:17 +08:00
DQ
9f5a85b484 Fix pythom yaml load to safe_load
Signed-off-by: DQ <dengq@vmware.com>
2020-12-21 11:32:55 +08:00
danfengliu
ec2b83dcf3
Merge pull request #13725 from danfengliu/cherry-pick-2.1-image-sample-build-at-local
Build image sample for test in local
2020-12-15 17:19:05 +08:00
danfengliu
5fe6c1ee6f Build image sample for test in local
Change source of most of test image samples from docker-hub to local building ones, so it will cost less docker-hub pull requests.
And some of cases like push cnab, they have to use docker-hub, but image samples in cnab test will cost 17 quotas, in this PR, we
replace those samples, now cnab case will cost 6 quotas.

Signed-off-by: danfengliu <danfengl@vmware.com>
2020-12-11 07:49:42 +00:00
Wang Yan
fcc6751d54
bump up version to v2.1.2 (#13713)
Signed-off-by: Wang Yan <wangyan@vmware.com>
2020-12-09 00:23:44 -08:00
Steven Zou
d5c336dc45
Merge pull request #13711 from steven-zou/fix/js_api_2.1.0
fix(api):update stop job api
2020-12-09 14:36:48 +08:00
Steven Zou
ffc331da7c fix(api):update stop job api
- update StopJob() of basic worker
- update UnSchedule() of basic scheduler
- update the policy store to get more data

fix #13599 , fix #13597

Signed-off-by: Steven Zou <szou@vmware.com>
2020-12-09 13:45:58 +08:00
疯魔慕薇
282459f9b8 Tecent TCR Provider
1. Docker image registry.
2. Helm chart registry.

Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com>
Signed-off-by: fanjiankong <fanjiankong@tencent.com>
2020-12-09 08:42:06 +08:00
danfengliu
e4bffed20b
Merge pull request #13681 from danfengliu/move-proxy-cache-e2e-test-into-a-new-git-action-ci-job
Move proxy cache e2e test into a new CI job
2020-12-04 13:56:20 +08:00
Daniel Jiang
4c01f37ba5
Merge pull request #13686 from reasonerjt/adjust-middleware-v2.1-2nd
Move security/readonly middleware ahead of transaction middleware
2020-12-04 13:33:58 +08:00
danfengliu
6b7f740847 Move proxy cache e2e test into a new CI job
CI job timeout is 60 minutes, but proxy cache case timeout is 20 minutes, once
proxy cache case is timeout, it will reach CI job timeout, then cause CI job terminated
by timeout without running rest of test steps, expecially uploading useful harbor logs,
so move this test into a new clean job for saving time and debugging.

Signed-off-by: danfengliu <danfengl@vmware.com>
2020-12-03 19:36:42 -08:00
Daniel Jiang
a773ef358f Move security/readonly middleware ahead of transaction middleware
In v2.1 security/readonly middleware will query DB by creating new
connection.
If it is put after transaction middleware there's a bigger chance of
deadlock if the concurrent open connections are set too low (#13155)

This commit mitigates that issue.  But we still need work to lower the
connections and better handle the case when http connection is closed.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-12-03 22:45:53 +08:00
Daniel Jiang
41a9d071b6
Merge pull request #13676 from reasonerjt/fix-v2catalog-uri-2.1
Fix the pattern to match v2 catalog URI
2020-12-03 14:13:03 +08:00
Daniel Jiang
c7c409a8e5 Fix the pattern to match v2 catalog URI
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-12-03 12:55:26 +08:00
Wenkai Yin(尹文开)
2f64eb95b9
Set timezone as UTC for database connection (#13663)
Set timezone as UTC for database connection

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-12-03 08:56:18 +08:00
Daniel Jiang
b21f490adc
Merge pull request #13668 from danfengliu/debug_proxy-cache-e2e-test
fix proxy cache e2e test
2020-12-02 20:23:15 +08:00
danfengliu
8c3552993d fix proxy cache e2e test
1. Add print in docker pull api;
2. Move proxy cache API to the front of case list.

Signed-off-by: danfengliu <danfengl@vmware.com>
2020-12-02 18:24:26 +08:00
Wenkai Yin(尹文开)
4134df3719
Merge pull request #13665 from reasonerjt/bump-up-goldap-v2.1
[Harbor-v2.1.x]:Bump up go-ldap to v3.2.4
2020-12-02 18:14:25 +08:00
danfengliu
8d88ab26cb
Merge pull request #13635 from danfengliu/cherry-pick-2.1.0-fix-scan-all-python-script
Cherry-pick 2.1.0 Fix scan all python test script issue of missing test step
2020-12-02 10:47:16 +08:00
Daniel Jiang
b6bf23ff1d Bump up go-ldap to v3.2.4
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-12-02 09:57:30 +08:00
He Weiwei
e2bc0a46e0
fix(quota): ignore the fail when getting reference of quota (#13651)
Closes #13387

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-12-01 20:41:31 +08:00
Steven Zou
343e3b0c1e
Merge pull request #13638 from bitsf/fix_redis_sentinel_chart_2.1
fix(redis) redis sentinel for chart cache
2020-12-01 16:57:50 +08:00
Ziming Zhang
86141d1141 fix(redis) redis sentinel for chart cache
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-11-30 19:05:34 +08:00
danfengliu
6f33eed718 Fix scan all python test script issue of missing test step
1. In scan all py-test, missing a important test step for checkin scan all status,
2. which indicate the ending of scan all job.
In swagger, ongoig field is missing in stats struct.

Signed-off-by: danfengliu <danfengl@vmware.com>
2020-11-30 17:28:25 +08:00
Daniel Jiang
4976865a1b
Merge pull request #13601 from bitsf/fix_chart_s3_cache
[cherry-pick] fix(chartmuseum) compatible s3 cache fail for 2.1.2
2020-11-29 23:06:49 +08:00
danfengliu
4760afa0e7
Merge pull request #13572 from danfengliu/fix-docker-hub-access-limitation-issue
Add docker access credential to avoid access limitaton by docker-hub
2020-11-29 19:13:38 +08:00
danfengliu
4d501030b6 Add docker access credential to avoid access limitaton by docker-hub
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-11-29 17:20:47 +08:00
Ziming Zhang
06630930d2 fix(chartmuseum) compatible s3 cache fail
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-11-25 17:02:33 +08:00
He Weiwei
28fc1d53a4 fix: remove auto re-readable body in BeforeRequest
Remove nop close body in the BeforeRequest helper function.
Middleware must make the request body re-readable itself when it wants
read the body in the middleware.

Closes #13556

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-11-24 22:45:22 +08:00
danfengliu
133be175bf
Merge pull request #13574 from danfengliu/cherry-pick-2.1.0-github-actions-update-for-env
ci: update env and path commands in github actions
2020-11-23 21:15:23 +08:00
He Weiwei
7950d4a446 ci: update env and path commands in github actions
The `add-path` and `set-env` commands are deprecated and will be
disabled soon so update the CI.yml to use the new methods for these
commands.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-11-23 17:32:12 +08:00
Steven Zou
c2adc75c5f
Merge pull request #13381 from chlins/cherry-pick/p2p-preheat-instance-bool-type-fields
[CHERRY_PICK] fix(preheat): disable preheat model bool type json omitempty option
2020-11-23 10:03:06 +08:00
Chlins Zhang
f8c7027ebe
Merge pull request #13394 from chlins/cherry-pick/p2p-preheat-instance-and-policy-post-no-location
[CHERRY_PICK] fix(preheat): add location when create instance and policy
2020-11-23 09:31:11 +08:00
Steven Zou
43392c57b0
Merge pull request #13451 from mmpei/release-2.1.0-fix-chart-replication
fix chart replication issue of uppercase letters
2020-11-09 16:30:56 +08:00
peimingming
12790386ad fix chart replication issue of uppercase letters
Signed-off-by: peimingming <peimingming@corp.netease.com>
2020-11-05 15:01:55 +08:00
Will Sun
0440cf931c
Merge pull request #13429 from AllForNothing/release-2.1.0
[Cherry-pick]Add deprecated mark to Helm Hub
2020-11-04 11:47:26 +08:00
AllForNothing
4b92ba49a7 Add deprecated mark to Helm Hub
Signed-off-by: AllForNothing <sshijun@vmware.com>
2020-11-03 15:15:54 +08:00
chlins
42d07dbaa7 fix(preheat): add location when create instance and policy
Signed-off-by: chlins <chlins.zhang@gmail.com>
2020-10-29 18:19:55 +08:00
Will Sun
d1bf0f092a
Merge pull request #13377 from AllForNothing/release-2.1.0
[Cherry-pick]Fix a bug for editing p2p instance
2020-10-29 09:12:26 +08:00
chlins
89acd5f1d1 fix(preheat): disable preheat model bool type json omitempty option
Signed-off-by: chlins <chlins.zhang@gmail.com>
2020-10-28 18:14:56 +08:00
danfengliu
dc644b58d1
Merge pull request #13336 from danfengliu/fix-nightly-upgrade-prepared-data
Fix nightly upgrade webhook prepared data
2020-10-28 17:53:36 +08:00
AllForNothing
3b4fad7e3a Fix a bug for editing p2p instance
Signed-off-by: AllForNothing <sshijun@vmware.com>
2020-10-28 14:30:37 +08:00
danfengliu
583203b073 Fix nightly upgrade webhook prepared data
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-10-26 14:53:30 +08:00
Daniel Jiang
5f52168ee9
Add more info in log message to help debug (#13343)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-10-23 11:44:24 +08:00
stonezdj(Daojun Zhang)
ed804d0350
Merge pull request #13325 from stonezdj/2.1.0_remove_dup_ldap_group_filter
(cherry-pick) Remove dup call to createGroupSearchFilter in searchGroup
2020-10-21 16:42:09 +08:00
stonezdj
69c6aa6927 Remove dup call to createGroupSearchFilter in searchGroup
Signed-off-by: stonezdj <stonezdj@gmail.com>
2020-10-21 14:50:07 +08:00
Wenkai Yin(尹文开)
3dbe6a44cd
Return the location header when creating proxy cache project (#13322)
Fixes #13303. Return the location header when creating proxy cache project

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-10-21 14:40:38 +08:00
Wang Yan
ac5c8837c6
bump up version to v2.1.1 (#13311)
Signed-off-by: wang yan <wangyan@vmware.com>
2020-10-20 15:59:40 +08:00
chlins
e6f90f1559 fix: fix quay adapter catalog api return error
Signed-off-by: chlins <chlins.zhang@gmail.com>
2020-10-20 15:26:09 +08:00