richardxz
|
1e4e3fc4d8
|
Merge pull request #133 from richardxz/master
update kubectl-pod's delete function
|
2018-06-30 15:50:42 +08:00 |
|
richardxz
|
92512850d7
|
update kubectl-pod's delete function
|
2018-06-30 03:31:56 -04:00 |
|
zryfish
|
d1c5693e1a
|
Merge pull request #132 from zryfish/fix_resource_limit
fix resource limit
|
2018-06-30 00:48:48 +08:00 |
|
jeff
|
859305b517
|
fix resource limit
|
2018-06-29 21:10:14 +08:00 |
|
不羁
|
8b61c25f69
|
Merge pull request #131 from wansir/master
Refactor iam module.
|
2018-06-29 15:39:55 +08:00 |
|
hongming
|
6071095e24
|
Refactor iam module.
|
2018-06-29 14:18:45 +08:00 |
|
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 |
|
zryfish
|
06a23e5154
|
Merge pull request #127 from zryfish/fix_pods_count
only non-terminated pods will be counted when counting node pods
|
2018-06-28 15:57:11 +08:00 |
|
jeff
|
6d3acd7083
|
only non-terminated pods will be counted when counting node pods
|
2018-06-28 15:44:23 +08:00 |
|
zryfish
|
9010e16ada
|
Merge pull request #123 from zryfish/fix_install_yaml_error
change install yaml error
|
2018-06-26 18:57:53 +08:00 |
|
jeff
|
22f746514e
|
change install yaml error
|
2018-06-26 18:47:20 +08:00 |
|
zryfish
|
00a3be7922
|
Merge pull request #122 from zryfish/change_router_namespace
change router namespace
|
2018-06-26 17:24:03 +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
|
f1d5ab3a92
|
Merge pull request #119 from richardxz/master
add container log filter
|
2018-06-26 14:13:01 +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
|
24594fd28d
|
Merge pull request #115 from richardxz/master
don't return default value when varible is null, and change service type as k8s display
|
2018-06-26 10:18:04 +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 |
|
zryfish
|
471c5d7b48
|
Merge pull request #113 from zryfish/fix_routers_list
fix routers list
|
2018-06-25 21:52:26 +08:00 |
|
jeff
|
57ad2171b6
|
fix router list
|
2018-06-25 20:29:39 +08:00 |
|
不羁
|
5c762e48c3
|
Merge pull request #112 from wansir/master
Refine default role name.
|
2018-06-25 09:30:55 +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 |
|
alex.fan
|
a4702f4178
|
Merge pull request #109 from littlebeer2100/master
remove get drainstatus api
|
2018-06-21 18:11:54 +08:00 |
|
yanmingfan
|
7bdda2c9d6
|
remove get drainstatus api
|
2018-06-21 17:36:05 +08:00 |
|
alex.fan
|
cf3b66555b
|
Merge pull request #2 from kubesphere/master
update code from master
|
2018-06-21 15:22:04 +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 |
|
zryfish
|
4195b2d264
|
Merge pull request #106 from zryfish/fix_router_service_label
fix router service label
|
2018-06-21 13:31:51 +08:00 |
|
jeff
|
5e4f040933
|
fix router service label
|
2018-06-21 12:55:59 +08:00 |
|
zryfish
|
b40750378b
|
Merge pull request #105 from richardxz/master
@richardxz change default shell to "sh" instead of "bash", change default mysql user to "root"
|
2018-06-21 12:48:02 +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
|
195dc34337
|
Merge pull request #104 from richardxz/master
add some log and delete some useless log
|
2018-06-21 10:22:37 +08:00 |
|
richardxz
|
4f4caa33fb
|
add some log and delete some useless log
|
2018-06-21 09:19:23 +08:00 |
|
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 |
|