Commit Graph

401 Commits

Author SHA1 Message Date
凡羊羊
cdf91ad3c8 mdify batch-upgrade-service 2019-08-28 10:33:07 +08:00
凡羊羊
04065038f7 modify batch op 2019-08-27 20:07:02 +08:00
凡羊羊
a3db19289c batch operation add event, and modify WrapEL 2019-08-27 17:42:33 +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
曾庆国
2e602105a4 change event judge 2019-08-24 19:02:24 +08:00
凡羊羊
9c652698ab modify events api and format some code 2019-08-23 20:33:38 +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
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
凡羊羊
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
barnett
fe8eba1fa8 add tenant query api 2019-08-01 17:19:22 +08:00
barnett
601f22783b change rollback api impl 2019-06-29 23:33:27 +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
GLYASAI
ff9da04135 [FIX] err creating third-party service 2019-06-20 18:01:05 +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
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
barnett
fa831cabf0 fix probe disable invalid bug 2019-03-31 13:03:38 +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
b1e59bfa0c
Merge pull request #253 from GLYASAI/compose
Fix two docker-compose.yaml problem
2019-03-28 16:35:49 +08:00
huangrh
4ab66499b2 [ADD] api to list labels 2019-03-28 15:35:00 +08:00
huangrh
d730e3506a [FIX] wrong image in docker-compose.yaml 2019-03-27 16:04:50 +08:00
huangrh
043f47af5f [ADD] verify the IP of the third-party service instance 2019-03-25 16:30:42 +08:00
GLYASAI
45f41a1882 [REV] rename event_id and eventId to eventID 2019-03-21 19:28:03 +08:00
GLYASAI
feb1e1ba64 [REV] change gateway configuration
[FIX] fix some bug
2019-03-14 21:10:14 +08:00
GLYASAI
9d9e56a8c6 [FIX] make proxy_set_header work 2019-03-14 16:00:45 +08:00
GLYASAI
d0415a0042 [REV] remove configmap for third-party service 2019-03-14 11:12:17 +08:00
GLYASAI
0f886b3d35 [ADD] add or update api for gateway rule configuration 2019-03-13 13:58:30 +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
黄润豪
5ce8b28c73
Merge branch 'master' into master 2019-03-09 22:08:45 +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
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
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
huangrh
ecb61da9e1 [ADD] get third-party endpoints status 2019-03-01 13:27:27 +08:00
huangrh
a859e0dd29 [ADD] failure action for service probe 2019-02-27 10:11:20 +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
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
barnett
23702ef013 [ADD] change plugin config persistence from etcd to mysql 2019-02-15 17:20:08 +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
239a997621 [FIX] fix build bug 2019-02-12 17:01:37 +08:00
barnett
510f901d4b [DEL] remove deprecated code 2019-02-12 16:57:18 +08:00
barnett
2616796037 [REV] Optimize code quality via go vet 2019-02-12 16:41:14 +08:00
barnett
065913a55c [REV] Optimize code quality via gofmt 2019-02-12 15:40:42 +08:00
GLYASAI
dc081e9662 [FIX] only return success version info 2019-01-25 14:37:30 +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
GLYASAI
555ea151ea [FIX] error building service with config file 2019-01-17 15:10:28 +08:00
GLYASAI
4dcd8d2f65 [FIX] return rainbond version 2019-01-16 21:09:35 +08:00
GLYASAI
ca7047db0f [ADD] add volume type for AddVolumeDependencyStruct 2019-01-08 14:43:32 +08:00
GLYASAI
a43d521b1a [REV] replace AddVolumeStruct with TenantServiceVolume 2019-01-07 16:10:40 +08:00
GLYASAI
431a4c96c3 [ADD] add table tenant_service_config_file 2019-01-06 22:13:19 +08:00
GLYASAI
5bef1f7876 [REV] convert bytes to string 2019-01-04 16:37:12 +08:00
GLYASAI
a24467b234 [ADD] print request messages 2019-01-04 16:28:42 +08:00
GLYASAI
b1cd012bca [ADD] add a volume of type ConfigMap 2019-01-04 14:26:29 +08:00
GLYASAI
03e4cc6e65 [REV] ignore error which says "no event log file" 2018-12-28 23:16:45 +08:00
GLYASAI
ba298e3a39 [DEL] remove IPPort temporarily 2018-12-19 13:53:11 +08:00
GLYASAI
5ae1489948 [ADD] add rest api for add ippool 2018-12-19 10:35:04 +08:00
GLYASAI
a8409eeb75 [ADD] add ip pool 2018-12-19 10:00:50 +08:00
GLYASAI
300bf4fcf2 [ADD] add debug messages 2018-12-18 22:44:45 +08:00
GLYASAI
62b2e89230 [FIX] fix bug: unable to update IPPort 2018-12-18 20:55:12 +08:00
GLYASAI
d8123d9c50 [REV] add checkAllZero to TCPAvailable 2018-12-18 19:43:17 +08:00
GLYASAI
e261076b2a [ADD] add delete IPPort 2018-12-18 19:15:21 +08:00
GLYASAI
c96d6c5016 [DEL] remove port checking 2018-12-18 17:58:51 +08:00
GLYASAI
d8c5f0b087 [ADD] checks if the ip and port for TCP is available 2018-12-18 16:58:13 +08:00
GLYASAI
6f38340943 [ADD] pring reqeust uri and body 2018-12-14 17:04:25 +08:00
GLYASAI
9b693dab93 [ADD] print request uri and body 2018-12-14 16:40:41 +08:00
GLYASAI
bfb2eaae19 [ADD]add action in task boty 2018-12-10 21:23:55 +08:00
GLYASAI
1f9df41790 [REV] allow return port=0 2018-12-07 21:28:12 +08:00
GLYASAI
c985858b6f [REV] print request body 2018-12-07 20:07:57 +08:00
GLYASAI
d5fb978c97 [ADD] add a flag IfCreateExPort 2018-12-07 19:40:28 +08:00
barnett
cef330a542 [REV] update docker client vendor code 2018-12-07 13:53:43 +08:00
GLYASAI
e9307cffc2 [FIX] fix bug: wrong request, but return 200 2018-12-07 10:22:11 +08:00
GLYASAI
6176f58ef7 [FIX]fix bug: empty labels 2018-12-04 20:34:58 +08:00
GLYASAI
eef858d743 [ADD] add request validation 2018-12-04 16:21:53 +08:00
GLYASAI
5937396831 [DEL] delele node label 2018-12-04 16:03:12 +08:00
GLYASAI
bf00ad8986 [REV] change LabelStruct and delete service label 2018-12-04 15:54:47 +08:00
GLYASAI
dd3656b4f3 [REV] change label request from LabelStruct to LabelsStruct 2018-12-04 15:20:59 +08:00
GLYASAI
78616f9074 [ADD] add api for updating labels 2018-12-04 14:09:15 +08:00
barnett
2eb8263ed9 [REV]change mq client code 2018-12-04 13:43:15 +08:00
GLYASAI
daa8503108 [ADD] add api for deleting label 2018-12-04 13:35:27 +08:00
GLYASAI
59742714d8 [ADD] add api for label 2018-12-04 13:15:47 +08:00
GLYASAI
36d18c7c18 [FIX] fix bug: Certificate already exists 2018-11-29 12:10:10 +08:00
GLYASAI
c1d18f158a [REV] return serviceID when change gateway rule 2018-11-28 17:44:26 +08:00
GLYASAI
453fe2c26c [ADD] add minimum external port 2018-11-28 17:01:58 +08:00
GLYASAI
9bb1a8ff74 [ADD] send apply rules task when change outer port or inner port 2018-11-27 16:46:05 +08:00
barnett
5a6321ba3a [FIX] fix service name is empty bug 2018-11-27 14:50:30 +08:00
barnett
70997e1f1a [REV] rollback change to upgrade pipeline and add undeploy app status 2018-11-27 10:15:53 +08:00
GLYASAI
41288c6315 [ADD] send apple rule task 2018-11-26 18:08:16 +08:00
GLYASAI
1167a37621 [ADD] add request struct for delete tcp rule 2018-11-26 11:39:01 +08:00
GLYASAI
428e4bda26 [ADD] add validation for updating tcp rule 2018-11-26 11:30:58 +08:00
GLYASAI
53dd99e95c [REV] change the request struct and request validation for add tcp rule 2018-11-26 09:50:15 +08:00
GLYASAI
e6e82ea9cf [REV] save lb port when adding tcp rule 2018-11-26 02:36:38 +08:00
GLYASAI
5b9e8db0ae [ADD] add api -- GetAvailablePort 2018-11-26 02:19:08 +08:00
GLYASAI
4836361308 [ADD] add validation for request of adding tcp rule 2018-11-25 22:19:40 +08:00
GLYASAI
7c9a40a662 [ADD] add AddHTTPRuleStruct for deleting http rule 2018-11-25 22:13:15 +08:00
GLYASAI
3a514c1606 [REV] add validation for request of updating http rule 2018-11-25 21:59:25 +08:00
GLYASAI
eb6f838b14 [FMT] rename, Http to HTTP, Tcp to TCP Json to JSON 2018-11-25 21:31:13 +08:00
GLYASAI
cb35637719 [REV] add validation for request of adding http rule 2018-11-25 21:21:34 +08:00
GLYASAI
5df9edc552 [FMT] rename, Http to HTTP, Tcp to TCP 2018-11-23 20:39:34 +08:00
barnett
2e0a3fde20 [REV] remove event log message db model 2018-11-22 16:22:44 +08:00
barnett
ec6cb037fd [REV] change all db name and remove kube client from api module 2018-11-22 14:33:29 +08:00
GLYASAI
0a20990804 [ADD] add uuid for http rule 2018-11-22 09:34:00 +08:00
GLYASAI
d156289e98 [ADD] add api fo deleting tcp rule 2018-11-21 20:33:37 +08:00
GLYASAI
aa98f5fd55 [ADD] add api for updating tcp rule 2018-11-21 20:14:13 +08:00
GLYASAI
1e4e5b0f37 [ADD] add api for adding tcp rule 2018-11-21 19:51:40 +08:00
GLYASAI
f2c5b22c2d [REV] change router of "http-rule" 2018-11-21 18:16:41 +08:00
GLYASAI
8d7d6e359a [ADD] add api for deleting http rule 2018-11-21 17:57:48 +08:00
GLYASAI
61b01f2b95 [ADD] add api for updating http rule 2018-11-21 17:15:40 +08:00
GLYASAI
f254d4a61a [ADD] add api "addHttpRule" 2018-11-21 15:04:03 +08:00
barnett
48b38237c9 [REV] merge branch v3.7 2018-11-20 17:50:01 +08:00
barnett
606411aa5e [ADD] add upgrade and scaling contro and change app status get method 2018-11-19 18:56:28 +08:00
barnett
0ed9ead351 [REV] update query tenant resource api 2018-11-17 18:34:46 +08:00
barnett
23be445e63 [REV] change resource api 2018-11-13 13:41:20 +08:00
barnett
7fd028c6ec [REV] merge branch V3.7 to master 2018-11-13 10:47:14 +08:00
zhoujunhao
4d47fd612a [ADD] Add interface for team resource usage and application status statistics 2018-11-01 11:38:06 +08:00
barnett
c03bda3881 [REV] change client-go version to release-7.0 2018-11-01 08:42:51 +08:00
zhoujunhao
a227566159 [ADD] add version api 2018-10-30 16:46:18 +08:00
zhoujunhao
1caaae7912 [ADD] Add team resource limits and usage 2018-10-29 18:14:10 +08:00
barnettZQG
c221724bc6 Merge branch 'V3.7' 2018-10-24 10:20:33 +08:00
zhoujunhao
3f64309cd8 [ADD] Add team resource limits 2018-10-23 18:11:27 +08:00
barnettZQG
60cabf2b51 [REV] remove O_DIRECT because invalid argument in gfs. 2018-10-15 21:03:39 +08:00
zhoujunhao
ce2e7eb382 Merge branch 'V3.7' of https://github.com/goodrain/rainbond
# Conflicts:
#	api/handler/service.go
2018-10-11 21:53:58 +08:00
zhoujunhao
68d6a78e6e [REV] Optimized upload io 2018-10-11 17:37:24 +08:00
barnettZQG
1dc22cc25c [REV] merge branch 3.7 to master 2018-10-08 12:25:05 +08:00
zhoujunhao
789609e67f [REV] Optimize the upload file process 2018-09-28 13:09:25 +08:00
zhoujunhao
24b1a2b5cc [REV] When the import record is not found, the return status is uploading 2018-09-28 11:03:33 +08:00
zhoujunhao
fe9722a4ad [REV] Optimize interface return status 2018-09-28 10:34:35 +08:00
zhoujunhao
09d311bdf5 [ADD] add new upload method 2018-09-27 19:24:15 +08:00
zhoujunhao
e541820259 [REV] After the import status is obtained, if the query does not find the eventId, the return status is importing 2018-09-27 14:31:52 +08:00
zhoujunhao
a9ee8a3025 [REV] Specification error code return 2018-09-27 12:38:25 +08:00
barnettZQG
d6ab828fba [REV] remove useless debug log 2018-09-26 22:06:41 +08:00
barnettZQG
66d1a2d8aa [REV] upload api support Access-Control-Allow-Origin 2018-09-26 22:02:02 +08:00
zhoujunhao
8d85d6d6fe [ADD] Add a test upload plan 2018-09-26 16:12:28 +08:00
zhoujunhao
6a077c268b [ADD] add files upload 2018-09-26 14:15:38 +08:00
zhoujunhao
3b7472ef44 [REV] After importing the cleanup directory, change the status to cleaned 2018-09-25 21:55:51 +08:00
zhoujunhao
d75f2eb97d [REV] Create a directory when the directory does not exist 2018-09-25 19:14:08 +08:00
zhoujunhao
23dd96dc13 [REV] Successfully returned when the directory does not exist, the result is empty 2018-09-25 17:46:31 +08:00
zhoujunhao
756a0ed404 [REV] Change the tar file to a zip file 2018-09-25 17:38:47 +08:00
zhoujunhao
c34b443824 [REV] 2018-09-25 16:27:56 +08:00
zhoujunhao
24cc01b43c [ADD] Add upload error log output 2018-09-25 15:41:19 +08:00
zhoujunhao
7d97547ecb [ADD] add CORS 2018-09-25 15:23:36 +08:00
zhoujunhao
e17eca36f4 [ADD] Upload file support options method 2018-09-25 14:42:06 +08:00
barnettZQG
e20d509a25 Merge branch 'V3.7' 2018-09-19 18:52:10 +08:00
zhoujunhao
8462f33ece [ADD] Add abandon import api 2018-09-12 11:42:10 +08:00
zhoujunhao
924b56cf9b [FIX] fix bug 2018-08-31 15:35:34 +08:00
zhoujunhao
2d3ec0c390 [ADD] add apply exception event query 2018-08-31 15:24:25 +08:00
zhoujunhao
d850ee8e56 [ADD] Add exception event handling in grctl 2018-08-30 17:49:54 +08:00
zhoujunhao
9acde33a92 Merge branch 'V3.7' of https://github.com/goodrain/rainbond
# Conflicts:
#	node/core/service/node_service.go
2018-08-27 12:51:54 +08:00
zhoujunhao
615f7bfac4 [ADD] add installation log download 2018-08-27 12:28:36 +08:00
zhoujunhao
5789a7a2ef [ADD] add logs print 2018-08-17 12:01:54 +08:00
zhoujunhao
30c71ea4e5 [REV] 2018-08-09 20:31:22 +08:00
zhoujunhao
c121b05726 [FIX] fix bug 2018-08-09 20:16:00 +08:00
zhoujunhao
0339d51d81 [FMT] 2018-08-09 18:41:29 +08:00
zhoujunhao
bea3f30d2d [FIX] fix bug 2018-08-09 18:39:30 +08:00
zhoujunhao
373cd3e461 [ADD] add fix bug print 2018-08-09 18:31:33 +08:00
zhoujunhao
3a4148bac1 [FIX] fix bug 2018-08-09 18:13:52 +08:00
zhoujunhao
79ba64b531 [ADD] add alertamnager webhooks api 2018-08-08 17:15:10 +08:00
zhoujunhao
dace6adc33 [REV] Optimize the ability to view application exception events in grctl 2018-08-08 12:18:48 +08:00
zhoujunhao
9100046962 [FIX] fix bug 2018-08-07 19:56:25 +08:00
zhoujunhao
ecfec9efc9 [FMT] Delete excess output 2018-08-07 19:12:44 +08:00
zhoujunhao
6d4010ea64 [ADD] Add a new event notification interface 2018-08-07 16:34:31 +08:00
zhoujunhao
5d7e1de76f [REV] Optimize state display priority 2018-08-07 14:45:37 +08:00
zhoujunhao
b52bd9f55d [ADD] add grctl show notification event 2018-08-07 14:28:15 +08:00
barnettZQG
1b40ebf255 [FIX] fix get service deploy version bug 2018-08-03 20:06:23 +08:00
barnettZQG
5c53e2b2dc [ADD] add some get deploy version api 2018-08-03 15:17:10 +08:00
Zhang Jiajun
6f9e6242c6 [ADD] Support enventlog id automatic discovery. 2018-08-01 15:42:15 +08:00
zhoujunhao
455736b791 [ADD] add rbd-api service health api 2018-07-20 14:19:35 +08:00
zhoujunhao
efc078cc38 [FIX] fix bug 2018-07-12 16:24:11 +08:00