Commit Graph

310 Commits

Author SHA1 Message Date
goodrain
277cfb9aea [FIX] Scheduling test modification 2017-12-20 10:23:55 +08:00
goodrain
0a3f2747c2 [FIX] Complete the basic v2 task scheduling test 2017-12-19 18:46:49 +08:00
goodrain
42afa03e72 [FIX] Merge branch 'release-3.4' 2017-12-18 18:50:10 +08:00
pujielan
739091c23e [FIX]Fix cant delete service error bug
## Process trans service records to a table named “tenant_services_delete” when user delete their service.
## This problem will appear if the count of the  “delete table”(s) records larger than service table(s).
2017-12-18 16:48:57 +08:00
goodrain
b665fa0237 [FIX] Unified service registry logic
resolve bug #11
2017-12-18 14:44:25 +08:00
pujielan
e8cccc305b [FIX]Fix cant delete service error bug
## Process trans service records to a table named “tenant_services_delete” when user delete their service.
## This problem will appear if the count of the  “delete table”(s) records larger than service table(s).
2017-12-18 14:11:43 +08:00
pujielan
3f3bf9b3b0 [ADD]Add cloud auth annotation 2017-12-18 11:05:56 +08:00
pujielan
8899c8bbac [REV] compatibility old interface eid tenant_name 2017-12-15 19:02:35 +08:00
pujielan
2af927d022 [REV] compatibility old interface eid tenant_name 2017-12-15 19:01:14 +08:00
pujielan
a2c875d661 [REV] compatibility old interface eid tenant_name 2017-12-15 18:54:08 +08:00
bay1ts
a9153e7437 [REV] merge from code 2017-12-15 16:49:24 +08:00
bay1ts
59a544c6b4 [FIX] fix deploy version,match chaos,use upgrade 2017-12-15 14:32:30 +08:00
pujielan
8c7aed3d3f [DEL]Delete plugin default env in region 2017-12-15 12:22:14 +08:00
pujielan
115328e08a [REV] Optimize plugin system 2017-12-14 17:33:14 +08:00
pujielan
7861db5f98 [REV]Update rainbond lds cds sds server 2017-12-14 16:33:45 +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
36fc1ce593 [REV] optimize build api proxy in api 2017-12-12 11:21:34 +08:00
bay1ts
67e531820a Merge remote-tracking branch 'origin/master' 2017-12-12 10:07:55 +08:00
bay1ts
76cf3e527f [REV] optimize build api proxy in api 2017-12-12 10:07:25 +08:00
崔斌
683d535453 [DEL]Update event_id remove required
[REV]Update plugin table add json annotation
2017-12-11 15:47:43 +08:00
bay1ts
eb73a38f59 [REV] optimize get task api,optimize show command,optimize install status command,optimize node status 2017-12-11 11:51:28 +08:00
bay1ts
66f6db7361 [REV] optimize grctl show command 2017-12-11 11:10:36 +08:00
bay1ts
6d07bdd552 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-11 10:01:55 +08:00
bay1ts
db6808eca0 [REV] optimize grctl install 2017-12-08 23:31:47 +08:00
崔斌
cdbd46c6da [REV]Update validate time while recreate token 2017-12-08 18:53:53 +08:00
崔斌
f0a43de3b9 [REV]Update cloud auth show table format 2017-12-08 18:47:55 +08:00
崔斌
c68f30daad [ADD]Add grcth auth command 2017-12-08 17:14:12 +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
崔斌
05d2d97496 [REV]Update api range 2017-12-07 21:32:09 +08:00
崔斌
73c6b3a32d [REV]Update api http/https 2017-12-07 19:59:15 +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
崔斌
6201d9a95c [REV]Update https 2017-12-07 17:15:03 +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
c2269ac74d [REV] optimize,merge new code 2017-12-07 16:05:59 +08:00
bay1ts
acc834d0b8 Optimize:merge dev to tenant_manage 2017-12-07 15:45:21 +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
8f3eb99c92 [REV] optimize get tenant by name 2017-12-07 13:36:56 +08:00
bay1ts
9d46c69ee2 [REV] optimize get tenant by name 2017-12-07 12:14:01 +08:00
bay1ts
f0039cb603 [REV] optimize get tenant by name 2017-12-07 12:08:25 +08:00
bay1ts
7faa677b00 [REV] temp 2017-12-07 11:44:56 +08:00
崔斌
803f0e1aee [ADD]Add api-addr-ssl port 2017-12-07 11:14:02 +08:00
bay1ts
3d35f8b3db [REV] optimize args validate 2017-12-07 11:07:51 +08:00
崔斌
2c2575dc09 [REV]Update swagger 2017-12-07 10:53:29 +08:00
崔斌
2699573e79 [FIX]Fix eid bug 2017-12-07 10:48:10 +08:00
崔斌
9c5764a3c1 [REV]Update eid get 2017-12-07 10:42:32 +08:00
崔斌
5f7f63ae42 [REV]Update eid required 2017-12-07 10:16:42 +08:00
崔斌
48bb9e7745 [REV]Update eid string required 2017-12-07 10:09:32 +08:00
崔斌
dc053301dc [REV]API ingress auth 2017-12-07 09:56:08 +08:00
goodrain
ffc1b575a8 [FIX] Merge release-3.4 2017-12-07 09:50:00 +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
9c387c15c8 [REV] optimize paged resource 2017-12-06 23:57:31 +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
94c3b2426d [REV] sort response by used memory (next cpu) 2017-12-06 15:57:28 +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
崔斌
33afb152b5 [REV]Update image cloud share 2017-12-05 12:00:03 +08:00
崔斌
29bad7cfb6 [REV]Update service model 2017-12-05 11:55:39 +08:00
崔斌
2edbe5e516 [REV]Update set cloud share “app-image” add serviceID to get image-name 2017-12-04 12:33:10 +08:00
崔斌
a019058c75 [REV]Add required in request params 2017-12-04 10:37:43 +08:00
崔斌
aa19c50eda [REV] Update record length 2017-12-04 09:57:26 +08:00
崔斌
22f5f0f887 [REV]Update sql 2017-12-03 22:35:01 +08:00
崔斌
b563245ed1 [REV]Update swagger and sql record 2017-12-03 21:56:21 +08:00
崔斌
3da1809760 [REV]Update swagger 2017-12-03 19:35:48 +08:00
崔斌
491b6c57ec [REV]Update swagger 2017-12-03 19:16:00 +08:00
崔斌
a23ed07709 [REV]Update chi package import 2017-12-03 19:13:19 +08:00
崔斌
b998160250 [ADD]Add user token Dispatcher and token verify 2017-12-03 19:11:16 +08:00
崔斌
b40619c34c [FIX]Fix update port bug 2017-12-01 18:54:53 +08:00
bay1ts
db8fc40311 Merge remote-tracking branch 'origin/master' 2017-12-01 14:44:16 +08:00
bay1ts
3f25400484 [REV] optimize builder--version_info ,add column image_name standfor image_name,include slug.optimize when create pod,get slug info from version info ,not tenantservice. 2017-12-01 14:26:49 +08:00
崔斌
bf978cbd55 [REV]define plugin big class name ruls
[ADD]Add cloud auth
2017-12-01 12:40:49 +08:00
bay1ts
cdafb6aedf Merge remote-tracking branch 'origin/master' 2017-12-01 12:04:24 +08:00
bay1ts
bf3e0223f7 [REV] optimize list command,group node role;get command rich output;version delete interface add delete image functioin 2017-12-01 11:38:46 +08:00
崔斌
e024081c1d [REV]Update swagger; port service for upstream 2017-11-30 18:55:11 +08:00
bay1ts
fe9866a63c [REV] optimize error message when grctl is down 2017-11-30 18:16:22 +08:00
崔斌
d8e1254c54 [Fix]Fix bug mapping port delete 2017-11-30 15:35:14 +08:00
bay1ts
e2ed797358 Merge remote-tracking branch 'origin/master' 2017-11-30 15:16:31 +08:00
bay1ts
776f0f76aa [ADD] add task/group implement,grctl exit when failed 2017-11-30 15:16:22 +08:00
崔斌
3bffb7e3c0 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-30 15:03:47 +08:00
崔斌
ab608d5313 [REV]Update upstream plugin 2017-11-30 15:03:10 +08:00
bay1ts
5dc96492f3 [REV] grctl add task interface,fix err get task from etcd 2017-11-30 14:43:24 +08:00
bay1ts
f974c7a837 [REV] protect from nil panic 2017-11-29 23:19:06 +08:00
bay1ts
aed7497df3 [REV] allow re-get status of provided taskID,or auto get executing task 2017-11-29 18:44:39 +08:00
bay1ts
2f586c574c [REV] return to yestday task_engine code 2017-11-29 17:13:42 +08:00
bay1ts
4f0080e3a7 [REV] optimize grctl ,optimize task status storage and load strategy 2017-11-29 13:42:12 +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
bay1ts
ffb9557f14 [FIX] fix check status may cause nil pointer problem 2017-11-29 11:16:51 +08:00
bay1ts
5cf1757394 [REV] update init strategy and output 2017-11-29 10:38:53 +08:00
bay1ts
44ba4c1c6c [REV] optimize task storage strategy,update init strategy 2017-11-29 09:43:37 +08:00
崔斌
d806546d1a [REV] Update builder dockerfile
[REV] Update plugin upstream model

[REV] Update swagger
2017-11-28 18:58:07 +08:00
bay1ts
dd9f56c9e0 [FIX] fix null node cause panic 2017-11-28 18:21:03 +08:00
bay1ts
b1a4406d0d [FIX] fix null node cause panic 2017-11-28 18:17:22 +08:00
bay1ts
824020e171 [REV] optimize init strategy,change to call install by grctl 2017-11-28 18:04:21 +08:00
bay1ts
b560458177 [REV] remove init cluster structed output for now,opt output 2017-11-28 16:33:11 +08:00
bay1ts
523ef09097 [REV] when add node failed add condition to node ,optimize output 2017-11-28 15:35:29 +08:00
bay1ts
a92b419a50 [REV] optimize possible get task status mistake 2017-11-28 12:07:35 +08:00
bay1ts
188a889356 [REV] optimize basic output 2017-11-28 11:22:04 +08:00
bay1ts
93c7aa1309 [REV] optimize get status function 2017-11-27 19:24:59 +08:00
bay1ts
20b42c5a0e Merge remote-tracking branch 'origin/master' 2017-11-27 18:49:05 +08:00
bay1ts
f88ddae8ea [REV] add log to locate bug location 2017-11-27 18:48:51 +08:00
崔斌
f0103d3b8f [REV]Update code foramt 2017-11-27 18:01:04 +08:00
bay1ts
31d0caec6c [FIX] remove useless import 2017-11-27 15:59:02 +08:00
bay1ts
50a4567fe1 [REV] add simple label command,fix single quote in command cause exec failed 2017-11-27 15:18:05 +08:00
bay1ts
e3906e2646 [REV] add init remote endpoint node cmd 2017-11-27 13:39:22 +08:00
bay1ts
4314e84e3a [REV] optimize add node sdk 2017-11-27 12:06:28 +08:00
崔斌
d363741cad [REV]Optimizing plugins struct & plugins action process 2017-11-24 18:23:35 +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
2ad25eb16b Merge remote-tracking branch 'origin/master' 2017-11-24 11:22:51 +08:00
bay1ts
47f8129e0e [FIX] fix can't find version info when share in cloud.add event query interface 2017-11-24 11:21:51 +08:00
goodrain
defcd62e74 [FIX] resolve path 2017-11-24 11:10:15 +08:00
goodrain
0b475cee7e Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-24 11:05:28 +08:00
goodrain
d349f5f32b [FIX] api add /etcd/event-log/instance support 2017-11-24 11:05:23 +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
bay1ts
fb352fa4cb [REV] Optimize output of command list 2017-11-23 16:13:45 +08:00
bay1ts
2bb21937e1 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-23 15:49:02 +08:00
bay1ts
c916824100 [REV] optimize node sdk err handle ,optimize command level structure,include status/install and node command 2017-11-23 15:05:46 +08:00
崔斌
0ad1575ca4 [FIX]Fix bug about discover body unmashal error 2017-11-23 15:03:29 +08:00
崔斌
7378adaa5e [REV]Update grctl sources command 2017-11-23 12:12:00 +08:00
bay1ts
da0972758c [REV] optimize appp publish ,add status prop 2017-11-23 11:35:05 +08:00
bay1ts
69ef555716 [REV] optimize event ,in one event,but multi action,allow pass throth 2017-11-23 09:57:25 +08:00
bay1ts
9844ae172a [ADD] add region node manage commands 2017-11-22 18:46:17 +08:00
bay1ts
5f2364bf70 [REV] add log 2017-11-22 17:49:13 +08:00
bay1ts
9f1274b9af [REV] add log 2017-11-22 17:29:49 +08:00
bay1ts
e6b1047f37 [REV] add log 2017-11-22 17:27:56 +08:00
bay1ts
b82351f72a [REV] add log 2017-11-22 17:20:35 +08:00
bay1ts
81be26bfec Merge remote-tracking branch 'origin/master' 2017-11-22 17:00:39 +08:00