3250 Commits

Author SHA1 Message Date
zryfish
52a9f503bf Merge pull request #103 from zryfish/auto_push_image_on_master
auto upload image on master pr
2018-06-20 20:57:15 +08:00
zryfish
41c6d5048e Merge pull request #102 from zryfish/fix_router_service
fix router service query bug
2018-06-20 20:45:38 +08:00
jeff
350171a3b0 auto upload image on master pr 2018-06-20 20:40:56 +08:00
jeff
ccbcc7685e fix router service query bug 2018-06-20 20:34:42 +08:00
zryfish
1242ca743d Merge pull request #101 from zryfish/fix_ingress_controller_yaml
fix ingress controller yaml error
2018-06-20 17:44:39 +08:00
jeff
f75309f7f3 fix ingress controller yaml error 2018-06-20 17:31:22 +08:00
yanmingfan
aba55c9791 Merge remote-tracking branch 'origin/master' 2018-06-20 17:12:51 +08:00
alex.fan
00738e4a40 Merge pull request #1 from kubesphere/master
pull code
2018-06-20 17:12:32 +08:00
richardxz
b5bbcb541e Merge pull request #100 from richardxz/master
fix bug when ns created, role do not create
2018-06-20 17:10:08 +08:00
richardxz
23395a35f1 fix bug : pvc is bound, but status still available 2018-06-20 17:07:26 +08:00
zryfish
9838f7fd46 Update 9-with-rbac.yaml 2018-06-20 16:56:37 +08:00
richardxz
4bdb9f6d6f fix bug when ns created, role do not create 2018-06-20 16:54:41 +08:00
calvinyv
7ce3d6eda0 Merge pull request #99 from zryfish/fix_metrics_result
fix pod metrics error
2018-06-20 16:33:50 +08:00
jeff
a12da3b63e fix pod metrics error 2018-06-20 15:59:51 +08:00
richardxz
caf2acb839 Merge pull request #98 from richardxz/master
once deploy is deleted, delete related replicaset
2018-06-20 15:34:25 +08:00
richardxz
b19188364e once deploy is deleted, delete related replicaset 2018-06-20 15:26:38 +08:00
zryfish
109d2ab071 Update heapsterclient.go
Change heapsterclient url
2018-06-20 13:44:42 +08:00
richardxz
65ad3fa567 Merge pull request #97 from richardxz/master
use pvc annotations' "volume.beta.kubernetes.io/storage-class" as storageclassName when spec.storageClassName is nil
2018-06-20 12:59:09 +08:00
richardxz
376283d208 use pvc annotations' "volume.beta.kubernetes.io/storage-class" as storage-class name when spec.storageClassName is nil 2018-06-20 12:47:15 +08:00
richardxz
cbf04dc59f Merge pull request #96 from richardxz/master
display pod status as kubectl's display
2018-06-20 12:43:45 +08:00
yanmingfan
77c579f7c6 Merge remote-tracking branch 'origin/master' 2018-06-20 11:35:37 +08:00
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
12f7433147 Merge pull request #3 from kubesphere/master
fork
2018-06-20 10:11:22 +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