Commit Graph

3387 Commits

Author SHA1 Message Date
barnett
0ad0e4f034 merge code 2019-04-01 15:55:44 +08:00
barnett
d9667cb3c0 merge V5.1 to master 2019-04-01 15:54:02 +08:00
barnettZQG
a1d5965ca4
Merge pull request #265 from GLYASAI/RAINBOND-835
[ADD] endpoints for grctl service get
2019-03-31 21:19:42 +08:00
huangrh
719fb0de12 [FIX] merge error 2019-03-31 14:13:28 +08:00
黄润豪
a7b7e7512b
Merge branch 'V5.1' into RAINBOND-835 2019-03-31 14:10:21 +08:00
huangrh
4cf226e4ce [ADD] endpoints for grctl service get 2019-03-31 14:05:55 +08:00
barnett
2c49325980 Merge branch 'V5.1' of https://github.com/goodrain/rainbond into V5.1 2019-03-31 13:17:10 +08:00
barnett
fa831cabf0 fix probe disable invalid bug 2019-03-31 13:03:38 +08:00
barnettZQG
b76d47b625
Merge pull request #264 from GLYASAI/RAINBOND-837
[FIX] free endpoints were removed by controller-manager
2019-03-31 09:15:06 +08:00
huangrh
18bdc929a8 [REV] remove flag real-port 2019-03-31 08:35:15 +08:00
huangrh
2320e1d962 [REV] find the associated endpoints by the name of the service 2019-03-31 02:17:07 +08:00
huangrh
3636855e13 [FIX] free endpoints were removed by controller-manager 2019-03-31 02:15:41 +08:00
ysicing
b315949ab8
[REV] update travis ci default version 2019-03-29 22:21:09 +08:00
ysicing zheng
d6942025fe [REV] update travis ci 2019-03-29 22:17:27 +08:00
barnett
da2476fbc4 change plugin image domain name 2019-03-29 18:28:35 +08:00
barnett
23fa8eca48 Specification of internal image registry domain 2019-03-29 18:28:01 +08:00
barnett
28c90fb025 Fix the ID of the default mesh plugin 2019-03-29 17:53:50 +08:00
黄润豪
bf08148d57
Merge pull request #19 from goodrain/V5.1
V5.1
2019-03-29 17:23:49 +08:00
barnettZQG
446d136cdc
Merge pull request #262 from GLYASAI/compose
Fix exported docker-compose.yaml problem
2019-03-29 17:15:45 +08:00
barnettZQG
27d50503b5
Merge pull request #263 from GLYASAI/RAINBOND-817
[FIX] ingress not found
2019-03-29 17:15:21 +08:00
huangrh
a476df8262 [FIX] ingress not found 2019-03-29 11:08:47 +08:00
黄润豪
0fe2d9b499
Merge pull request #18 from goodrain/V5.1
V5.1
2019-03-28 17:45:19 +08:00
barnettZQG
283ea4490b
Merge pull request #261 from GLYASAI/probe
[REV] update third-party probe and delete no need Endpoints deletion
2019-03-28 17:27:45 +08:00
barnettZQG
83e2b50858
Merge pull request #260 from GLYASAI/RAINBOND-826
[FIX] probe not found
2019-03-28 16:38:12 +08:00
barnettZQG
6c1457ad49
Merge pull request #259 from GLYASAI/RAINBOND-793
[ADD] api to list labels
2019-03-28 16:37:20 +08:00
barnettZQG
b1e59bfa0c
Merge pull request #253 from GLYASAI/compose
Fix two docker-compose.yaml problem
2019-03-28 16:35:49 +08:00
黄润豪
412603d91a
Merge pull request #17 from goodrain/V5.1
V5.1
2019-03-28 16:11:09 +08:00
barnettZQG
30ab3f1232
Merge pull request #258 from GLYASAI/RAINBOND-818
[FIX] invalid value for ingress path
2019-03-28 15:51:33 +08:00
barnettZQG
1d484c9827
Merge pull request #257 from GLYASAI/rulecfg
[FIX] invalid ingress
2019-03-28 15:50:45 +08:00
huangrh
f191667480 [DEL] delete no need corev1.Endpoints deletion 2019-03-28 15:44:58 +08:00
huangrh
62b9f8df86 [FIX] probe not found 2019-03-28 15:39:32 +08:00
huangrh
4ab66499b2 [ADD] api to list labels 2019-03-28 15:35:00 +08:00
huangrh
580e5a4924 [FIX] final image name 2019-03-28 14:15:46 +08:00
黄润豪
3b0746862a
Merge pull request #16 from goodrain/V5.1
V5.1
2019-03-28 14:05:16 +08:00
huangrh
c27cc382ca [REV] allow empty value for nginx proxy_set_header 2019-03-28 11:21:59 +08:00
huangrh
c0cf47ada4 [FIX] invalid value for ingress path 2019-03-28 09:57:37 +08:00
huangrh
e90e2608ea [REV] chage probe upgrade from stop probe & add probe to update probe directly 2019-03-28 09:18:43 +08:00
huangrh
f3b7ede453 [FIX] wrong endpoints name for inner service 2019-03-27 17:14:56 +08:00
huangrh
d730e3506a [FIX] wrong image in docker-compose.yaml 2019-03-27 16:04:50 +08:00
barnettZQG
2089e613ab
Merge pull request #255 from GLYASAI/RAINBOND-812
[FIX] nil pointer dereference
2019-03-27 14:40:17 +08:00
huangrh
59fff24ef3 [FIX] invalid ingress 2019-03-27 12:17:32 +08:00
huangrh
ce57b9afcd [FIX] merge error 2019-03-27 12:09:14 +08:00
黄润豪
71af2cfe2f
Merge pull request #15 from goodrain/V5.1
V5.1
2019-03-27 11:45:04 +08:00
barnettZQG
3f9c232dc8
Merge pull request #252 from GLYASAI/RAINBOND-768
[REV] update the judgment of the equality of nginx configuration files
2019-03-26 22:28:06 +08:00
huangrh
9d47fae53e [ADD] add depend_on for docker-compose 2019-03-26 15:48:15 +08:00
huangrh
df131acae6 [FIX] application exported docker-compose environment variable is not complete 2019-03-26 11:07:06 +08:00
huangrh
de76bf7a82 [REV] update the judgment of the equality of nginx configuration files 2019-03-25 20:24:26 +08:00
barnettZQG
13465ef2b8
Merge pull request #250 from GLYASAI/RAINBOND-758
[ADD] verify the IP of the third-party service instance
2019-03-25 18:09:38 +08:00
barnettZQG
b9294bca6b
Merge pull request #249 from GLYASAI/RAINBOND-786
[FIX] gorm ignore zero value("") when updating
2019-03-25 18:07:44 +08:00
huangrh
043f47af5f [ADD] verify the IP of the third-party service instance 2019-03-25 16:30:42 +08:00