goodrain
84a10e0785
Merge branch 'master'
2017-12-24 22:58:51 +08:00
goodrain
f636a29a94
Merge branch 'release-3.4'
...
# Conflicts:
# pkg/builder/api/router.go
# pkg/grctl/cmd/node.go
2017-12-24 22:58:20 +08:00
pujielan
a984923ed3
Merge branch 'master' into cuib-local-master
2017-12-24 22:57:18 +08:00
goodrain
24e1163035
[ADD] support set container hostname use env HOSTNAME
2017-12-24 22:57:11 +08:00
pujielan
ac2262bf75
[REV] Optimize function result code and msg
2017-12-24 22:40:15 +08:00
pujielan
8088fada79
[FIX]Fix etcd connection in define resource
2017-12-24 21:26:21 +08:00
Bay
6eda29736c
[REV] cancel publish callback to console
2017-12-22 18:20:48 +08:00
goodrain
a69933088c
Merge branch 'master' of https://github.com/goodrain/rainbond
2017-12-21 10:24:11 +08:00
goodrain
0b7b7d4aa5
[FIX] fix node metric don't include filesystem and disk
2017-12-21 10:23:59 +08:00
pujielan
7c9a1641d0
Merge branch 'master' into cuib-local-master
2017-12-21 09:56:38 +08:00
goodrain
45a8ce23f5
[FIX] fix mqcli build bug
2017-12-20 22:00:21 +08:00
pujielan
86f9f446a6
[ADD]Add tenant event log
2017-12-20 19:04:09 +08:00
pujielan
f3cddb257e
Merge branch 'master' into cuib-local-master
2017-12-20 15:21:54 +08:00
pujielan
68f37b0f39
[FIX]Fix config_envs annotation
2017-12-20 15:19:56 +08:00
bay1ts
28da841b50
[REV] optimize grctl node un/re scheduable command,node who have compute can exec this cmd
2017-12-19 10:15:34 +08:00
goodrain
42afa03e72
[FIX] Merge branch 'release-3.4'
2017-12-18 18:50:10 +08:00
pujielan
610f5ed888
Merge branch 'release-3.4' of github.com:goodrain/rainbond into release-3.4
2017-12-18 16:49:26 +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
ysicing
d86252512e
[FIX] Adjust k8s check
2017-12-18 16:48:35 +08:00
goodrain
82bcc68b23
[FIX] webcli register hostip not use 127.0.0.1
2017-12-18 15:37:41 +08:00
goodrain
fbb944b875
[FIX] remove container after build
2017-12-18 14:59:29 +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
ysicing
622dc145d5
[FIX] resolved #4 Node ip unconventional intranet ip
2017-12-15 18:57:47 +08:00
pujielan
a2c875d661
[REV] compatibility old interface eid tenant_name
2017-12-15 18:54:08 +08:00
bay1ts
bb6394c961
Merge branch 'release-3.4' of https://github.com/goodrain/rainbond into release-3.4_github
2017-12-15 18:40:55 +08:00
bay1ts
95dbaca4c2
[REV] merge from master
2017-12-15 17:25:09 +08:00
bay1ts
9b19df72a5
[REV] merge from master
2017-12-15 17:23:59 +08:00
bay1ts
ebee1dacfc
[FIX] remove useless import
2017-12-15 17:13:54 +08:00
goodrain
d9a7a2aa7e
[FIX] Merge branch release-3.4 to master
2017-12-15 17:07:55 +08:00
goodrain
ef3d55414c
[FIX] Apply state judgment to shutdown and restart operations.Ignore the closing error that has been closed
2017-12-15 16:59:12 +08:00
bay1ts
cb3331bfc0
[REV] merge from code
2017-12-15 16:55:17 +08:00
bay1ts
a9153e7437
[REV] merge from code
2017-12-15 16:49:24 +08:00
bay1ts
beb4790cc5
Merge branch 'release-3.4' of https://github.com/goodrain/rainbond into release-3.4_github
2017-12-15 15:50:21 +08:00
pujielan
4964ce9ec8
[FIX]Fix bug: sds server cant get current service resources which opened 1 outer port only
2017-12-15 15:24:30 +08:00
bay1ts
18917bb014
[FIX] fix update version_info from executer to chaos:py;fix grctl node list command,ready column to real k8s condiction;fix schedulable info when get node;optimize create pod strategy in worker, check image_name strongly;
2017-12-15 14:57:17 +08:00
pujielan
817ddc65c6
[REV]Add port_protocol label in service building
2017-12-15 14:52:42 +08:00
bay1ts
59a544c6b4
[FIX] fix deploy version,match chaos,use upgrade
2017-12-15 14:32:30 +08:00
bay1ts
a6953fd108
[FIX] remove builder service reg;change deploy api from start to upgrade;update build api;add try catch in chaos
2017-12-15 14:17:02 +08:00
goodrain
4c81880c4c
[FIX] task exec log print to file
2017-12-15 12:27:03 +08:00
pujielan
8c7aed3d3f
[DEL]Delete plugin default env in region
2017-12-15 12:22:14 +08:00
pujielan
f25454c082
[FIX]Fix container cmd bug
2017-12-15 00:28:25 +08:00
pujielan
fc2fad6d06
[FIX] Fix c s l server name length must within 60
2017-12-14 22:34:33 +08:00
goodrain
c65add860b
[FIX] Increases the default timeout for the startup operation
2017-12-14 22:17:09 +08:00
goodrain
90c05d23c5
[FIX] resolve event not update error bug when shell error
2017-12-14 21:59:59 +08:00
pujielan
c170dde394
[FIX] Fix c s l server name length must within 60
2017-12-14 19:24:09 +08:00
goodrain
136d13d983
[FIX] set time when task scheduler failure
2017-12-14 18:33:43 +08:00
