Commit Graph

608 Commits

Author SHA1 Message Date
GLYASAI
bfc2b9df27 [FIX] failed to listing pods 2019-08-30 20:16:56 +08:00
凡羊羊
5ef9fac1a5 remove resource check in wrapEL 2019-08-30 17:23:28 +08:00
凡羊羊
1a7cc88d38 update resource checkout rule 2019-08-30 17:00:49 +08:00
曾庆国
a50971a050 merge branch master to 5.1 2019-08-30 09:33:10 +08:00
凡羊羊
bccd31bdef just set rule-config as syn event type 2019-08-29 20:18:13 +08:00
凡羊羊
ebb0a278fc fix rule-config bugs, add event_id 2019-08-29 19:33:54 +08:00
凡羊羊
6e91819cbb add param operator into model.BeatchOperationRequestStruct for save operator, and remove unuseful test case 2019-08-28 23:01:12 +08:00
凡羊羊
e7a75d5899 save operator when handle event 2019-08-28 19:53:52 +08:00
凡羊羊
a1c3fb3e43 just use [do]-service 2019-08-28 15:58:01 +08:00
凡羊羊
42d6cdfe72 Merge branch 'fix/batchopevent' of https://github.com/fanyangyang/rainbond into fix/batchopevent 2019-08-28 10:33:25 +08:00
凡羊羊
cdf91ad3c8 mdify batch-upgrade-service 2019-08-28 10:33:07 +08:00
凡羊羊
8bfde9ce15
Merge branch 'master' into fix/batchopevent 2019-08-27 22:34:28 +08:00
凡羊羊
04065038f7 modify batch op 2019-08-27 20:07:02 +08:00
barnettZQG
00050cfe1a
Merge pull request #398 from fanyangyang/fix/repeatop
can not process event return 409
2019-08-27 06:29:46 -05:00
barnettZQG
d55c65cb07
Merge pull request #397 from GLYASAI/codebranch
[FIX] no branch for code info
2019-08-27 06:29:03 -05:00
凡羊羊
a3db19289c batch operation add event, and modify WrapEL 2019-08-27 17:42:33 +08:00
凡羊羊
32305a16da can not process event return 409 2019-08-27 11:47:33 +08:00
GLYASAI
249f2ab9c5 [FIX] no branch for code info 2019-08-27 11:29:23 +08:00
凡羊羊
f972ee8962 fix event status check error 2019-08-26 18:19:50 +08:00
凡羊羊
bb1d3c0c9b
Merge branch 'master' into fix/probe 2019-08-26 13:49:42 +08:00
凡羊羊
0495e2b06b fix probe event bugs, return code = 200 when success 2019-08-26 11:55:37 +08:00
黄润豪
09c1bc3862
Merge branch 'master' into podstatus 2019-08-26 11:24:54 +08:00
GLYASAI
0072127762 [FIX] pod not found 2019-08-26 11:16:42 +08:00
凡羊羊
496a63bbda [FIX] fix upgrade event as asyn event type 2019-08-25 22:10:23 +08:00
曾庆国
2e602105a4 change event judge 2019-08-24 19:02:24 +08:00
barnettZQG
05496801cf
Merge branch 'master' into feature/aboutEvent 2019-08-23 08:58:22 -05:00
凡羊羊
9c652698ab modify events api and format some code 2019-08-23 20:33:38 +08:00
GLYASAI
ee813624fa Merge branch 'master' of https://github.com/GLYASAI/rainbond 2019-08-23 15:55:54 +08:00
GLYASAI
1220934aca [FIX] nil pointer dereference 2019-08-23 15:55:40 +08:00
凡羊羊
6a032e74b4
Merge branch 'master' into feature/aboutEvent 2019-08-23 15:52:19 +08:00
黄润豪
b70d8426f5
Merge branch 'master' into master 2019-08-23 14:43:00 +08:00
凡羊羊
4a6b2cc0e2 modify query event log content, and fix some bugs 2019-08-23 14:21:51 +08:00
GLYASAI
dac4a40f89 [REV] add start time for app status 2019-08-23 13:34:36 +08:00
GLYASAI
1f3352caad [REV] return clear mistake 2019-08-23 13:34:36 +08:00
Abe Wang
671955fc6e [ADD] api to get pod detail 2019-08-23 13:31:24 +08:00
Abe Wang
6a35ec3165 [ADD] list pod events 2019-08-23 13:31:16 +08:00
凡羊羊
8cb4b59b85 Merge branch 'feature/aboutEvent' of https://github.com/fanyangyang/rainbond into feature/aboutEvent 2019-08-23 09:57:33 +08:00
凡羊羊
afd5d286ac fix middleware bugs 2019-08-23 09:53:48 +08:00
凡羊羊
344c9045a0
Merge branch 'master' into feature/aboutEvent 2019-08-22 19:54:08 +08:00
凡羊羊
f30b520ada exporter new api, get event log by eventID 2019-08-22 19:51:46 +08:00
凡羊羊
443dbc45ee fix page bugs 2019-08-22 17:41:21 +08:00
凡羊羊
40adac9991 make event log in middleware 2019-08-22 16:07:26 +08:00
曾庆国
1f6033c7e6 Optimize the application log collection link and log push link #371 2019-08-22 15:05:56 +08:00
GLYASAI
86d6ca4df8 [REV] parse image repositry 2019-08-22 14:20:08 +08:00
GLYASAI
11cbc1532f [ADD] api to get event log 2019-08-16 22:13:20 +08:00
GLYASAI
b89b176c4e [ADD] start and finish time for build version 2019-08-16 11:18:00 +08:00
barnett
c05bcc0319 local and share volume support change volume path (fixed #347) 2019-08-11 17:21:34 +08:00
barnett
e86e5e258e [REV]Improved logic for node installation #342 2019-08-07 14:28:20 +08:00
凡羊羊
4d75326a57 [ADD] add new fields for router GetTenants 2019-08-05 11:36:52 +08:00
barnett
fe9cb64a69 change node label handle api 2019-08-01 18:25:27 +08:00
barnett
fe8eba1fa8 add tenant query api 2019-08-01 17:19:22 +08:00
barnett
ec40d51a5e Add build sponsor data records 2019-06-30 11:12:57 +08:00
barnett
601f22783b change rollback api impl 2019-06-29 23:33:27 +08:00
barnett
14c12e1dbd change build api parameter 2019-06-29 22:06:51 +08:00
barnett
4fbc5d47a8 change build api impl 2019-06-29 21:16:07 +08:00
barnett
cf555dae33 change upgrade api parameter 2019-06-29 20:02:41 +08:00
barnett
7bb40c363a Change the source build version medium to image 2019-06-29 15:20:11 +08:00
barnett
6b0713ccc4 merge 5.1 branch code 2019-06-25 22:01:03 +08:00
barnettZQG
5746841301
Merge pull request #308 from GLYASAI/RAINBOND-1004
[FIX] failed to restore backup
2019-06-25 17:58:03 +08:00
barnettZQG
8093677ff7
Merge pull request #303 from GLYASAI/RAINBOND-998
[FIX] err creating third-party service
2019-06-25 17:51:08 +08:00
GLYASAI
900ba5667b [FIX] failed to restore backup 2019-06-24 18:09:50 +08:00
GLYASAI
ff9da04135 [FIX] err creating third-party service 2019-06-20 18:01:05 +08:00
GLYASAI
5e0fd373b0 [REV] rollback transaction when panic 2019-06-20 14:04:05 +08:00
barnett
c797894103 add service ratelimit support 2019-06-14 15:19:53 +08:00
GLYASAI
4874e1c9c6 [FIX] container init-probe does not exit normally 2019-05-20 11:43:28 +08:00
GLYASAI
103ad550ee [FIX] failed to add endpoint with port 2019-05-17 10:40:46 +08:00
ysicing
6d7690a51b
Merge pull request #292 from GLYASAI/env
[REV] change http status to 400
2019-05-16 13:46:33 +08:00
GLYASAI
048dcd5d65 [REV] change http status to 400 2019-05-16 11:10:30 +08:00
barnett
a7f1718c01 [REV] merge v5.1 to master 2019-05-16 10:35:47 +08:00
barnettZQG
875624c24a
Merge pull request #286 from GLYASAI/RAINBOND-925
[FIX] wrong calculation for available memory
2019-05-14 05:42:31 -05:00
GLYASAI
f63444418c [FIX] wrong calculation for available memory 2019-05-11 10:56:57 +08:00
GLYASAI
b274cada72 [FIX] do not decision build type for service 2019-05-09 13:59:15 +08:00
GLYASAI
71268496e0 [FIX] failed to restore volume 2019-05-08 00:22:35 +08:00
GLYASAI
222076588b [REV] add ErrRecordAlreadyExist for creating version info 2019-05-06 20:43:58 +08:00
黄润豪
f5204be141
Merge branch 'master' into master 2019-05-04 19:28:12 +08:00
GLYASAI
3aa42fd75e [ADD] restore api for envs, ports and etc 2019-05-04 19:26:18 +08:00
GLYASAI
5d01753d2f restricting domain names with regular expressions 2019-04-13 15:29:24 +08:00
huangrh
3eeb943304 [REV] modify the rainbondfile to fit multiple services 2019-04-11 22:06:14 +08:00
huangrh
217f79dbb4 Merge branch 'master' into multi 2019-04-01 16:14:16 +08:00
barnett
0ad0e4f034 merge code 2019-04-01 15:55:44 +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
huangrh
18bdc929a8 [REV] remove flag real-port 2019-03-31 08:35:15 +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
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
barnettZQG
30ab3f1232
Merge pull request #258 from GLYASAI/RAINBOND-818
[FIX] invalid value for ingress path
2019-03-28 15:51:33 +08:00
huangrh
4ab66499b2 [ADD] api to list labels 2019-03-28 15:35:00 +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
d730e3506a [FIX] wrong image in docker-compose.yaml 2019-03-27 16:04:50 +08:00
huangrh
59fff24ef3 [FIX] invalid ingress 2019-03-27 12:17:32 +08:00
huangrh
043f47af5f [ADD] verify the IP of the third-party service instance 2019-03-25 16:30:42 +08:00
barnettZQG
a2897f47a4
Merge pull request #245 from GLYASAI/V5.1
[REV] rename event_id and eventId to eventID
2019-03-21 19:33:18 +08:00
GLYASAI
45f41a1882 [REV] rename event_id and eventId to eventID 2019-03-21 19:28:03 +08:00
barnett
9c01057d37 change version and change code style 2019-03-21 14:48:46 +08:00
GLYASAI
327f0914a3 [ADD] delete related talbes when deleting service 2019-03-16 21:34:07 +08:00
GLYASAI
7b6328b29b [REV] filter same key for custom headers 2019-03-14 22:56:40 +08:00
barnettZQG
5cb4fd8286
Merge pull request #237 from GLYASAI/V5.1
[FIX] fix somge bug
2019-03-14 21:57:01 +08:00
GLYASAI
feb1e1ba64 [REV] change gateway configuration
[FIX] fix some bug
2019-03-14 21:10:14 +08:00
barnett
962140db1c [REV] backup not support thirdpart service 2019-03-14 17:48:42 +08:00
GLYASAI
9d9e56a8c6 [FIX] make proxy_set_header work 2019-03-14 16:00:45 +08:00
GLYASAI
2359e78818 [FIX] fix merge error 2019-03-14 11:42:10 +08:00
黄润豪
be0a0da07d
Merge branch 'V5.1' into V5.1 2019-03-14 11:36:12 +08:00
GLYASAI
d0415a0042 [REV] remove configmap for third-party service 2019-03-14 11:12:17 +08:00
barnett
89f108692f [FIX] fix gateway bug 2019-03-13 20:06:11 +08:00
GLYASAI
487ca0c7b3 Merge remote-tracking branch 'upstream/V5.1' into V5.1 2019-03-13 14:08:50 +08:00
GLYASAI
0f886b3d35 [ADD] add or update api for gateway rule configuration 2019-03-13 13:58:30 +08:00
barnett
c8e7a8b6c1 [REV] change env scope validate 2019-03-12 21:06:39 +08:00
huangrh
bd57b2f829 [FIX] wrong dao for adding rule config 2019-03-12 10:37:45 +08:00
huangrh
bc1c32b792 Merge branch 'cfg' 2019-03-12 09:59:57 +08:00
huangrh
fc244b8fd1 [REV] change prober 2019-03-12 09:59:09 +08:00
huangrh
209f9bab35 [ADD] curd api for gateway rule config 2019-03-11 01:28:37 +08:00
huangrh
9c9c6f6b1d [FIX] merge confilct error 2019-03-09 22:17:52 +08:00
黄润豪
5ce8b28c73
Merge branch 'master' into master 2019-03-09 22:08:45 +08:00
barnett
b6632e79d3 [ADD] code check add runtime version check 2019-03-09 14:50:38 +08:00
barnett
f5fd1145f1 [ADD] add batch operation test 2019-03-09 13:51:36 +08:00
barnett
d5f8df7e05 [ADD] change batch operation api 2019-03-09 11:50:31 +08:00
barnett
b6eed75a65 [ADD] add batch operation api 2019-03-08 19:22:22 +08:00
huangrh
7af1d64519 [REV] change the update of third-party service Endpoints from synchronous to asynchronous 2019-03-08 14:46:11 +08:00
huangrh
e9078cd7c1 [ADD] string type ServiceKind 2019-03-06 15:27:28 +08:00
huangrh
5c6a2cda3c [ADD] api for updating config-file 2019-03-06 14:06:42 +08:00
barnett
ea54454080 [REV] merge branch V5.0 to master 2019-03-06 09:33:33 +08:00
huangrh
956a40561b [ADD] healthy check for third-party services 2019-03-05 22:22:02 +08:00
huangrh
9c26ff30bd [FIX] rollback failure 2019-03-05 12:05:55 +08:00
黄润豪
0e034ff12f
Merge branch 'master' into master 2019-03-04 14:32:33 +08:00
huangrh
b5b5c684b4 [REV] use selector to get endpoints, rather than service name
[ADD] create third-party service when starting worker

[ADD] curd for endpoints in etcd
2019-03-04 14:22:24 +08:00
barnett
bb84163cbf [FIX] fix version failure resulting in upgrade error bug 2019-03-01 22:06:34 +08:00
barnett
9173e1e520 [ADD] add plugin config backup and restore 2019-03-01 15:13:14 +08:00
barnett
fd64eca5ff [FIX] fix configfile cannot be read or written bug 2019-03-01 14:27:03 +08:00
huangrh
ecb61da9e1 [ADD] get third-party endpoints status 2019-03-01 13:27:27 +08:00
barnett
22e733a408 [ADD] add init-probe component 2019-02-28 14:52:39 +08:00
huangrh
76a6d486a1 [ADD] create corev1.Endpoints for third-party services 2019-02-28 11:50:54 +08:00
huangrh
3cdfa29143 [FIX] "/v2/port" has no authentication in public cloud 2019-02-27 15:47:25 +08:00
huangrh
a859e0dd29 [ADD] failure action for service probe 2019-02-27 10:11:20 +08:00
huangrh
da71fcc5de [FIX] gorm can't create zero values 2019-02-27 09:30:39 +08:00
huangrh
b1db6090db [REV] change discovery configuration request struct 2019-02-27 09:30:25 +08:00
huangrh
912babfa6a [ADD] api for listing third-party service endpoints 2019-02-26 14:16:22 +08:00
huangrh
38111f0e1f [REV] make parameter ip optional 2019-02-25 10:17:07 +08:00
huangrh
74ff40f7cb [ADD] static endpoints or discovery configuration when create service 2019-02-25 01:07:37 +08:00
huangrh
078b687f85 [ADD] api for fetching or updating third-party service probe 2019-02-24 21:18:06 +08:00
huangrh
371e41a8a9 [ADD] endpoints api: add, update and delete 2019-02-24 05:13:54 +08:00
huangrh
e4c40cef12 [ADD] service check for third-party service 2019-02-24 02:14:27 +08:00
barnett
23702ef013 [ADD] change plugin config persistence from etcd to mysql 2019-02-15 17:20:08 +08:00
barnett
fa53f1b403 [REV] change some code style 2019-02-15 10:06:25 +08:00
GLYASAI
c2d5f52ce3 [REV] add deploy version for build-list 2019-02-13 16:30:17 +08:00
barnett
56e0ca76db [REV] modify some file names 2019-02-12 17:19:42 +08:00
barnett
1283f445f3 [FIX] fix api build bug 2019-02-12 17:10:18 +08:00