Commit Graph

88 Commits

Author SHA1 Message Date
bay1ts
a9153e7437 [REV] merge from code 2017-12-15 16:49:24 +08:00
pujielan
115328e08a [REV] Optimize plugin system 2017-12-14 17:33:14 +08:00
pujielan
1aa710b977 [REV] Optimize plugin pod build 2017-12-14 10:50:03 +08:00
pujielan
ab3922c9f7 [REV] Optimize plugin system 2017-12-13 17:38:45 +08:00
崔斌
9963604969 [REV] Optimize plugin system 2017-12-13 12:10:53 +08:00
崔斌
e198c80ed9 [REV] Add discover env - DISCOVER_URL when creating plugin pods 2017-12-12 15:25:47 +08:00
崔斌
ef04e7dbc0 [REV]Update service’s plugin setting with build_version
[FIX]Repair few annotation bugs
2017-12-12 12:52:29 +08:00
goodrain
95f5e8aebe Merge branch 'release-3.4'
# Conflicts:
#	pkg/builder/api/router.go
#	pkg/grctl/cmd/init.go
#	pkg/grctl/cmd/installStatus.go
#	pkg/grctl/cmd/node.go
2017-12-12 11:36:57 +08:00
bay1ts
8f5bcf40e0 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-08 15:34:04 +08:00
崔斌
9c53b383e9 [REV]Update notation 2017-12-08 10:16:29 +08:00
bay1ts
33ab092774 [REV] optimize node's pods info and merge bugfix from release 2017-12-07 23:48:07 +08:00
崔斌
850e43964e [ADD]Add err log in eventlog 2017-12-07 18:29:31 +08:00
崔斌
04046d4a71 [REV]Update swagger 2017-12-07 17:25:27 +08:00
崔斌
47464c30a3 [REV]Update cloud auth add put get interface 2017-12-07 16:37:09 +08:00
bay1ts
ab87db2b96 Merge remote-tracking branch 'origin/master'
Conflicts:
	pkg/api/controller/serviceAction.go
	pkg/eventlog/store/handle_message_store.go
2017-12-07 16:09:26 +08:00
bay1ts
47a24d094b Optimize:merge dev to tenant_manage 2017-12-07 15:44:53 +08:00
bay1ts
84b34ea2e9 [REV] optimize get tenant manage api 2017-12-07 14:01:46 +08:00
bay1ts
5617e1baf9 [REV] optimize get tenant by name 2017-12-07 13:47:25 +08:00
bay1ts
bd4f1bc7e1 [REV] optimize get tenant by name 2017-12-07 13:42:45 +08:00
bay1ts
9d46c69ee2 [REV] optimize get tenant by name 2017-12-07 12:14:01 +08:00
bay1ts
7faa677b00 [REV] temp 2017-12-07 11:44:56 +08:00
bay1ts
3d35f8b3db [REV] optimize args validate 2017-12-07 11:07:51 +08:00
崔斌
2699573e79 [FIX]Fix eid bug 2017-12-07 10:48:10 +08:00
崔斌
dc053301dc [REV]API ingress auth 2017-12-07 09:56:08 +08:00
bay1ts
4e28e05b4c [REV] optimize paged resource 2017-12-07 00:35:44 +08:00
bay1ts
dbcceea561 [REV] optimize paged resource 2017-12-07 00:29:05 +08:00
bay1ts
0520a5a9fb [REV] optimize paged resource 2017-12-07 00:14:38 +08:00
bay1ts
42c0329682 [REV] optimize paged resource 2017-12-07 00:09:10 +08:00
bay1ts
d694c8db60 [REV] optimize paged resource 2017-12-06 23:51:34 +08:00
bay1ts
ed6e5b8ce5 [REV] temp 2017-12-06 17:51:33 +08:00
bay1ts
3c0bc37ec3 [REV] add vendor 2017-12-06 17:18:26 +08:00
bay1ts
aa3e2a6f5f [REV] optimize tenant query api 2017-12-06 17:09:49 +08:00
bay1ts
9f7bbe2c87 [REV] optimize possible error 2017-12-06 16:45:16 +08:00
bay1ts
5987a7eacd [REV] sort response by used memory (next cpu) 2017-12-06 15:54:37 +08:00
bay1ts
5c284f9581 [REV] remove unneeded validate 2017-12-06 15:32:25 +08:00
bay1ts
3a2b82d3ca [REV] add get tenant with resource api 2017-12-06 15:26:21 +08:00
bay1ts
ee983c788d [ADD] add interface for manage service ,get all tenants with alloc res and used res from region 2017-12-06 11:13:56 +08:00
bay1ts
a522dea37a [REV] add union resource of region(expect tenant num) 2017-12-05 16:03:44 +08:00
bay1ts
1151a18aae [ADD] add region resource api;add show command 2017-12-05 14:47:36 +08:00
崔斌
3da1809760 [REV]Update swagger 2017-12-03 19:35:48 +08:00
崔斌
b998160250 [ADD]Add user token Dispatcher and token verify 2017-12-03 19:11:16 +08:00
崔斌
bf978cbd55 [REV]define plugin big class name ruls
[ADD]Add cloud auth
2017-12-01 12:40:49 +08:00
崔斌
e024081c1d [REV]Update swagger; port service for upstream 2017-11-30 18:55:11 +08:00
崔斌
ab608d5313 [REV]Update upstream plugin 2017-11-30 15:03:10 +08:00
bay1ts
23e32bbfb5 [REV] remove unused import 2017-11-29 11:54:08 +08:00
bay1ts
6db8bb3110 [REV] optimize grctl output,remove useless log in api 2017-11-29 11:53:39 +08:00
崔斌
f0103d3b8f [REV]Update code foramt 2017-11-27 18:01:04 +08:00
bay1ts
592560b98b [REV] optimize event api structure 2017-11-24 13:50:10 +08:00
bay1ts
2c64ce1ff3 [REV] optimize event api structure 2017-11-24 12:40:05 +08:00
bay1ts
c2c3783823 [REV] Optimize builder_work,update delivery type and path when got it,builder add version update api 2017-11-23 17:59:40 +08:00