Commit Graph

6164 Commits

Author SHA1 Message Date
Wenkai Yin
f74a9c7ab2
Merge pull request #7253 from pureshine/get-adapter
Fix cannot get adapters
2019-03-30 21:27:13 +08:00
FangyuanCheng
163909579e fix get adapter bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-29 18:27:00 +08:00
Wenkai Yin
1491cf1846
Merge pull request #7224 from pureshine/replication_ng
Refactor replication-task page according to the new design
2019-03-29 17:19:31 +08:00
FangyuanCheng
0b7f68388f Refactor replication-task page
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-29 15:33:42 +08:00
Wenkai Yin
8c7b63bac2
Merge pull request #7248 from ywk253100/190326_event
Add event based trigger and scheduled trigger
2019-03-29 14:58:09 +08:00
Wenkai Yin
4f8e283e8e Add event based trigger and scheduled trigger
This commit implements the event based trigger and scheduled trigger in replilcation

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-29 13:48:34 +08:00
Wenkai Yin
c0faa9d4aa
Merge pull request #7227 from zhoumeina/replication_ng
add filter logic
2019-03-28 08:43:43 +08:00
Wenkai Yin
0e9bdbc09c
Merge pull request #7225 from ywk253100/190326_structure
Adjust the file structure of replication package
2019-03-27 13:08:05 +08:00
Wenkai Yin
a49c0dd18c
Merge pull request #7235 from ywk253100/190327_sync
Sync with master branch
2019-03-27 12:04:33 +08:00
Wenkai Yin
017bba8dc1 Merge remote-tracking branch 'upstream/master' into 190327_sync 2019-03-27 11:43:51 +08:00
Qian Deng
7d0f77e986
Merge pull request #7234 from wy65701436/update-node
Upgrade node version to 10.15
2019-03-27 11:16:11 +08:00
wang yan
1ba1c5726a Upgrade node version to 10.15
To fix the issue https://lists.debian.org/debian-devel-announce/2019/03/msg00006.html,
it needs to upgrade node to 10.15, which has pitched the fix.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-03-27 10:47:13 +08:00
Meina Zhou
d9bff2f269 add filter logic
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-26 17:09:23 +08:00
Qian Deng
215149fc2f
Merge pull request #7206 from ninjadq/update_pyyaml_version
Fix: upgrade pyyaml version to 4.2b1
2019-03-26 15:11:42 +08:00
Wenkai Yin
de4eb0369a Adjust the file structure of replication package
Move the scheduler, execution, hook and flow package into operation

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-26 14:59:58 +08:00
Wenkai Yin
690f868d15
Merge pull request #7216 from zhoumeina/replication_ng
Create replication rule -- remove project logic and add dynamic trigger logic.
2019-03-26 10:39:05 +08:00
Mia ZHOU
542c460e3d
Merge pull request #7214 from jwangyangls/fixHelmChartIssue
moveHelmChartIssue
2019-03-26 10:25:37 +08:00
Wenkai Yin
1d4cf53462
Merge pull request #7220 from ywk253100/190324_adapter
Update the registry adapter interface
2019-03-25 21:59:04 +08:00
Meina Zhou
2df11a773e add trigger logic and remove project code
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-25 14:19:47 +08:00
Fangyuan Cheng
37ddaf9ecf
Merge pull request #7138 from pureshine/vul-cron
Refactoring vulnerability ui support cron
2019-03-25 12:30:28 +08:00
Daniel Jiang
49aae76205 Onbard settings for OIDC provider (#7204)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-03-25 12:24:39 +08:00
Yogi_Wang
309696b575 movoHelmChartIssue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-25 11:11:10 +08:00
Meina Zhou
b0ce3da8bd remove the project related code
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-25 10:20:55 +08:00
Wenkai Yin
084ae573ad
Merge pull request #7213 from ywk253100/190324_status
Convert job status to replication task status
2019-03-24 18:32:36 +08:00
Wenkai Yin
39485efc9a
Merge pull request #7212 from ywk253100/190324_sync
Sync with master branch
2019-03-24 14:18:23 +08:00
Wenkai Yin
bdab2fef69
Merge pull request #7211 from ywk253100/190324_delete
Implement deletion for image transter
2019-03-24 14:12:41 +08:00
FangyuanCheng
dada47c07e Refactoring vulnerability ui support cron
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-23 20:58:45 +08:00
Wenkai Yin
791aecddfa
Merge pull request #7210 from ywk253100/190321_delete
Add support for replicating the delation of resource
2019-03-23 20:08:13 +08:00
Wenkai Yin
b37f4018a6 Update the registry adapter interface
This commit adds the Info() method to the registry adapter interface

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-23 07:49:59 +08:00
Qian Deng
df2425a02b Fix: upgrade pyyaml version to 4.2b1
Because previous version has security issue

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-22 19:05:16 +08:00
Qian Deng
e538a4c448 Fix: install.sh failure if $host env is setted (#7203)
Fix sed replace cmd

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-22 19:04:40 +08:00
Wenkai Yin
679b0d3d6a Convert job status to replication task status
This commits converts job status to task status

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-22 18:16:27 +08:00
Yan
8d3946a0e2
Refactor scan all api (#7120)
* Refactor scan all api

This commit is to let scan all api using admin job to handle schedule
management. After the PR, GC and scan all share unified code path.

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

* update admin job api code according to review comments

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

* Update test code and comments per review

Signed-off-by: wang yan <wangyan@vmware.com>
2019-03-22 17:52:21 +08:00
Mia ZHOU
05e0289f84
Merge pull request #7200 from jwangyangls/movoHelmChartAndOptimizationUserPermission
moveHelmChart
2019-03-22 16:48:21 +08:00
Wenkai Yin
49cf50adb1 Merge remote-tracking branch 'upstream/master' into 190324_sync
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-22 15:55:52 +08:00
Yogi_Wang
3f9fd7010a movoHelmChart
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-22 15:52:13 +08:00
Wenkai Yin
c3b02dd104 Implement deletion for image transter
This commit implements the delete function for image transfer

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-22 15:44:35 +08:00
Qian Deng
ba4764c61d
Merge pull request #6755 from ninjadq/refactor_prepare
Refactor the prepare script
2019-03-22 14:54:30 +08:00
Qian Deng
fcdab4d4af Fix: packaging offline in new prepare
This new prepare script now support offline packaging

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-22 13:56:15 +08:00
Wenkai Yin
1120368c9c Add support for replicating the delation of resource
This commit refines the replication flows and provides the support for replicating resource deletion

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-22 12:37:39 +08:00
Wenkai Yin
9b9f2a7e94
Merge pull request #7195 from pureshine/replication-page
Fix bugs that adapters can't display
2019-03-22 09:56:21 +08:00
FangyuanCheng
7b7cc5c0a3 fix bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-21 16:14:09 +08:00
Wenkai Yin
74162f0cec
Merge pull request #7193 from zhoumeina/replication_ng
Replication ng
2019-03-21 15:22:35 +08:00
Meina Zhou
80b8440564 fix unit test
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-21 14:58:47 +08:00
Meina Zhou
130e132f86 Merge branch 'master' into replication_ng
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-21 14:16:33 +08:00
Wenkai Yin
8e870de976
Merge pull request #7192 from heww/fix-users-api-pagination
Fix pagination for users and users search apis
2019-03-21 14:16:12 +08:00
Wenkai Yin
8e08ec382c
Merge pull request #7191 from zhoumeina/replication_ng
add validation message
2019-03-21 13:28:36 +08:00
He Weiwei
79235fffd1 Fix pagination for users and users search apis
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-03-21 13:03:30 +08:00
Meina Zhou
90c28198eb add validation message
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-21 12:24:35 +08:00
Mia ZHOU
204c139dbd
Merge pull request #7166 from ninjadq/oracle_ldap_support
Add membership item in LDAP config
2019-03-21 08:35:42 +08:00