Wenkai Yin
e8fe2aa60c
Upgrade the registry and replication policy tables
...
Upgrade the registry and replication tables in database
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-05 13:25:00 +08:00
Wenkai Yin
f4bf948847
Merge pull request #7304 from cd1989/registry-delete-constraint
...
Use policy controller in registry deletion
2019-04-04 22:46:08 +08:00
cd1989
fe004e1bfc
Init replication in core
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-04 21:58:31 +08:00
cd1989
2450dacecb
Use policy controller in registry deletion
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-04 21:26:27 +08:00
Wenkai Yin
4116433de8
Merge pull request #7306 from ywk253100/190404_cleanup
...
Remove the useless replication code
2019-04-04 21:18:04 +08:00
Wenkai Yin
c2f702be2a
Remove the useless replication code
...
This commit removes the useless replication code
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 20:56:25 +08:00
Wenkai Yin
58a73de3e5
Merge pull request #7299 from ywk253100/190404_sync
...
Sync with master branch
2019-04-04 17:33:11 +08:00
Wenkai Yin
dc35be09c4
Merge pull request #7301 from ywk253100/190404_agent
...
Filter the events triggerred by replication
2019-04-04 16:50:23 +08:00
Wenkai Yin
02dd4e500a
Clear up the table before doing dao test
...
Clear up the table before doing dao test
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 16:46:16 +08:00
Wenkai Yin
1c735a7464
Filter the events triggerred by replication
...
Filter the events triggerred by replication pull
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 16:03:38 +08:00
Wenkai Yin
9db85f02d2
Merge pull request #7298 from ywk253100/190404_filter_exec_task
...
Stop a replication execution
2019-04-04 15:41:42 +08:00
Wenkai Yin
b66b1f341e
Merge remote-tracking branch 'upstream/master' into 190404_sync
2019-04-04 14:55:09 +08:00
Wenkai Yin
78fc2846bd
Stop a replication execution
...
Implement the function to support to stop the replication execution
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 14:51:37 +08:00
jwangyangls
a27df46fb6
Merge pull request #7292 from jwangyangls/fix_login_robot_issue
...
Fix nightly test case failed when login harbor.
2019-04-04 12:14:43 +08:00
Yogi_Wang
4416e1810e
fix login harbor issue with test case
...
Solve the problem that when we log on to the harbor page, the automation test will click on an incorrect button, which results in the test page being unable to log in.
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-04 09:58:46 +08:00
Wenkai Yin
3ed8d87406
Merge pull request #7294 from pureshine/replication-ui
...
Fix cannot search for replication tasks
2019-04-04 09:52:04 +08:00
Wenkai Yin
48f02d0605
Merge pull request #7291 from cd1989/registry-with-empty-credential
...
Handle registry with empty credential
2019-04-03 21:35:32 +08:00
Wenkai Yin
9e88f3d28e
Merge pull request #7290 from cd1989/edit-registry-description
...
Allow edit registry description
2019-04-03 21:09:25 +08:00
Yan
da0e20ec60
Add controller to onboard oidc user ( #7286 )
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-03 20:47:22 +08:00
cd1989
e2c86f8f59
Handle registry with empty credential
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-03 20:33:26 +08:00
cd1989
8968e82675
Allow edit registry description
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-03 19:47:14 +08:00
Mia ZHOU
f73f926449
Merge pull request #7265 from pureshine/move-scan/gc
...
Move GC and Vulnerability to Tasks
2019-04-03 16:41:57 +08:00
Wenkai Yin
3978def928
Merge pull request #7282 from zhoumeina/replication_ng
...
modify frontend replication UI to apply api changes. use dest registry as object
2019-04-03 16:08:07 +08:00
Fangyuan Cheng
89b72906f4
Merge branch 'master' into move-scan/gc
2019-04-03 16:07:35 +08:00
Meina Zhou
6b3f2bbf74
modify frontend replication UI to apply api changes. use dest registry as object
...
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-03 15:45:42 +08:00
FangyuanCheng
8a1f3b7c00
Fix cannot search for replication tasks
...
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-03 15:38:18 +08:00
Wenkai Yin
0c171c642b
Merge pull request #7244 from wy65701436/oidc_user
...
add the dao funcs for OIDC onboard user
2019-04-03 15:23:05 +08:00
FangyuanCheng
82716d492d
move vulnerability and gc ui
...
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-03 14:39:46 +08:00
jwangyangls
beeb8b53d7
Merge pull request #7281 from jwangyangls/oidc_step3_onboard_tpl
...
Add the OIDC onboard page
2019-04-03 14:11:25 +08:00
wang yan
dcf1d704e6
fix dao UT issue and refine the error of onboard OIDC user
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-03 14:05:18 +08:00
jwangyangls
cf391e74ad
Merge pull request #7267 from jwangyangls/oidc_step2_onboard
...
Add links to OIDC login
2019-04-03 13:18:18 +08:00
Yogi_Wang
3bf644012c
Add the OIDC onboard page
...
When a user logs in to Harbor for the first time through OIDC, the user will enter an onboard page, prompting the user to add the user name of Harbor. After the user name is entered, click save, and the user successfully logs in to Harbor through OIDC.
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-03 12:58:11 +08:00
Yogi_Wang
da3620816f
Add links to OIDC login
...
In the login page ,we add button to jump to OIDC login page.
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-03 12:33:18 +08:00
wang yan
41018041f7
remove oidc controller and add more UTs
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-03 09:54:21 +08:00
Yan
0de5999f52
add the controller for ocdi onboard user
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-03 09:52:22 +08:00
Wenkai Yin
382558167c
Merge pull request #7275 from ywk253100/190402_delete_image
...
Call Harbor API to delete the images in Harbor adapter
2019-04-02 18:22:33 +08:00
Wenkai Yin
5219073c49
Call Harbor API to delete the images in Harbor adapter
...
Call Harbor API to delete the images in Harbor adapter to avoid the inconsistent between the different versions of Harbor
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-02 17:02:15 +08:00
Wenkai Yin
68803313d9
Merge pull request #7272 from ywk253100/190402_trigger_operation
...
Fix replication related issues
2019-04-02 16:12:16 +08:00
Wenkai Yin
4484bca756
Fix replication related issues
...
1. Add operation property for tasks
2. Add trigger property for executions
3. Update the getting registry info API to allow passing 0 as ID to get the info of local Harbor registry
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-02 14:26:17 +08:00
Wenkai Yin
8d6299fed9
Merge pull request #7257 from reasonerjt/oidc-controllers-p2
...
Add callback controller for OIDC
2019-04-02 13:37:00 +08:00
Qian Deng
e93d931834
Merge pull request #7268 from ninjadq/fix_clair_env_none_issue
...
Fix: clair env file should using empty string is not exist
2019-04-02 10:25:26 +08:00
Daniel Jiang
76ea48d47b
Merge pull request #6997 from daixiang0/update-doc
...
docs/README.md: update old url
2019-04-02 10:08:10 +08:00
Wenkai Yin
18dbd807a4
Merge pull request #7270 from ywk253100/190401_transport
...
Provide a util function to return a common HTTP transport
2019-04-02 07:24:53 +08:00
Wenkai Yin
b42ae1c994
Provide a util function to return a common HTTP transport
...
1. Provide a util function to return a shared HTTP transport
2. Read secretkey from the configuration of replication
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-01 19:52:37 +08:00
Wenkai Yin
1513c37ac2
Merge pull request #7269 from ywk253100/190401_registry_client
...
Update the registry client to support pulling public images from docker hub without login
2019-04-01 19:51:50 +08:00
Wenkai Yin
74efee569e
Update the registry client to support pulling public images from docker hub without login
...
Only add the authentication info when the username is provided to support pulling public images from docker hub without login
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-01 19:15:07 +08:00
Qian Deng
15c2c9048f
Fix: clair env file should using empty string is not exist
...
This is quick fix, further fixs will in the config refactor PR
Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-01 18:12:34 +08:00
Wenkai Yin
df2ae63308
Merge pull request #7262 from ywk253100/190401_harbor_adapter
...
Use the secret to auth the replication for local Harbor
2019-04-01 17:26:56 +08:00
Wenkai Yin
bd2308b91a
Use the secret to auth the replication for local Harbor
...
1. Use the secret to do the auth between the components when replicating
2. Handle internal core URL and token service URl when the instance is local Harbor
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-01 16:24:06 +08:00
Wenkai Yin
d6eb700077
Merge pull request #7264 from mmpei/replication_ng_bugfix_endtime
...
Fix execution end time bug
2019-04-01 16:09:16 +08:00