Commit Graph

3162 Commits

Author SHA1 Message Date
barnettZQG
1ff27b8e8e
Merge pull request #208 from GLYASAI/V5.0
[FIX] wrong Dockerfile ARGs
2019-01-27 11:17:08 +08:00
GLYASAI
805d48eedb [FIX] wrong Dockerfile ARGs 2019-01-27 10:47:15 +08:00
barnett
4c70b1d820 [FIX] fix parse dockerfile arg param bug 2019-01-26 17:46:26 +08:00
barnett
807df13f53 Merge branch 'V5.0' of https://github.com/goodrain/rainbond into V5.0 2019-01-26 10:40:06 +08:00
barnett
7a5ddf08dc [FIX] fix uncounted disk bugs 2019-01-26 10:39:51 +08:00
barnettZQG
851e99bc34
Merge pull request #205 from GLYASAI/V5.0
[FIX] wrong ip address
2019-01-26 10:38:24 +08:00
GLYASAI
f39917d585 [FIX] wrong ip address 2019-01-26 01:26:11 +08:00
barnettZQG
1fb062b0ab
Merge pull request #204 from GLYASAI/V5.0
get disk info from prometheus
2019-01-26 00:07:50 +08:00
GLYASAI
64794c109d [REV] get disk info from prometheus 2019-01-25 23:34:12 +08:00
GLYASAI
4af443d482 [FIX] wrong used memory 2019-01-25 22:05:38 +08:00
barnett
69dda368e9 [FIX] fix app status not sync bug and add cpu set es 2019-01-25 21:11:03 +08:00
barnett
098ad6857f [ADD] support set cadvisor listen port in monitor 2019-01-25 19:00:48 +08:00
barnett
b7a67a9659 Merge branch 'V5.0' of https://github.com/goodrain/rainbond into V5.0 2019-01-25 18:50:10 +08:00
barnett
d6dff59f33 [FIX] fix node role do not update bug 2019-01-25 18:49:40 +08:00
barnettZQG
67849094b2
Merge pull request #203 from GLYASAI/V5.0
also return fail version info
2019-01-25 18:40:03 +08:00
GLYASAI
dc081e9662 [FIX] only return success version info 2019-01-25 14:37:30 +08:00
barnettZQG
811baa00ad
Merge pull request #201 from GLYASAI/V5.0
modify the logic of PriChargeSverify
2019-01-24 18:44:57 +08:00
GLYASAI
96ca1a8cd4 [REV] modify the logic of PriChargeSverify 2019-01-24 17:20:01 +08:00
GLYASAI
895df0d40e [REV] allocatable memory should subtract allocated memory 2019-01-24 14:25:42 +08:00
barnett
7a23fc874a [FIX] fix sub docker log websocket periodic disconnect bug 2019-01-24 14:24:09 +08:00
barnettZQG
87c784bcdf
Merge pull request #200 from GLYASAI/V5.0
tenant resource
2019-01-24 13:44:06 +08:00
GLYASAI
33f55ccd13 [REV] verifies if the resources requested in the private cloud are legal 2019-01-24 11:28:17 +08:00
GLYASAI
eeffbc7ba9 [Rev] get allocatable memory if there is no limit memory 2019-01-24 10:31:19 +08:00
ysicing
4fd7345e42
Merge pull request #198 from GLYASAI/V5.0
[FIX] blob upload unknown
2019-01-21 17:09:59 +08:00
GLYASAI
d36053c7be [FIX] blob upload unknown 2019-01-21 15:59:27 +08:00
barnettZQG
d71b26672d
Merge pull request #197 from GLYASAI/V5.0
[FIX] return rainbond version
2019-01-17 21:37:44 +08:00
GLYASAI
40e79c272f Merge branch 'V5.0' of https://github.com/GLYASAI/rainbond into V5.0 2019-01-17 15:10:55 +08:00
GLYASAI
555ea151ea [FIX] error building service with config file 2019-01-17 15:10:28 +08:00
黄润豪
d77772c979
Merge branch 'V5.0' into V5.0 2019-01-16 22:11:06 +08:00
GLYASAI
4dcd8d2f65 [FIX] return rainbond version 2019-01-16 21:09:35 +08:00
barnettZQG
557422b536
Merge pull request #196 from GLYASAI/V5.0
[FIX] default rule don't work with header or cookie rule
2019-01-16 16:20:36 +08:00
GLYASAI
e12f4fc42c [FIX] default rule don't work with header or cookie rule 2019-01-16 15:56:40 +08:00
barnettZQG
8d2949087f
Merge pull request #195 from GLYASAI/V5.0
[REV] change the length of certificate and private_key
2019-01-16 09:37:12 +08:00
GLYASAI
45f0d48dd6 [REV] change the length of certificate and private_key to contains more characters 2019-01-16 00:15:33 +08:00
barnettZQG
6ebf0db503
Merge pull request #194 from GLYASAI/V5.0
[REV] ignore wrong port end hostip for endpoint
2019-01-15 21:03:57 +08:00
GLYASAI
d23df0b95e [ADD] show rainbond version 2019-01-15 19:29:54 +08:00
GLYASAI
5bb18ea85f [REV] ignore wrong port end hostip for endpoint 2019-01-15 18:53:42 +08:00
barnettZQG
c59e93015b
Merge pull request #193 from GLYASAI/V5.0
[REV] filter the wrong endpoint from etcd
2019-01-15 14:52:50 +08:00
barnett
4855791f36 [FIX] fix the service log first byte scrambling problem 2019-01-15 14:34:35 +08:00
GLYASAI
c286ae0dba [REV] filter the wrong endpoint from etcd 2019-01-15 14:34:06 +08:00
barnettZQG
e4756dd226
Merge pull request #191 from GLYASAI/V5.0
[FIX] deploment has no configmap while updating
2019-01-11 14:59:49 +08:00
GLYASAI
730d96211b [FIX] deploment has no configmap while updating 2019-01-11 13:41:50 +08:00
barnettZQG
b053a10798
Merge pull request #190 from GLYASAI/V5.0
[FIX] wrong number of running apps
2019-01-11 12:27:02 +08:00
GLYASAI
2a4f7c3816 [FIX] wrong number of running apps 2019-01-11 11:55:04 +08:00
barnett
46b3cdf720 [REV] merge new feature to 5.0 2019-01-10 18:58:22 +08:00
barnettZQG
45f39e008d
Merge pull request #189 from GLYASAI/master
Add config file
2019-01-09 22:21:27 +08:00
GLYASAI
6480a7b693 [REV] only share configmap volume template 2019-01-09 19:14:55 +08:00
barnettZQG
0d757c6afc
Merge pull request #183 from SpandaCloudPlatform/V5.0
[ADD] Initializing the cluster allows to ignore system checks
2019-01-09 17:22:53 +08:00
barnettZQG
76580ced63
Merge pull request #187 from GLYASAI/V5.0
Fix wrong number for memory
2019-01-09 17:22:40 +08:00
GLYASAI
8d49db463e [DEL] delete missing code 2019-01-09 17:03:48 +08:00