Commit Graph

6703 Commits

Author SHA1 Message Date
Wenkai Yin
3c093c8f3f
Merge pull request #7347 from ywk253100/190409_ping
Fix bug in ping registry API
2019-04-11 18:29:29 +08:00
Daniel Jiang
83a2246485
Merge pull request #7335 from reasonerjt/oidc-onboard-e2e
OIDC E2E flow + secret support
2019-04-11 18:13:22 +08:00
Wenkai Yin
a2fcb41b31 Fix bug in ping registry API
Fix bug in ping registry API: accept both ID and other properties

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-11 18:00:44 +08:00
jwangyangls
08ecb87220
Merge pull request #7336 from jwangyangls/loginPageChange
Change the login module
2019-04-11 17:00:34 +08:00
jwangyangls
b9517dc987
Merge pull request #7342 from jwangyangls/cli_secret
Add Cli secret in Harbor user profile
2019-04-11 16:10:06 +08:00
Daniel Jiang
763c5df010 Add UT
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-11 15:30:19 +08:00
danfengliu
c320645ba1
many keywords in ToolKit.robot miss wait or retry when operating elements, and it has cause test case failure one time, so I modify all keywords in ToolKit.robot. (#7340)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-04-11 15:15:35 +08:00
danfengliu
08b346ee1e
Add API test case for retag, create a user and 2 projects by this new user, push image to 1st project, and retag this image to 2nd project. (#7300)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-04-11 15:05:46 +08:00
Wenkai Yin
68342c68bc
Merge pull request #7341 from ywk253100/190410_upgrade
Support the migration for scheduled replication rule from previous version of Harbor
2019-04-11 14:01:17 +08:00
Wenkai Yin
b73acde051 Support the migration for scheduled replication rule from previous version of Harbor
Support the migration for scheduled replication rule from previous version of Harbor

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-11 13:14:32 +08:00
Yogi_Wang
94438608a7 Add Cli secret in Harbor user profile
user could copy the CLI secret when login through oidc, and using this cli secret as password when using docker/helm cli to access Harbor.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-11 12:52:15 +08:00
Wenkai Yin
c4c2577517
Merge pull request #7339 from ywk253100/190410_ns
Update the adapter interface
2019-04-11 00:02:12 +08:00
Wenkai Yin
5a047a7eb6 Update the adapter interface
Add ConvertResourceMetadata and PrepareForPush methods

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-10 23:37:11 +08:00
zhoulin xie
cff4df8dfd request change
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-04-10 22:37:02 +08:00
Wenkai Yin
13c912b737
Merge pull request #7338 from cd1989/ng-prepare
[Cherry-Pick] Fix make prepare problem
2019-04-10 20:37:17 +08:00
cd1989
27c1bdc5e2 Fix make prepare problem
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-10 19:48:13 +08:00
Daniel Jiang
0d18e6c82f Update according to comments
For more context see PR #7335

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-10 19:38:12 +08:00
Daniel Jiang
0a2343f542 Support secret for docker CLI
As CLI does not support oauth flow, we'll use secret for help OIDC user
to authenticate via CLI.
Add column to store secret and token, and add code to support
verify/refresh token associates with secret.  Such that when the user is
removed from OIDC provider the secret will no longer work.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-10 19:38:11 +08:00
Daniel Jiang
08e00744be Fix misc bugs for e2e OIDC user onboard process
This commit adjust the code and fix some bugs to make onboard process
work.
Only thing missed is that the UI will need to initiate the redirection,
because the request of onboarding a user was sent via ajax call and didn't
handle the 302.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-10 19:38:11 +08:00
stonezdj(Daojun Zhang)
0d3865c0e8
Merge pull request #7111 from wy65701436/robot-account-doc
Add document for robot account
2019-04-10 17:39:11 +08:00
Yogi_Wang
5df1542c22 Change the login module
change the login module to fix the issue that the nav is being in page when we login harbor again

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-10 14:27:51 +08:00
Wenkai Yin
ba20da5dd4
Merge pull request #7334 from zhoumeina/replication_ng
modify some issues of create replication policy
2019-04-10 12:18:33 +08:00
Meina Zhou
46f78906f7 modify filter to show all the filters in once
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-10 11:15:40 +08:00
Daniel Jiang
a243c7f05a
Merge pull request #7330 from wy65701436/reg-271
Patch regsitry v2.7.1 with fix on distribution issue 2819
2019-04-10 09:45:56 +08:00
Wenkai Yin
7fcc391fed
Merge pull request #7322 from cd1989/update-with-props
Update only specific props in registry update
2019-04-10 09:44:51 +08:00
Wenkai Yin
2644c52926
Merge pull request #7302 from pureshine/registry-update
Fix replication ui related issues
2019-04-09 20:55:44 +08:00
Wenkai Yin
dba9822477
Merge pull request #7323 from zhoumeina/replication_ng
modify filter to show all the filters in once
2019-04-09 20:54:44 +08:00
cd1989
2ad8913e84 Update only specific props in registry update
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-09 19:57:21 +08:00
Wenkai Yin
a1ec091955
Merge pull request #7327 from ywk253100/190409_upgrade
Handle the policy from previous versions
2019-04-09 19:21:23 +08:00
wang yan
469473b31c Patch regsitry v2.7.1 with fix on distribution issue 2819
This commit is to build a regsitry bases on v2.7.1 code and introduces
an fix on issue #2819, this is a P0 bug on v2.7.1 which causes GCS doesn't
work well on v2.7.1

For more details, refer to https://github.com/docker/distribution/pull/2821

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-09 18:42:29 +08:00
Wenkai Yin
6df1320b0a
Merge pull request #7284 from cd1989/make-install-fix
Fix make prepare problem
2019-04-09 18:06:44 +08:00
FangyuanCheng
e76c287a0c Fix replication ui related issues
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-09 17:44:42 +08:00
Wenkai Yin
5a65480594 Handle the policy from previous versions
Handle the policy from previous versions

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-09 17:43:07 +08:00
Wenkai Yin
4a9250e00f
Merge pull request #7325 from ywk253100/190409_sync
Sync with master branch
2019-04-09 17:41:25 +08:00
Meina Zhou
4dac7464cb modify filter to show all the filters in once
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-09 17:28:36 +08:00
wang yan
57e7305104 Update doc for Robot Accounts per review comments
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-09 17:09:20 +08:00
cd1989
92b04cffd5 Fix make prepare problem
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-09 17:02:09 +08:00
Wenkai Yin
580674f3da Merge remote-tracking branch 'upstream/master' into 190409_sync 2019-04-09 17:01:09 +08:00
Qian Deng
fdf57f07f0
Merge pull request #7277 from ninjadq/refactor_config_file
Refactor config file
2019-04-09 15:48:15 +08:00
Qian Deng
deba378842 Enhance: Refacotr Registry config file
1. Refactor registry configs
2. cp gcs keyfile is exist

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 14:40:41 +08:00
danfengliu
7c0273e5f9
Add a checkpoint in the end of key word <Add Guest Member To Project>, to make sure that the confirm button was click successfully, to see if this confirm button was dissappered after clicked. (#7320)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-04-09 13:41:56 +08:00
Wenkai Yin
32c6dd67af
Merge pull request #7321 from ywk253100/190409_ut
Add unit test cases for Harbor adapter
2019-04-09 13:41:43 +08:00
Wenkai Yin
9e5e723855 Add unit test cases for Harbor adapter
Add unit test cases for Harbor adapter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-09 13:04:04 +08:00
Qian Deng
74c4e243e3 Refator the host related config
1. Refactor host config
2. Refactor certiface config
3. Add port config
4. Add log info config

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 12:55:07 +08:00
Qian Deng
fef7702e9a Enhance: Refactor the config parse logic
Refactor the config parse logic

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 12:55:07 +08:00
Qian Deng
ac1b7bb1fb Enhance: remove the reload key item
Remove the reload_config item in config file

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 12:55:07 +08:00
Qian Deng
cd65b68ab3 Enhance: Refactor the format
Refactor the whole structure of harbor.yml

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 12:55:07 +08:00
Daniel Jiang
77ed9a871f Update CHANGELOG.md to make it up to date (#7315)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-09 12:27:47 +08:00
Wenkai Yin
855c0a2a6e
Merge pull request #7194 from stonezdj/remove_error_msg
Remove error message of saving system setting to db
2019-04-09 12:02:17 +08:00
danfengliu
0e0c691225
In project.robot, many element click or other action keywords missing retry, it will cause innessesary sleep in scripts. (#7274)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-04-09 10:44:24 +08:00