Commit Graph

373 Commits

Author SHA1 Message Date
goodrain
8e956d57ea Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-23 15:36:42 +08:00
goodrain
5994eff4a9 [FIX] resolve node exporter add default support nfs and mountstats 2017-11-23 15:36:32 +08:00
bay1ts
c916824100 [REV] optimize node sdk err handle ,optimize command level structure,include status/install and node command 2017-11-23 15:05:46 +08:00
崔斌
3cb47241d5 Merge branch 'master' of code.goodrain.com:goodrain/rainbond
# Conflicts:
#	pkg/node/api/controller/discoverController.go
2017-11-23 15:05:02 +08:00
崔斌
0ad1575ca4 [FIX]Fix bug about discover body unmashal error 2017-11-23 15:03:29 +08:00
goodrain
4be8da4b9b [FIX] resolve bug 2017-11-23 14:54:56 +08:00
goodrain
f9f1828b73 [FIX] resolve compiling bug 2017-11-23 14:48:40 +08:00
goodrain
fc69ee6033 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-23 14:33:12 +08:00
goodrain
d707967535 [ADD] add node exporter for prometheus 2017-11-23 14:33:01 +08:00
崔斌
7378adaa5e [REV]Update grctl sources command 2017-11-23 12:12:00 +08:00
bay1ts
da0972758c [REV] optimize appp publish ,add status prop 2017-11-23 11:35:05 +08:00
bay1ts
69ef555716 [REV] optimize event ,in one event,but multi action,allow pass throth 2017-11-23 09:57:25 +08:00
bay1ts
87a5d1cb5f [REV] optimize event ,when build success,update db before deploy 2017-11-22 21:13:24 +08:00
bay1ts
820fd23c8a [REV] optimize event ,when build success,update db 2017-11-22 20:58:23 +08:00
bay1ts
c7b4efea9d [REV] optimize event ,when build success,update db 2017-11-22 20:44:13 +08:00
bay1ts
45d6d0d014 [REV] optimize event update method 2017-11-22 19:28:56 +08:00
bay1ts
6d5532adb6 [REV] optimize event update method 2017-11-22 19:16:20 +08:00
bay1ts
9844ae172a [ADD] add region node manage commands 2017-11-22 18:46:17 +08:00
bay1ts
5f2364bf70 [REV] add log 2017-11-22 17:49:13 +08:00
bay1ts
9f1274b9af [REV] add log 2017-11-22 17:29:49 +08:00
bay1ts
e6b1047f37 [REV] add log 2017-11-22 17:27:56 +08:00
bay1ts
b82351f72a [REV] add log 2017-11-22 17:20:35 +08:00
bay1ts
9fa90ba1d2 [REV] optimize publish info json unmarshal streagy 2017-11-22 17:15:13 +08:00
bay1ts
81be26bfec Merge remote-tracking branch 'origin/master' 2017-11-22 17:00:39 +08:00
bay1ts
0006f74c05 [REV] add log 2017-11-22 17:00:32 +08:00
崔斌
2d8d184bda [REV]Update define sources params get 2017-11-22 16:56:14 +08:00
崔斌
b913f67565 [FIX]Fix bug sources get “source_alias” “env_name” 2017-11-22 16:52:04 +08:00
崔斌
a29c46a0ac [REV]Update swagger json 2017-11-22 16:40:51 +08:00
bay1ts
b96090f9bd [REV] remove return 2017-11-22 16:36:54 +08:00
bay1ts
7a2a4d6117 [REV] remove return 2017-11-22 16:31:17 +08:00
bay1ts
322f58404c [FIX] fix error when build condition is blank 2017-11-22 16:00:31 +08:00
bay1ts
6f2c0947b2 Merge remote-tracking branch 'origin/master' 2017-11-22 15:40:44 +08:00
bay1ts
eb5bc4d543 [REV] prepare version,update callback to console 2017-11-22 15:40:15 +08:00
goodrain
0f2b586300 Merge branches 'master' and 'master' of code.goodrain.com:goodrain/rainbond 2017-11-22 15:26:41 +08:00
goodrain
5fda5982b9 [FIX] add all node api proxy 2017-11-22 15:26:28 +08:00
崔斌
6d53b69408 Merge branch 'master' of code.goodrain.com:goodrain/rainbond
# Conflicts:
#	pkg/api/region/region.go
#	pkg/grctl/cmd/cmd.go
2017-11-22 15:17:33 +08:00
崔斌
183e91a298 [ADD]Add grctl define source option 2017-11-22 15:09:28 +08:00
goodrain
917033fe7f Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-22 15:00:10 +08:00
bay1ts
7f023d8726 [REV] add builder api mount,prepare version info 2017-11-22 14:59:37 +08:00
goodrain
3c3adef3e2 [ADD] add api proxy node api 2017-11-22 14:59:20 +08:00
bay1ts
ef0487a832 [REV] optimize code check update method 2017-11-22 14:13:02 +08:00
bay1ts
34c23d2954 [REV] remove useless log 2017-11-22 13:49:19 +08:00
bay1ts
a9f3ac3481 [REV] replace json impl 2017-11-22 13:43:19 +08:00
bay1ts
5ee024c085 [REV] optimize unmarshal json 2017-11-22 13:33:20 +08:00
bay1ts
73cc6b5392 [FIX] add log in py and go,fix data overwrite 2017-11-22 13:22:27 +08:00
bay1ts
3747b6a671 [FIX] add log in py and go,fix data overwrite 2017-11-22 13:20:59 +08:00
bay1ts
eabb75e4bc [FIX] add log in py and go 2017-11-22 12:41:42 +08:00
bay1ts
b9750611de [ADD] add rainbond_node sdk,add cluster init and node install command 2017-11-22 11:40:14 +08:00
bay1ts
c12fc9404d [REV] optimize builder dao,update api 2017-11-22 11:35:19 +08:00
bay1ts
316cb981ef Merge remote-tracking branch 'origin/master' 2017-11-22 10:36:48 +08:00
bay1ts
6e909b0f13 [REV] optimize builder API 2017-11-22 10:35:44 +08:00
崔斌
5c7d1ff141 [REV] circuit’s params setting, 1025 as 0
[DEL] del header setting
2017-11-21 18:43:18 +08:00
崔斌
5ef9e238cd [REV]Add etcd records compatibility 2017-11-21 15:44:14 +08:00
崔斌
9230f03aa6 [FIX]Fix bug in create service when pluginrelation length is 0 2017-11-21 15:11:56 +08:00
goodrain
46c3b68757 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-21 15:06:12 +08:00
goodrain
ac76c5def4 [FIX] resolve depend task not found bug 2017-11-21 15:06:03 +08:00
bay1ts
d0e8ecc1a9 Merge remote-tracking branch 'origin/master' 2017-11-21 14:36:02 +08:00
bay1ts
ef9efa4f65 [FIX] fix handle status function,when last action timeout,will not block next action 2017-11-21 14:35:43 +08:00
goodrain
c926a23a23 [FIX] resolve local volume bug 2017-11-21 12:49:02 +08:00
goodrain
efa49474ab Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-21 12:31:42 +08:00
goodrain
37b70e7ab4 [FIX] Solve the mq memory leak problem 2017-11-21 12:31:33 +08:00
崔斌
ed80e1f335 [REV]Update default serviceAlias use destination service alias 2017-11-21 11:24:41 +08:00
崔斌
f24bac9755 [REV]set default http port 80 2017-11-21 11:04:51 +08:00
崔斌
ff86a47f13 [REV]Update lds/cds/sds discover server for envoy’s front model 2017-11-20 18:56:47 +08:00
bay1ts
321f89794c Merge remote-tracking branch 'origin/master' 2017-11-20 18:22:10 +08:00
goodrain
8d25639916 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-20 18:13:05 +08:00
goodrain
6f13e31ba7 [ADD] add webcli code 2017-11-20 18:12:53 +08:00
bay1ts
c758ba31e5 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-20 17:52:00 +08:00
bay1ts
3aaebc5dde [REV] add version table,optimize region get api return 404,update swagger,Optimize grctl noderes command,get real pods's requirements 2017-11-20 17:29:39 +08:00
崔斌
4c6f012670 [REV]Update downstream rules about http port setting 2017-11-20 16:52:14 +08:00
goodrain
6a70ad023c Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-20 15:33:06 +08:00
goodrain
b94b9761ea [FIX] fix the bug 2017-11-20 15:32:57 +08:00
崔斌
4951417494 [REV]Update discover lds/cds get rules from etcd 2017-11-20 15:26:32 +08:00
goodrain
56d7634360 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-20 15:24:35 +08:00
goodrain
a04047b5a0 [FIX] Adjust the dependent task state judgment strategy and increase the dynamic change static task 2017-11-20 15:24:24 +08:00
崔斌
8424c35c10 [ADD]Add discover which can be defined by users
User can use this function to add their own env-value, this value can become effective in runtime.
2017-11-19 18:59:41 +08:00
goodrain
e3ac05e3d3 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-17 18:20:09 +08:00
goodrain
1dae20ea4c [FIX] The task scheduling algorithm is optimized 2017-11-17 18:19:54 +08:00
bay1ts
29ac8ec243 [REV] update build response,add vendor,optimize build/publish db update 2017-11-17 15:03:19 +08:00
bay1ts
456a8cfcf9 Merge remote-tracking branch 'origin/master'
Conflicts:
	pkg/api/controller/serviceAction.go
2017-11-17 15:00:53 +08:00
bay1ts
979662e433 [REV] update event timeout strategy 2017-11-17 12:26:46 +08:00
崔斌
9560e4db1d [FIX]Fix bug: delete service timeout.
add err.Error(), str compare to str
2017-11-17 12:08:09 +08:00
goodrain
b6084a9ab5 [FIX] Fix store mount database operation BUG 2017-11-17 11:47:19 +08:00
goodrain
3bdf539615 [FIX] Fix volume mount database operation BUG 2017-11-17 11:47:02 +08:00
bay1ts
26d7866df2 [REV] allow blank eventID param from console 2017-11-17 09:49:52 +08:00
崔斌
9ed78faf46 [ADD]Net Rules function
[DEL] delete v1 api/interface

[REV] optimize structs of api router;update swagger json
2017-11-16 19:13:14 +08:00
goodrain
cbd1196f96 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 18:56:03 +08:00
goodrain
f852437ed8 [FIX] change the task status about scheduler 2017-11-16 18:55:48 +08:00
bay1ts
ad6011f777 [FIX] remove wrong dao interface 2017-11-16 18:42:23 +08:00
bay1ts
3eae341d23 [REV] add log 2017-11-16 18:22:43 +08:00
bay1ts
de08bcee4e Merge remote-tracking branch 'origin/master' 2017-11-16 18:13:59 +08:00
bay1ts
fcf0a9ba3f [REV] add log 2017-11-16 18:13:28 +08:00
goodrain
4c627aab7f Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 18:04:11 +08:00
goodrain
560852d7be [FIX] fix nil bug 2017-11-16 18:03:55 +08:00
bay1ts
9f5edbe506 Merge remote-tracking branch 'origin/master' 2017-11-16 17:56:44 +08:00
bay1ts
746abc5dcc [REV] add log 2017-11-16 17:56:32 +08:00
goodrain
21d778744a Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 17:47:08 +08:00
goodrain
805c71fb4a [FIX] Add task shceduler time,Optimization scheduling algorithm 2017-11-16 17:46:57 +08:00
bay1ts
641f395a31 [REV] add log 2017-11-16 17:46:23 +08:00
bay1ts
ef27d80ebf [REV] add log 2017-11-16 17:35:59 +08:00
bay1ts
721dacfb36 [FIX] fix wrong table 2017-11-16 17:22:08 +08:00
bay1ts
e0b9982331 Merge remote-tracking branch 'origin/master' 2017-11-16 17:04:17 +08:00
bay1ts
c61025b2d3 [REV] optimize api-api return event 2017-11-16 17:04:06 +08:00
goodrain
986466f456 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 16:32:41 +08:00
goodrain
d3f4f399b3 [FIX] Ignore the error output from task 2017-11-16 16:32:27 +08:00
bay1ts
d6929e7465 Merge remote-tracking branch 'origin/master' 2017-11-16 16:31:01 +08:00
bay1ts
bd35788865 [REV] builder api optimize;add service discover to builder;import unify db to eventlog;remove unused event_id;add event entity ;create event in controller level;add event status update 2017-11-16 16:30:22 +08:00
goodrain
72ee09883b [FIX] Redo the related API for the node management and match the new node model 2017-11-16 14:58:59 +08:00
bay1ts
f943fffb69 Merge remote-tracking branch 'origin/master' 2017-11-16 12:00:10 +08:00
goodrain
41bee0f307 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 11:31:26 +08:00
goodrain
9b67553ea6 [ADD] Complete group task scheduling 2017-11-16 11:31:09 +08:00
崔斌
76b73f9dbc [FIX]Fix header: null 2017-11-15 23:24:21 +08:00
崔斌
b0f9b09025 [FIX] Fix a url set bug in swagger.json production
[REV]Update swagger json
2017-11-15 19:19:59 +08:00
崔斌
3757599e5c [FIX]Fix label selecter format
[ADD]Add log debug
2017-11-15 18:46:28 +08:00
崔斌
caa683707f [FIX]add plugin info into table tenant_plugin_build_version 2017-11-15 17:55:28 +08:00
崔斌
9d54c72db4 [REV] add default env “PLUGIN_MODEL” when create plugin 2017-11-15 17:06:58 +08:00
崔斌
fe9499ad3e [REV]Update service labels add “port_protocol” for discover server 2017-11-15 16:50:41 +08:00
崔斌
2b2d7be137 [REV]Update envoy discover add http filter and circuit 2017-11-15 16:40:39 +08:00
goodrain
6379be1dd3 [ADD] mq add pprof debug api 2017-11-15 15:40:38 +08:00
bay1ts
2665dc25b6 [REV] optimize codecheck function ,add language prop 2017-11-15 15:14:34 +08:00
goodrain
06a1f5ba25 [FIX] remove mgo package 2017-11-15 11:00:32 +08:00
bay1ts
a385b4f23c [REV] optimize exec command impl,remove manualy add namespace arg 2017-11-15 10:38:29 +08:00
崔斌
4c05c036f0 [REV]Update infomations 2017-11-15 10:35:11 +08:00
崔斌
e8442a55d5 [REV]插件容器中注入主容器环境变量 2017-11-14 22:06:09 +08:00
崔斌
2c2b67e4e0 Merge branch 'master' of code.goodrain.com:goodrain/rainbond
# Conflicts:
#	cmd/node/server/server.go
2017-11-14 19:05:12 +08:00
崔斌
f8656be69b [DEL]删除node中的数据库相关操作 2017-11-14 19:02:27 +08:00
goodrain
8432ea620d [FIX] 合并冲突 2017-11-14 19:00:53 +08:00
goodrain
828ad7c2b0 [FIX] task任务执行链条走通 2017-11-14 18:57:56 +08:00
崔斌
5c8884dc2f [REV]增加网络插件分类netPlugin -> upNetPlugin && downNetPlugin 2017-11-14 18:56:48 +08:00
bay1ts
2193018790 Merge remote-tracking branch 'origin/master' 2017-11-14 18:55:05 +08:00
bay1ts
9a5351ea1a [REV] codecheck/dockerfile构建写入console改为存入数据中心。增加model定义,数据库存储/查询实现 2017-11-14 18:54:27 +08:00
崔斌
a6721eaf49 [REV]使用通过环境变量获取的tenant_id 2017-11-14 18:45:58 +08:00
goodrain
f8bf8a7df5 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-14 16:22:09 +08:00
goodrain
4d55e3f921 [FIX] 完成动态静态任务调度执行与结果处理 2017-11-14 16:21:59 +08:00
崔斌
ca13987ea1 [FIX]Fix target port & lens of discover args 2017-11-14 15:24:05 +08:00
崔斌
0e3f827e79 [REV]调整discover服务代码结构 2017-11-14 10:51:37 +08:00
崔斌
261ec4ff49 [ADD]增加cluster discover server发现服务api与功能实现 2017-11-14 10:27:51 +08:00
崔斌
6324f0ff4c [ADD]增加listeners discover server发现服务api与功能实现 2017-11-13 23:38:59 +08:00
goodrain
be5c59e876 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-13 21:54:19 +08:00
goodrain
021dc67971 [FIX] 完成静态task自动执行,自动参数解析。 2017-11-13 21:54:11 +08:00
崔斌
9c425ebbb4 [ADD] 增加server discover server发现服务api与功能实现 2017-11-13 18:37:34 +08:00
bay1ts
16aa5f2caf Merge remote-tracking branch 'origin/master' 2017-11-13 15:52:36 +08:00
bay1ts
ffbb44f2e6 [ADD] 应用启停时增加可选实时输出日志功能 2017-11-13 15:33:34 +08:00
崔斌
691a481a12 [ADD]增加grctl工具操作plugin命令 2017-11-13 14:28:41 +08:00
bay1ts
fe87437765 [REV] 完善get命令获取service信息,添加目录挂载路径信息,支持多挂载,修复执行命令遇到的问题 2017-11-13 14:14:29 +08:00
bay1ts
ee0e3400e2 [REV] 修复json反序列化问题 2017-11-13 10:26:03 +08:00
bay1ts
b309c3f7f1 [ADD] 添加log,exec,event相关命令 2017-11-10 17:18:57 +08:00
bay1ts
00b1f673ca [ADD] 添加Node与get 相关命令 2017-11-10 15:00:52 +08:00
bay1ts
34715b1837 Merge remote-tracking branch 'origin/master' 2017-11-10 11:57:20 +08:00
bay1ts
1807132e20 [REV] 添加协议头 2017-11-10 11:53:05 +08:00
bay1ts
4c37324f3b [ADD] 添加租户应用信息及租户使用资源信息功能 2017-11-10 10:48:00 +08:00
崔斌
d1e80da00e [REV] Update swagger.json 2017-11-10 09:51:49 +08:00
崔斌
93406c45ce [REV] 调整部分接口函数名称;更新swagger 2017-11-09 18:41:11 +08:00
崔斌
b9d2ba5c7a [REV] 优化plugin 作者设定env与可修改env的展示、更新 2017-11-09 18:31:31 +08:00
bay1ts
0f9f469ce3 [ADD] 添加应用启停实现 2017-11-09 18:19:17 +08:00
bay1ts
506fb0fa09 [ADD] 添加grctl基础结构,提供regionAPI 封装接口及实现,大致实现批量关闭租户应用功能 2017-11-09 17:56:12 +08:00
goodrain
3cf60d47ba Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-09 17:32:12 +08:00
goodrain
11b23d52aa [FIX] 完成集群节点的管理 2017-11-09 17:32:02 +08:00
崔斌
f442d56fca [REV]Update swagger post -> delete 2017-11-09 16:23:13 +08:00
崔斌
2fffc1831e [FIX]修复mysql保留字change bug;更新swagger.json 2017-11-09 15:47:32 +08:00
崔斌
0dab31b5c3 [FIX]修正插件是否启用开关判断; 修正获取可修改的默认变量参数“change” 2017-11-09 15:35:05 +08:00
崔斌
e2e61b166d [REV] 修改doc文档html路径 2017-11-09 14:50:28 +08:00
崔斌
4b9c5e9149 [FIX]修改无后缀image适配bug;修改swagger.json;增加单元测试 2017-11-09 12:19:50 +08:00
goodrain
9e58d8de1d Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-08 21:40:00 +08:00
goodrain
5c0e356d54 [FIX] 数据中心配置更改完成。 2017-11-08 21:39:51 +08:00
崔斌
c403ef78ea [ADD]增加应用依赖的插件构建步骤;修改部分文件注释 2017-11-08 19:17:21 +08:00
goodrain
7d89350203 [FIX] 增加节点支持一次性任务,event_log注册地址添加协议名称 2017-11-08 13:36:06 +08:00
goodrain
449e7b219d [ADD] 增加节点任务执行结果回写etcd.交由master节点进行处理 2017-11-08 12:09:47 +08:00
goodrain
d3fd2242e6 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-08 10:23:14 +08:00
goodrain
633260de96 [FIX] 重新调整代码,node支持循环任务,定时任务。 2017-11-08 10:23:05 +08:00
崔斌
cf77fe8f52 [ADD]Add 插件构建过程必要的default 配置与配置设定接口及模型 2017-11-07 19:11:49 +08:00
崔斌
9f8c9cb1b0 [FIX]Fix can not add user-defined domain bug 2017-11-07 14:27:00 +08:00
goodrain
e917d545d0 [ADD] init commit 2017-11-07 11:40:44 +08:00