Commit Graph

106 Commits

Author SHA1 Message Date
richardxz
479ef78f67 Merge pull request #128 from richardxz/master
fix bug: daemonset's status in list sometime maybe wrong
2018-06-28 17:02:24 +08:00
richardxz
6d297544f8 fix bug: daemonset's status in list sometime maybe wrong 2018-06-28 04:46:44 -04:00
jeff
6d3acd7083 only non-terminated pods will be counted when counting node pods 2018-06-28 15:44:23 +08:00
jeff
70b1d820b8 change router namespace 2018-06-26 17:11:18 +08:00
richardxz
54fbbe4a49 Merge pull request #120 from richardxz/master
change kubectl pods' namespace from kubesphere to kubesphere-controls,and ensure delete kubectl-rs when user is deleted
2018-06-26 16:32:54 +08:00
richardxz
7dc16a532a change kubectl pods' namespace from kubesphere to kubesphere-controls, and ensure delete kubectl-rs when user is deleted 2018-06-26 16:23:33 +08:00
zryfish
d41f26f92c Merge pull request #121 from zryfish/fix_heapster_client
Add error check to heapsterclient response
2018-06-26 16:05:28 +08:00
jeff
8a04650e29 Add error check to heapsterclient response
Add labelSelector to pod metrics api
Remove pod metrics in resources API
2018-06-26 14:42:36 +08:00
richardxz
d91921cd86 add container log filter 2018-06-26 14:03:38 +08:00
alex.fan
c9ceb67a17 Merge pull request #118 from littlebeer2100/master
alter components function
2018-06-26 13:57:56 +08:00
不羁
450fe1affa Merge pull request #117 from wansir/master
Fixed role definition.
2018-06-26 13:18:37 +08:00
yanmingfan
586c175975 alter components function 2018-06-26 11:51:14 +08:00
hongming
a1d8edc8d9 Fixed role definition. 2018-06-26 11:37:26 +08:00
richardxz
0631ca8b2f don't return default value when varible is null, and change service type as k8s display 2018-06-26 09:49:34 +08:00
jeff
57ad2171b6 fix router list 2018-06-25 20:29:39 +08:00
hongming
5b4146af64 Refine default role name. 2018-06-25 00:34:32 +08:00
zryfish
e0e53b9790 Merge pull request #110 from zryfish/fix_router_service_label
fix router service label
2018-06-21 19:49:06 +08:00
jeff
04e65c3101 fix router service label 2018-06-21 19:39:25 +08:00
yanmingfan
7bdda2c9d6 remove get drainstatus api 2018-06-21 17:36:05 +08:00
alex.fan
51137be4c2 Merge pull request #108 from littlebeer2100/master
alter drainstatus function
2018-06-21 15:21:12 +08:00
yanmingfan
1874a21d2f alter drainstatus function 2018-06-21 15:09:55 +08:00
richardxz
39a582a41f Merge pull request #107 from richardxz/master
add pvc status submit function
2018-06-21 15:00:23 +08:00
richardxz
75806e29b0 add pvc status submit function 2018-06-21 14:43:23 +08:00
jeff
5e4f040933 fix router service label 2018-06-21 12:55:59 +08:00
richardxz
91e5587fb0 change default shell to "sh" instead of "bash", change default mysql user to "root" 2018-06-21 10:52:50 +08:00
richardxz
4f4caa33fb add some log and delete some useless log 2018-06-21 09:19:23 +08:00
jeff
ccbcc7685e fix router service query bug 2018-06-20 20:34:42 +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
richardxz
4bdb9f6d6f fix bug when ns created, role do not create 2018-06-20 16:54:41 +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
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
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
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
wnxn
52f15d89f2 fix bug: missing pvc when listing pvc of a sc 2018-06-19 14:30:06 +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
yanmingfan
c7bbe1d004 alter components api,change docker sdk version 2018-06-16 17:36:32 +08:00
不羁
23d794ba98 Merge pull request #81 from wansir/master
Load configuration from mounted folders
2018-06-16 02:13:20 -05: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
hongming
26fcdb6d3e Load configuration from mounted folders 2018-06-14 14:14:42 +08:00