Commit Graph

580 Commits

Author SHA1 Message Date
pujielan
65fd65d495 [ADD]Add timeout failure in plugin image building 2017-12-13 12:25:09 +08:00
崔斌
9963604969 [REV] Optimize plugin system 2017-12-13 12:10:53 +08:00
goodrain
6e5db326e7 [FIX] Merging branches 2017-12-12 21:56:40 +08:00
pujielan
ab86bebeec [DEL]Delete plugin env copy in region 2017-12-12 19:04:44 +08:00
崔斌
e198c80ed9 [REV] Add discover env - DISCOVER_URL when creating plugin pods 2017-12-12 15:25:47 +08:00
bay1ts
d53f2181ae Merge remote-tracking branch 'origin/master' 2017-12-12 14:07:31 +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
bay1ts
c3fad66f38 [REV] optimize task check 2017-12-12 12:47:33 +08:00
bay1ts
ff62b2b1c8 [REV] optimize init status and domain command 2017-12-12 11:52:43 +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
2ae00f07e3 [REV] optimize build api proxy in api 2017-12-12 10:14:44 +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
bay1ts
b0c2dc4342 [REV] optimize grctl show command 2017-12-11 19:41:25 +08:00
bay1ts
6a5731f0bc [REV] optimize master node update hosts file 2017-12-11 19:15:58 +08:00
bay1ts
ecce885d40 Merge remote-tracking branch 'origin/release-3.4' into release-3.4 2017-12-11 18:10:56 +08:00
goodrain
c436626b54 [FIX] fix the webcli keepalive bug 2017-12-11 17:58:26 +08:00
bay1ts
869f9d429d [REV] optimize grctl list command 2017-12-11 17:58:17 +08:00
goodrain
a3613620a7 Merge branch 'release-3.4' of code.goodrain.com:goodrain/rainbond into release-3.4 2017-12-11 17:42:02 +08:00
goodrain
398d30f43d [FIX] resolve a bug that the web console cannot enter 2017-12-11 17:41:49 +08:00
bay1ts
755e292676 [FIX] fix rule api from /v2/nodes/{} to /v2/nodes/rule/{} 2017-12-11 17:09:50 +08:00
bay1ts
4e85deffed [REV] optimize task execute 2017-12-11 16:36:16 +08:00
bay1ts
f10ed867ee Merge remote-tracking branch 'origin/release-3.4' into release-3.4 2017-12-11 15:47:54 +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
df19d9ebb6 [REV] optimize domain command in release 2017-12-11 15:38:00 +08:00
bay1ts
bb8266c6ab [REV] optimize domain command in release 2017-12-11 15:36:48 +08:00
bay1ts
b431e403b2 [REV] optimize domain command 2017-12-11 15:32:39 +08:00
bay1ts
80d1d9283e [REV] optimize domain command 2017-12-11 15:12:08 +08:00
bay1ts
b52ab794b9 [REV] add domain command 2017-12-11 14:29:36 +08:00
goodrain
9897784c96 [FIX] Merge code 2017-12-11 13:56:16 +08:00
bay1ts
4b2ca65438 [REV] optimize output 2017-12-11 12:01:47 +08:00
bay1ts
c58e7ce145 [REV] optimize task depend relation,optimize node put label api 2017-12-11 11:58:39 +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
454f1fbd7c [REV] optimize node scheduable judge by hasrule compute,not manage 2017-12-11 10:10:36 +08:00
bay1ts
6d07bdd552 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-11 10:01:55 +08:00
bay1ts
10b7c4ea17 [REV] optimize grctl task depends command;optimize install process 2017-12-11 09:47:47 +08:00
bay1ts
9479528c9d [REV] optimize grctl task depends command 2017-12-09 19:57:18 +08:00
bay1ts
db6808eca0 [REV] optimize grctl install 2017-12-08 23:31:47 +08:00
bay1ts
428bef93ed [REV] optimize status function get status by node strategy;add task dependency relation 2017-12-08 21:31:55 +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
goodrain
f18393ff26 [FIX] add task exec defaulet status 2017-12-08 18:22:07 +08:00
bay1ts
971b3366d3 [REV] optimize node role validate 2017-12-08 18:14:49 +08:00
bay1ts
c272a5e332 [REV] optimize get task strategy 2017-12-08 17:32:40 +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
bay1ts
de6b82589d [REV] optimize node's instance api 2017-12-08 13:25:21 +08:00
bay1ts
2a143117ac [REV] prepare fix etcd event error 2017-12-08 12:44:57 +08:00
崔斌
a1e1128576 [DEL]Delete fmt log 2017-12-08 11:09:33 +08:00
bay1ts
4bafd367a0 [FIX] change delivery type from code to slug 2017-12-08 10:20:50 +08:00
崔斌
9c53b383e9 [REV]Update notation 2017-12-08 10:16:29 +08:00
bay1ts
3c65e75ead Merge remote-tracking branch 'origin/release-3.4' into release-3.4 2017-12-08 09:46:45 +08:00
bay1ts
9d84fc4f6c [REV] optimize master node status 2017-12-07 23:57:33 +08:00
bay1ts
eab0d0e39b [REV] optimize remove version build status update in executer,moved to python code 2017-12-07 23:49:48 +08:00
bay1ts
33ab092774 [REV] optimize node's pods info and merge bugfix from release 2017-12-07 23:48:07 +08:00
bay1ts
405d0845f3 [REV] optimize get node's pods info 2017-12-07 23:20:55 +08:00
bay1ts
9e7977bb01 [REV] optimize code build status in version_info update strategy 2017-12-07 23:15:40 +08:00
bay1ts
acef6ce5dd [REV] optimize code commit info in version_info update strategy 2017-12-07 21:51:12 +08:00
崔斌
05d2d97496 [REV]Update api range 2017-12-07 21:32:09 +08:00
bay1ts
901c8a14bd [REV] optimize pods res in certain node 2017-12-07 21:27:06 +08:00
bay1ts
6b66077e59 Merge remote-tracking branch 'origin/master' 2017-12-07 20:01:17 +08:00
bay1ts
7c65aa13d8 [REV] optimize node status 2017-12-07 20:01:09 +08:00
崔斌
73c6b3a32d [REV]Update api http/https 2017-12-07 19:59:15 +08:00
bay1ts
fc69a1ac30 Merge remote-tracking branch 'origin/master' 2017-12-07 19:45:51 +08:00
bay1ts
a7e436e0ab [REV] optimize get pods instance in node 2017-12-07 19:45:16 +08:00
崔斌
de7226febd [DEL]Delete event log table build in api 2017-12-07 19:37:32 +08:00
崔斌
a7b98b4902 [DEL]Delete event log message 2017-12-07 19:01:41 +08:00
bay1ts
4307865181 [REV] optimize timer may cause high cpu usage 2017-12-07 18:47:33 +08:00
崔斌
850e43964e [ADD]Add err log in eventlog 2017-12-07 18:29:31 +08:00
goodrain
b8afd99806 Merge branch 'release-3.4' of code.goodrain.com:goodrain/rainbond into release-3.4 2017-12-07 18:12:26 +08:00
goodrain
198aee5258 [ADD] rbd-node add pprof debug 2017-12-07 18:12:15 +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
bay1ts
37366342c2 [REV] optimize node status 2017-12-07 16:48:30 +08:00
崔斌
47464c30a3 [REV]Update cloud auth add put get interface 2017-12-07 16:37:09 +08:00
bay1ts
f91a2749d5 [REV] optimize,list command 2017-12-07 16:11: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
15d47b4ecf Optimize:update list command 2017-12-07 16:01:12 +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
08668b9870 [REV] optimize node status 2017-12-07 15:27:57 +08:00
bay1ts
661676382d [REV] optimize node status 2017-12-07 14:53:40 +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
038fd79df8 [REV] optimize get version by buildversion to buildversion and service id 2017-12-07 13:30:22 +08:00
崔斌
cacba7dcd1 [REV]Update model 2017-12-07 12:18:28 +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
崔斌
d7962849c9 [REV] Update region api class union primary key 2017-12-07 11:57:16 +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
bb9ed5ad2c Merge remote-tracking branch 'origin/release-3.4' into release-3.4 2017-12-06 18:34:14 +08:00
bay1ts
e0eaa37167 [REV] update log 2017-12-06 18:33:50 +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
goodrain
e6b5cb3eb5 Merge branch 'release-3.4' of code.goodrain.com:goodrain/rainbond into release-3.4 2017-12-06 15:33:58 +08:00
goodrain
e659850a2a [FIX] Resolve failed bugs in stateful service service storage 2017-12-06 15:33:35 +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
478ac0dfca [REV] optimize full resource api,optimize node status 2017-12-05 18:14:01 +08:00
bay1ts
840d728c00 [REV] optimize grctl list command 2017-12-05 16:32:34 +08:00
bay1ts
a522dea37a [REV] add union resource of region(expect tenant num) 2017-12-05 16:03:44 +08:00
bay1ts
25a685c9f6 [FIX] fix when get version failed; 2017-12-05 15:21:49 +08:00
bay1ts
f2e3204d5c [REV] optimize get node by ip 2017-12-05 15:12:41 +08:00
bay1ts
c4d26110fa [REV] optimize get node by ip 2017-12-05 15:02:43 +08:00
bay1ts
6dbf4a57cb [REV] optimize compute node install function 2017-12-05 14:59:33 +08:00
bay1ts
1151a18aae [ADD] add region resource api;add show command 2017-12-05 14:47:36 +08:00
bay1ts
7c77f6c39a [FIX] fix when build complet,update version_info status failed cause nil pointer 2017-12-05 14:23:22 +08:00
bay1ts
fe18084b6c [ADD] add cluster cap resource api 2017-12-05 14:06:18 +08:00
bay1ts
a5cb32947f [FIX] fix Possible error when publish app 2017-12-05 12:25:24 +08:00
bay1ts
7d59c96392 [FIX] fix Possible error when publish app 2017-12-05 12:22:07 +08:00
bay1ts
801c8a1178 Merge remote-tracking branch 'origin/master' 2017-12-05 12:11:47 +08:00
bay1ts
9f08c6ef87 [FIX] fix Possible out of range error 2017-12-05 12:11:39 +08:00
bay1ts
968b46ad1f [FIX] fix Possible out of range error 2017-12-05 12:10:28 +08:00
bay1ts
c417c96a67 [FIX] fix Possible out of range error 2017-12-05 12:04:48 +08:00
崔斌
33afb152b5 [REV]Update image cloud share 2017-12-05 12:00:03 +08:00
崔斌
89ebbf2857 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-05 11:55:56 +08:00
崔斌
29bad7cfb6 [REV]Update service model 2017-12-05 11:55:39 +08:00
bay1ts
b0d9102e83 [FIX] fix Possible out of range error 2017-12-05 11:49:59 +08:00
bay1ts
cb56e1591e [REV] optimize task storage 2017-12-05 10:45:29 +08:00
bay1ts
0451566159 [FIX] Fix not enough arguments problem 2017-12-04 18:12:48 +08:00
bay1ts
8b26744a31 [FIX] Fix not enough arguments problem 2017-12-04 17:48:20 +08:00
bay1ts
120f037aa5 [REV] optimize task execute strategy 2017-12-04 17:09:55 +08:00
bay1ts
52ca119112 [REV] reverse to old version 2017-12-04 15:49:43 +08:00
bay1ts
bfc1b0c747 [REV] optimize grctl ,support get node by ip/id in one cmd 2017-12-04 14:56:25 +08:00
bay1ts
cc409a7daf [REV] optimize output when execute task 2017-12-04 14:27:04 +08:00