Commit Graph

128 Commits

Author SHA1 Message Date
richardxz
cc958a76c5 Merge branch 'master' into master 2018-06-20 11:26:01 +08:00
richardxz
e7f91143d7 display pod status as kubectl's display 2018-06-20 11:18:43 +08:00
zryfish
a27c34ab42 Merge pull request #95 from zryfish/refactor_route
Fix minor metrics bugs and refactor route implementation
2018-06-20 10:41:09 +08:00
jeff
18932ed1d8 Fix minor metrics bugs and refactor route implementation 2018-06-20 10:29:50 +08:00
alex.fan
28dbcc797b Merge pull request #94 from littlebeer2100/drain
alter drain function
2018-06-20 10:09:06 +08:00
richardxz
3cee5d49fc Merge pull request #92 from richardxz/master
add namespace's resource usage Statistics and fix some bugs
2018-06-20 09:49:43 +08:00
richardxz
07bef0475a add namespace's resource usage Statistics and fix some bugs 2018-06-19 22:17:51 +08:00
yanmingfan
d42cbd8258 add get drain status api 2018-06-19 20:10:53 +08:00
zryfish
8527fcac0d Update Makefile
change binary and image name to kubepshere-apiserver
2018-06-19 17:33:08 +08:00
Wiley Wang
da2d8880e5 Merge pull request #93 from wnxn/master
fix bug: missing pvc when listing pvc of a sc
2018-06-19 16:10:38 +08:00
wnxn
52f15d89f2 fix bug: missing pvc when listing pvc of a sc 2018-06-19 14:30:06 +08:00
alex.fan
0c7cf180fc Merge pull request #2 from kubesphere/master
fork code
2018-06-19 11:42:01 +08:00
richardxz
894f45d7e6 Merge pull request #91 from richardxz/master
add default rolebinding, and provide a workaround to process nil object when use k8s watch
2018-06-17 22:31:57 +08:00
richardxz
bd4121d69b add default rolebinding, and provide a workaround to process nil object when use k8s watch 2018-06-17 00:38:14 +08:00
alex.fan
cdc53e4881 Merge pull request #88 from littlebeer2100/components
Components
2018-06-16 18:37:00 +08:00
yanmingfan
c7bbe1d004 alter components api,change docker sdk version 2018-06-16 17:36:32 +08:00
littlebeer2100
a83c797df3 change docker client sdk version 2018-06-16 15:35:17 +08:00
alex.fan
77930ea0a7 Merge pull request #1 from kubesphere/master
fork code
2018-06-16 15:28:54 +08:00
不羁
23d794ba98 Merge pull request #81 from wansir/master
Load configuration from mounted folders
2018-06-16 02:13:20 -05:00
richardxz
0088325676 Merge pull request #86 from richardxz/patch
Patch
2018-06-16 13:36:05 +08:00
littlebeer2100
23535e5ccb mapping data to etcd 2018-06-16 13:21:37 +08:00
yanmingfan
6922cbc9dc mapping data to etcd 2018-06-16 13:00:47 +08:00
richardxz
b72e332aff mapping data to etcd 2018-06-16 12:13:48 +08:00
zryfish
663a17f230 Fix typo 2018-06-14 16:53:43 +08:00
hongming
26fcdb6d3e Load configuration from mounted folders 2018-06-14 14:14:42 +08:00
zryfish
2a06efd114 Merge pull request #80 from zryfish/ci_dep
use dep as denpendency managment tool
2018-06-14 10:35:01 +08:00
jeff
e9d73b7ace use dep as denpendency managment tool 2018-06-14 00:30:44 +08:00
Wiley Wang
70a3b06987 Merge pull request #79 from wnxn/master
add storageclass metrics list extend API
2018-06-13 17:09:36 +08:00
wnxn
fc811db90d modify annotation 2018-06-13 17:03:36 +08:00
wnxn
9610f70c50 make fmt 2018-06-13 16:43:08 +08:00
wnxn
48bb3d4f89 add error log 2018-06-13 16:12:55 +08:00
wnxn
3820417bb2 add storageclass metrics list api 2018-06-13 15:59:14 +08:00
alex.fan
b10508f0c4 Merge pull request #78 from littlebeer2100/registries
optimize Registries delete and query function
2018-06-13 10:34:57 +08:00
yanmingfan
7ba7a1a237 alter registries ListAllRegistries DeleteRegistries GetReisgtries function 2018-06-12 20:57:26 +08:00
alex.fan
e38150df4d Merge pull request #1 from kubesphere/master
fork code from master
2018-06-12 16:16:08 +08:00
alex.fan
bb11892364 Merge pull request #77 from littlebeer2100/nodes
add drain function
2018-06-12 16:12:05 +08:00
yanmingfan
06ed882f13 add drain function 2018-06-12 15:42:21 +08:00
calvinyv
2e5e364088 Merge pull request #74 from zryfish/fix_router_serviceaccount
change deployment service account
2018-06-11 15:11:36 +08:00
jeff
3ca02544a8 change deployment service account 2018-06-11 14:13:14 +08:00
不羁
0090af0d36 Merge pull request #73 from wansir/master
Refine rules definition
2018-06-11 00:55:58 -05:00
alex.fan
5187d40b8b Merge pull request #71 from littlebeer2100/registries
add registries create update delete query function
2018-06-11 13:49:30 +08:00
hongming
54576548be Refine rules definition 2018-06-11 13:06:06 +08:00
yanmingfan
e1f75e2dc4 add registries create query update delete function 2018-06-11 12:14:48 +08:00
Wiley Wang
1e744d0ad3 Merge pull request #70 from wnxn/master
fix using nil pointer bug
2018-06-08 19:03:19 +08:00
richardxz
fc86b2e474 Merge pull request #69 from richardxz/master
add kubectl/kubeconfig/quota/terminal api, but quota api is tempoary,…
2018-06-08 18:42:02 +08:00
wnxn
e75c5ffa5b add function annotation 2018-06-08 17:42:31 +08:00
wnxn
0ef5506251 fix resolving nil pointer bug 2018-06-08 17:42:04 +08:00
wnxn
9903136588 modify API URL 2018-06-08 17:40:41 +08:00
jenkins
7140181e94 add kubectl/kubeconfig/quota/terminal api, but quota api is tempoary, will be changed as soon 2018-06-08 15:08:46 +08:00
calvinyv
e9957a1aa7 Merge pull request #62 from zryfish/fix_dockerfile
fix dockerfile
2018-06-07 17:40:20 +08:00