Commit Graph

98 Commits

Author SHA1 Message Date
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
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