Commit Graph

310 Commits

Author SHA1 Message Date
pujielan
c19740724f [REV] Add disk usage statistics 2018-01-12 17:29:43 +08:00
goodrain
0d1126fc89 [ADD] api add proxy for prometheus 2018-01-11 13:58:24 +08:00
goodrain
5aef23e50f [FIX] handle nil bug when etcd config error 2018-01-11 11:33:25 +08:00
pujielan
2c15d441cf [REV] Update plugin add rebuild 2018-01-10 17:20:32 +08:00
goodrain
06f92a78c6 [ADD] add docker run parser and image handle 2018-01-10 13:35:05 +08:00
pujielan
fa9515fc9a [FIX] Fix uri permission bug 2018-01-05 14:17:45 +08:00
pujielan
3df840379e [FIX] Fix uri permission bug 2018-01-05 12:02:10 +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
c962d2b60a [ADD] Add token verification logs 2018-01-05 10:02:21 +08:00
pujielan
6dac5a79d2 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 18:18:51 +08:00
pujielan
67c6ebf8e1 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 11:14:37 +08:00
pujielan
14417d3a3a [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 10:58:20 +08:00
Bay
e8c2f8ff88 Merge branch 'master' of https://github.com/goodrain/rainbond into for_install_3.4.1 2018-01-03 19:12:36 +08:00
Bay
05e6787549 [REV] use shell script version 3.4.1 2018-01-03 09:48:28 +08:00
pujielan
28c5c9bff0 [ADD] Add region support protocol list 2018-01-02 18:02:08 +08:00
pujielan
0cb1baef60 Merge branch 'master' into cuib-local-master 2018-01-02 12:05:49 +08:00
pujielan
d21a55696a [REV] Compatible service restart operation 2018-01-02 12:04:36 +08:00
Bay
8f69543861 [REV] merge from local;add prometheus api,node init/install api and status query api 2017-12-29 14:06:42 +08:00
pujielan
000d577e8c [REV] Add service resources delete 2017-12-28 14:45:33 +08:00
pujielan
f15c0b376a [REV] Add service resources delete 2017-12-28 14:27:00 +08:00
pujielan
5aa9a31ebd [REV] Add service resources delete 2017-12-28 13:44:31 +08:00
pujielan
1fdbbcbfc0 [FIX] Fix bug service port canot be deleted properly 2017-12-28 12:07:50 +08:00
pujielan
5dc3bc10d1 [FIX] Fix bug service port canot be deleted properly 2017-12-28 12:07:13 +08:00
Bay
31d03f70d8 Merge remote-tracking branch 'github/master' into githubmaster 2017-12-28 11:03:58 +08:00
Bay
d4f8512a7d [FIX] fix save in codecheck and event;merge from release to fix some error 2017-12-28 10:18:52 +08:00
Bay
f026d1f396 [REV] optimize grctl output when error occured 2017-12-27 18:20:52 +08:00
pujielan
a1670a00d1 [FIX]Fix get mysql record bug 2017-12-27 17:58:17 +08:00
Bay
f5231e3fc7 [REV] remove error details when resp code is not 200 2017-12-27 15:10:48 +08:00
Bay
833cdc92d2 [FIX] fix grctl up command failed,caused by master nodestatus is not null 2017-12-27 12:36:15 +08:00
Bay
01b9bbef76 [REV] optimize node reg to hosts,and optimize collect system info for master 2017-12-27 12:24:05 +08:00
Bay
163a1f2be9 [REV] optimize task exec command error handle 2017-12-26 14:54:09 +08:00
Bay
38edb98196 [REV] optimize task exec command error handle 2017-12-26 14:48:58 +08:00
goodrain
373cdff5f9 [FIX] fix bug after merge branch 2017-12-25 19:59:35 +08:00
goodrain
9058e1e763 [FIX] Merge branches taskengin 2017-12-25 19:49:57 +08:00
goodrain
7f8a51517e [FIX] Merge branches taskengin 2017-12-25 19:49:32 +08:00
pujielan
3de2ae57fe [REV] Add complex envs delete 2017-12-25 11:14:02 +08:00
pujielan
ac2262bf75 [REV] Optimize function result code and msg 2017-12-24 22:40:15 +08:00
pujielan
8088fada79 [FIX]Fix etcd connection in define resource 2017-12-24 21:26:21 +08:00
Bay
44142e3657 [FIX] fix add node api in grctl 2017-12-23 20:00:56 +08:00
goodrain
d129ea923f [FIX] fix configs nil bug 2017-12-22 18:16:16 +08:00
bay1ts
fc0dd4e97d [FIX] fix can't unmarshal of response with list 2017-12-22 11:17:13 +08:00
bay1ts
3a46b8868f [REV] optimize region api ,optimize unmarshal list obj 2017-12-22 10:14:03 +08:00
bay1ts
36bb33cb54 [REV] optimize region api ,optimize task status 2017-12-21 18:33:41 +08:00
bay1ts
932ef9f116 [REV] optimize region api package,keep old status func in node sdk,remove build errors 2017-12-21 17:09:17 +08:00
bay1ts
18af4780a6 [REV] optimize region api package 2017-12-21 16:44:31 +08:00
pujielan
86f9f446a6 [ADD]Add tenant event log 2017-12-20 19:04:09 +08:00
goodrain
dcc844d612 [FIX] Modify the grctl init process to get the initialization data 2017-12-20 18:22:36 +08:00
pujielan
f3cddb257e Merge branch 'master' into cuib-local-master 2017-12-20 15:21:54 +08:00
pujielan
68f37b0f39 [FIX]Fix config_envs annotation 2017-12-20 15:19:56 +08:00
goodrain
6d87712cb7 [FIX] fix the bug of get datacenter config 2017-12-20 13:48:49 +08:00
goodrain
277cfb9aea [FIX] Scheduling test modification 2017-12-20 10:23:55 +08:00
goodrain
0a3f2747c2 [FIX] Complete the basic v2 task scheduling test 2017-12-19 18:46:49 +08:00
goodrain
42afa03e72 [FIX] Merge branch 'release-3.4' 2017-12-18 18:50:10 +08:00
pujielan
739091c23e [FIX]Fix cant delete service error bug
## Process trans service records to a table named “tenant_services_delete” when user delete their service.
## This problem will appear if the count of the  “delete table”(s) records larger than service table(s).
2017-12-18 16:48:57 +08:00
goodrain
b665fa0237 [FIX] Unified service registry logic
resolve bug #11
2017-12-18 14:44:25 +08:00
pujielan
e8cccc305b [FIX]Fix cant delete service error bug
## Process trans service records to a table named “tenant_services_delete” when user delete their service.
## This problem will appear if the count of the  “delete table”(s) records larger than service table(s).
2017-12-18 14:11:43 +08:00
pujielan
3f3bf9b3b0 [ADD]Add cloud auth annotation 2017-12-18 11:05:56 +08:00
pujielan
8899c8bbac [REV] compatibility old interface eid tenant_name 2017-12-15 19:02:35 +08:00
pujielan
2af927d022 [REV] compatibility old interface eid tenant_name 2017-12-15 19:01:14 +08:00
pujielan
a2c875d661 [REV] compatibility old interface eid tenant_name 2017-12-15 18:54:08 +08:00
bay1ts
a9153e7437 [REV] merge from code 2017-12-15 16:49:24 +08:00
bay1ts
59a544c6b4 [FIX] fix deploy version,match chaos,use upgrade 2017-12-15 14:32:30 +08:00
pujielan
8c7aed3d3f [DEL]Delete plugin default env in region 2017-12-15 12:22:14 +08:00
pujielan
115328e08a [REV] Optimize plugin system 2017-12-14 17:33:14 +08:00
pujielan
7861db5f98 [REV]Update rainbond lds cds sds server 2017-12-14 16:33:45 +08:00
pujielan
1aa710b977 [REV] Optimize plugin pod build 2017-12-14 10:50:03 +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
崔斌
e198c80ed9 [REV] Add discover env - DISCOVER_URL when creating plugin pods 2017-12-12 15:25:47 +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
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
bay1ts
36fc1ce593 [REV] optimize build api proxy in api 2017-12-12 11:21:34 +08:00
bay1ts
67e531820a Merge remote-tracking branch 'origin/master' 2017-12-12 10:07:55 +08:00
bay1ts
76cf3e527f [REV] optimize build api proxy in api 2017-12-12 10:07:25 +08:00
崔斌
683d535453 [DEL]Update event_id remove required
[REV]Update plugin table add json annotation
2017-12-11 15:47:43 +08:00
bay1ts
eb73a38f59 [REV] optimize get task api,optimize show command,optimize install status command,optimize node status 2017-12-11 11:51:28 +08:00
bay1ts
66f6db7361 [REV] optimize grctl show command 2017-12-11 11:10:36 +08:00
bay1ts
6d07bdd552 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-11 10:01:55 +08:00
bay1ts
db6808eca0 [REV] optimize grctl install 2017-12-08 23:31:47 +08:00
崔斌
cdbd46c6da [REV]Update validate time while recreate token 2017-12-08 18:53:53 +08:00
崔斌
f0a43de3b9 [REV]Update cloud auth show table format 2017-12-08 18:47:55 +08:00
崔斌
c68f30daad [ADD]Add grcth auth command 2017-12-08 17:14:12 +08:00
bay1ts
8f5bcf40e0 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-08 15:34:04 +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
崔斌
05d2d97496 [REV]Update api range 2017-12-07 21:32:09 +08:00
崔斌
73c6b3a32d [REV]Update api http/https 2017-12-07 19:59:15 +08:00
崔斌
850e43964e [ADD]Add err log in eventlog 2017-12-07 18:29:31 +08:00
崔斌
04046d4a71 [REV]Update swagger 2017-12-07 17:25:27 +08:00
崔斌
6201d9a95c [REV]Update https 2017-12-07 17:15:03 +08:00
崔斌
47464c30a3 [REV]Update cloud auth add put get interface 2017-12-07 16:37:09 +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
acc834d0b8 Optimize:merge dev to tenant_manage 2017-12-07 15:45:21 +08:00
bay1ts
47a24d094b Optimize:merge dev to tenant_manage 2017-12-07 15:44:53 +08:00
bay1ts
84b34ea2e9 [REV] optimize get tenant manage api 2017-12-07 14:01:46 +08:00
bay1ts
5617e1baf9 [REV] optimize get tenant by name 2017-12-07 13:47:25 +08:00
bay1ts
bd4f1bc7e1 [REV] optimize get tenant by name 2017-12-07 13:42:45 +08:00
bay1ts
8f3eb99c92 [REV] optimize get tenant by name 2017-12-07 13:36:56 +08:00
bay1ts
9d46c69ee2 [REV] optimize get tenant by name 2017-12-07 12:14:01 +08:00