Commit Graph

246 Commits

Author SHA1 Message Date
goodrain
56b28008e1 [FIX] fix cache dir Permission denied error 2018-03-13 22:26:51 +08:00
goodrain
3ff0975615 [FIX] fix py bug 2018-03-07 16:30:00 +08:00
goodrain
b7f810e087 [FIX] change chaos user to root 2018-03-02 19:24:42 +08:00
goodrain
52927093c5 [FIX] merge master 2018-02-26 18:15:01 +08:00
goodrain
f54d6e1970 [FIX] add support agent github code 2018-02-23 12:34:35 +08:00
pujielan
644c53e1ec [REV] Optimize process of ftp upload 2018-02-08 10:36:22 +08:00
goodrain
b488aea375 Merge branch 'master' into app-detection 2018-02-08 09:39:38 +08:00
pujielan
0419acc392 [REV] unused user rain 2018-02-07 14:50:15 +08:00
goodrain
f249b614c7 [FIX] resolve get event info bug 2018-02-06 14:59:21 +08:00
pujielan
a1a6414bc1 [REV] Update swagger 2018-02-05 19:30:44 +08:00
goodrain
807f9b86dc [ADD] merge master branch 2018-02-05 13:40:08 +08:00
pujielan
c9fca6d855 [REV] Update swagger json 2018-02-05 11:04:01 +08:00
pujielan
f36f7e4fe4 [REV] Add cloud share ftp config 2018-02-05 10:47:59 +08:00
pujielan
f88673d887 [REV] Add service check info 2018-01-23 15:58:10 +08:00
pujielan
eef60dd80b [REV] Update service check routers 2018-01-22 18:08:31 +08:00
pujielan
247018bbcb [REV] Update service check routers 2018-01-22 18:00:45 +08:00
goodrain
80072fa62e [FIX] add vendor package 2018-01-22 16:50:23 +08:00
pujielan
efb5c7defb [ADD] Add rainbond plugin share 2018-01-18 13:49:07 +08:00
goodrain
1d19f75476 [FIX] Merge master code to handle conflicts.
Prepare to incorporate performance analysis capabilities into the trunk.
2018-01-10 18:49:17 +08:00
goodrain
06f92a78c6 [ADD] add docker run parser and image handle 2018-01-10 13:35:05 +08:00
pujielan
0a5282913e Merge branch 'master' into cuib-local-master
# Conflicts:
#	hack/contrib/docker/chaos/Dockerfile
#	pkg/api/handler/tenant.go
#	pkg/db/mysql/mysql.go
2018-01-05 10:45:04 +08:00
pujielan
69125f3dd4 [REV] Update chaos set user rain with root permission 2018-01-05 10:40:21 +08:00
pujielan
f61eed20a7 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 13:51:35 +08:00
ysicing
3113de137d [REV] update proxy script for compute node: data duplication. closed #23 2018-01-03 19:10:32 +08:00
ysicing
11249f790c [REV] add depends for install_network #24 2018-01-03 17:52:12 +08:00
ysicing
8ad653c9d0 [FIX] change adapter version info; 2018-01-03 15:42:08 +08:00
ysicing
23c948fb69 [FIX] Update the storage installation order. close #18 2018-01-02 22:51:01 +08:00
pujielan
28c5c9bff0 [ADD] Add region support protocol list 2018-01-02 18:02:08 +08:00
ysicing
78ab94e5f8 [FIX] update dns_modify script for rbd-dns .closed #21 2018-01-02 12:35:50 +08:00
ysicing
68689d05e9 [REV] Support compute nodes to add rain users 2017-12-27 17:41:53 +08:00
ysicing
798eec5417 [FMT] del useless dependence 2017-12-26 19:04:00 +08:00
ysicing
8959e305fa update entrance 2017-12-26 18:35:37 +08:00
ysicing
29c09d09bd [REV] add host_id_list.conf restart api 2017-12-26 17:43:49 +08:00
ysicing
88eeba8087 [REV] Adjust the installation script 2017-12-26 11:58:52 +08:00
ysicing
0d8e5a493e [REV] update release.sh 2017-12-26 11:16:13 +08:00
ysicing
2de927e20b [REV] merge branch gaops_release_3.4.1 2017-12-26 10:47:50 +08:00
Bay
6eda29736c
[REV] cancel publish callback to console 2017-12-22 18:20:48 +08:00
pujielan
86f9f446a6 [ADD]Add tenant event log 2017-12-20 19:04:09 +08:00
goodrain
42afa03e72 [FIX] Merge branch 'release-3.4' 2017-12-18 18:50:10 +08:00
ysicing
d86252512e [FIX] Adjust k8s check 2017-12-18 16:48:35 +08:00
pujielan
3f3bf9b3b0 [ADD]Add cloud auth annotation 2017-12-18 11:05:56 +08:00
ysicing
622dc145d5 [FIX] resolved #4 Node ip unconventional intranet ip 2017-12-15 18:57:47 +08:00
bay1ts
9b19df72a5 [REV] merge from master 2017-12-15 17:23:59 +08:00
goodrain
d9a7a2aa7e [FIX] Merge branch release-3.4 to master 2017-12-15 17:07:55 +08:00
bay1ts
a9153e7437 [REV] merge from code 2017-12-15 16:49:24 +08:00
bay1ts
a6953fd108 [FIX] remove builder service reg;change deploy api from start to upgrade;update build api;add try catch in chaos 2017-12-15 14:17:02 +08:00
goodrain
1aac0de5cd [ADD] add statsd exporter module to node 2017-12-14 18:30:52 +08:00
pujielan
115328e08a [REV] Optimize plugin system 2017-12-14 17:33:14 +08:00
pujielan
ab3922c9f7 [REV] Optimize plugin system 2017-12-13 17:38:45 +08:00
崔斌
9963604969 [REV] Optimize plugin system 2017-12-13 12:10:53 +08:00
goodrain
6e5db326e7 [FIX] Merging branches 2017-12-12 21:56:40 +08:00
ysicing
15324b788b [FIX] Resolve to reinitialize the db passwd 2017-12-12 19:45:55 +08:00
ysicing
7727064f65 [FMT] Remove unused dependencies 2017-12-12 16:42:40 +08:00
崔斌
e198c80ed9 [REV] Add discover env - DISCOVER_URL when creating plugin pods 2017-12-12 15:25:47 +08:00
bay1ts
d53f2181ae Merge remote-tracking branch 'origin/master' 2017-12-12 14:07:31 +08:00
bay1ts
c8c50e1bc6 [REV] optimize code check 2017-12-12 14:07:21 +08:00
崔斌
ef04e7dbc0 [REV]Update service’s plugin setting with build_version
[FIX]Repair few annotation bugs
2017-12-12 12:52:29 +08:00
ysicing
c73ead7ef8 [FIX] fix grctl domain 2017-12-12 12:27:06 +08:00
goodrain
95f5e8aebe Merge branch 'release-3.4'
# Conflicts:
#	pkg/builder/api/router.go
#	pkg/grctl/cmd/init.go
#	pkg/grctl/cmd/installStatus.go
#	pkg/grctl/cmd/node.go
2017-12-12 11:36:57 +08:00
ysicing
ac7bca79df [ADD] get ext ip; update hosts scripts 2017-12-11 19:49:23 +08:00
ysicing
8678b853a1 [FIX] add webcli command; fixed domain args error 2017-12-11 18:29:15 +08:00
ysicing
662c868a75 [FIX] manage node adapter not exist; grctl support domain 2017-12-11 16:17:53 +08:00
ysicing
a6b30948a9 [ADD] update release node; 2017-12-10 21:20:23 +08:00
bay1ts
8f5bcf40e0 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-08 15:34:04 +08:00
bay1ts
de6b82589d [REV] optimize node's instance api 2017-12-08 13:25:21 +08:00
bay1ts
4bafd367a0 [FIX] change delivery type from code to slug 2017-12-08 10:20:50 +08:00
崔斌
9c53b383e9 [REV]Update notation 2017-12-08 10:16:29 +08:00
bay1ts
33ab092774 [REV] optimize node's pods info and merge bugfix from release 2017-12-07 23:48:07 +08:00
bay1ts
9e7977bb01 [REV] optimize code build status in version_info update strategy 2017-12-07 23:15:40 +08:00
bay1ts
89e1eaeb76 [REV] optimize code commit info in version_info update strategy inapp_image 2017-12-07 22:55:23 +08:00
bay1ts
0125efc4ef [REV] optimize build work build result update 2017-12-07 22:31:55 +08:00
bay1ts
acef6ce5dd [REV] optimize code commit info in version_info update strategy 2017-12-07 21:51:12 +08:00
崔斌
04046d4a71 [REV]Update swagger 2017-12-07 17:25:27 +08:00
崔斌
2453951f1e [REV]Update swagger 2017-12-07 16:38:58 +08:00
bay1ts
ab87db2b96 Merge remote-tracking branch 'origin/master'
Conflicts:
	pkg/api/controller/serviceAction.go
	pkg/eventlog/store/handle_message_store.go
2017-12-07 16:09:26 +08:00
bay1ts
c2269ac74d [REV] optimize,merge new code 2017-12-07 16:05:59 +08:00
bay1ts
922efec3de Optimize:remove callback 2017-12-07 15:57:06 +08:00
崔斌
2c2575dc09 [REV]Update swagger 2017-12-07 10:53:29 +08:00
崔斌
dc053301dc [REV]API ingress auth 2017-12-07 09:56:08 +08:00
goodrain
ffc1b575a8 [FIX] Merge release-3.4 2017-12-07 09:50:00 +08:00
bay1ts
09daef4c82 [REV] add update version in app_slug 2017-12-06 20:13:30 +08:00
bay1ts
2fa203c453 [REV] add update version in app_image 2017-12-06 20:10:26 +08:00
bay1ts
901cad8174 [REV] update log,add update version in app_image 2017-12-06 19:34:56 +08:00
bay1ts
e0eaa37167 [REV] update log 2017-12-06 18:33:50 +08:00
bay1ts
a4b99ac94d [FIX] fix when update version,cause nil pointer 2017-12-06 12:40:21 +08:00
崔斌
33afb152b5 [REV]Update image cloud share 2017-12-05 12:00:03 +08:00
bay1ts
761d9dcf54 [REV] reverse to old version for online env 2017-12-04 15:25:32 +08:00
崔斌
2edbe5e516 [REV]Update set cloud share “app-image” add serviceID to get image-name 2017-12-04 12:33:10 +08:00
goodrain
53d8ae9720 [FIX] Optimize sharing application error alerts 2017-12-04 11:30:22 +08:00
goodrain
3008cac1da Merge branch 'release-3.4' of code.goodrain.com:goodrain/rainbond into release-3.4 2017-12-04 10:35:36 +08:00
goodrain
9779768990 [FIX] Optimization error reminder 2017-12-04 10:34:48 +08:00
崔斌
b563245ed1 [REV]Update swagger and sql record 2017-12-03 21:56:21 +08:00
崔斌
3da1809760 [REV]Update swagger 2017-12-03 19:35:48 +08:00
崔斌
491b6c57ec [REV]Update swagger 2017-12-03 19:16:00 +08:00
bay1ts
cdafb6aedf Merge remote-tracking branch 'origin/master' 2017-12-01 12:04:24 +08:00
bay1ts
211ca103cc [REV] reverse app publish origin version,now can use it online,when deploy console new version,re-offline this function 2017-12-01 11:44:53 +08:00
ysicing
caddc26ec7 [ADD] support node build by docker 2017-11-30 22:51:08 +08:00
崔斌
e024081c1d [REV]Update swagger; port service for upstream 2017-11-30 18:55:11 +08:00
ysicing
86ce2a4520 [FIX] Modify worker startup parameters 2017-11-29 16:17:23 +08:00
bay1ts
0f66f010e8 Merge remote-tracking branch 'origin/master' 2017-11-28 19:00:25 +08:00
bay1ts
0d7fc3deb8 [REV] change update implication 2017-11-28 19:00:17 +08:00
崔斌
d806546d1a [REV] Update builder dockerfile
[REV] Update plugin upstream model

[REV] Update swagger
2017-11-28 18:58:07 +08:00
bay1ts
ef19470993 [FIX] fix error usage of json 2017-11-28 18:34:44 +08:00
bay1ts
9369434882 [FIX] fix error usage of json 2017-11-28 18:31:14 +08:00
崔斌
538acb4ead [REV]Update swagger json 2017-11-27 17:59:15 +08:00
ysicing
da2a5c25c1 [REV] fix single quote in command cause exec failed 2017-11-27 16:36:15 +08:00
ysicing
212ab85650 [FIX] Modify the rainbond-node startup parameters 2017-11-27 16:32:31 +08:00
ysicing
f49a56c11b [FIX] Modify the rainbond-node startup parameters 2017-11-27 15:54:54 +08:00
bay1ts
0b3997641f [REV] optimize app publish ,add pushing ,success,failure state 2017-11-27 14:41:21 +08:00
ysicing
7332273208 [REV] Update the packaging configuration 2017-11-27 10:20:15 +08:00
bay1ts
b9ddecb854 Merge remote-tracking branch 'origin/master' 2017-11-24 19:00:35 +08:00
bay1ts
d1b89a0afa [REV] add try catch on request method 2017-11-24 18:59:28 +08:00
崔斌
1506945c3c Merge branch 'master' of code.goodrain.com:goodrain/rainbond
# Conflicts:
#	pkg/builder/model/model.go
2017-11-24 18:25:13 +08:00
崔斌
d363741cad [REV]Optimizing plugins struct & plugins action process 2017-11-24 18:23:35 +08:00
bay1ts
5bea575188 [REV] update app_publish entity 2017-11-24 18:20:46 +08:00
bay1ts
5857dbe5fd [REV] update app_publish entity 2017-11-24 17:45:15 +08:00
bay1ts
46925c8daf [FIX] oss get prop method 2017-11-24 17:29:45 +08:00
bay1ts
6b43bd7da2 [FIX] fix code 2017-11-24 17:01:47 +08:00
bay1ts
c15c6a8167 [FIX] fix code 2017-11-24 16:34:48 +08:00
bay1ts
c64e6fb654 [FIX] fix code 2017-11-24 16:19:51 +08:00
bay1ts
d2e2e879ba [REV] optimize publish api 2017-11-24 15:40:45 +08:00
bay1ts
2c64ce1ff3 [REV] optimize event api structure 2017-11-24 12:40:05 +08:00
bay1ts
62eddf42ff [FIX] fix can't find version info when share in cloud.add event query interface 2017-11-24 11:59:07 +08:00
bay1ts
263d45d60c [FIX] fix py file complie error 2017-11-23 18:27:02 +08:00
bay1ts
410773c7e0 [REV] remove update deliveried path for now 2017-11-23 18:19:34 +08:00
bay1ts
d2222fd188 [REV] remove update deliveried path for now 2017-11-23 18:09:43 +08:00
bay1ts
c2c3783823 [REV] Optimize builder_work,update delivery type and path when got it,builder add version update api 2017-11-23 17:59:40 +08:00
bay1ts
4f58f852a4 [REV] Optimize version columns,log slug path 2017-11-23 17:23:32 +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
ysicing
a141baee9e Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-22 17:04:34 +08:00
ysicing
7a5e398029 [FMT]Perfect build details 2017-11-22 17:04:25 +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
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
崔斌
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
bay1ts
7f023d8726 [REV] add builder api mount,prepare version info 2017-11-22 14:59:37 +08:00
bay1ts
ef0487a832 [REV] optimize code check update method 2017-11-22 14:13:02 +08:00
ysicing
24bb6beb3d [REV] Update Makefile 2017-11-22 13:56:59 +08:00
ysicing
70a3b80558 [REV] update the image name and packaging 2017-11-21 16:45:02 +08:00
ysicing
c193278f81 [REV] Modify startup parameters for rainbond-node 2017-11-20 19:16:16 +08:00
ysicing
93a7c3213a [ADD] Support the debian/ubuntu 2017-11-20 12:03:39 +08:00
ysicing
72c5a02e97 [ADD] support for grctl 2017-11-17 15:25:38 +08:00
ysicing
e177400318 [FIX] rainbond node start scripts 2017-11-16 13:38:12 +08:00
ysicing
a2f0a15363 [ADD] rainbond-node build rpm package for centos7 2017-11-15 19:33:05 +08:00