Commit Graph

216 Commits

Author SHA1 Message Date
yanmingfan
f60610e39d alter components function to filter uncomponents svc 2018-07-11 18:21:21 +08:00
richardxz
69de8de4f0 Merge pull request #144 from richardxz/master
change db driver
2018-07-07 23:31:29 +08:00
richardxz
6d812aa3c5 change db driver 2018-07-07 11:20:30 -04:00
richardxz
fc11bfbe11 Merge pull request #143 from richardxz/master
change default db password
2018-07-07 11:45:46 +08:00
richardxz
93f4d9467c change default db password 2018-07-06 23:26:55 -04:00
不羁
24fe805747 Merge pull request #141 from wansir/master
Refine rules policy.
2018-07-05 16:24:49 +08:00
richardxz
7e36118fe5 Merge pull request #140 from richardxz/master
delete useless code
2018-07-05 16:18:41 +08:00
hongming
a0ee94db5e Refine rules policy. 2018-07-05 16:13:21 +08:00
richardxz
e26505094c delete useless code 2018-07-05 04:00:01 -04:00
不羁
29b71040f4 Merge pull request #139 from wansir/master
Refine policy rules.
2018-07-05 13:57:18 +08:00
hongming
8b3c4d0726 Refine policy rules. 2018-07-05 10:28:10 +08:00
zryfish
4e80fe6626 Merge pull request #138 from zryfish/fix_metrics_error
fix metrics memory error
2018-07-04 00:33:47 +08:00
jeff
9084fdee97 fix metrics memory error 2018-07-04 00:22:30 +08:00
zryfish
6359bb5459 Merge pull request #137 from zryfish/fix_router_command_bug
fix router command args error
2018-07-02 18:00:58 +08:00
jeff
08c2659f39 fix router type 2018-07-02 17:29:06 +08:00
richardxz
2365247622 Merge pull request #136 from wansir/master
Remove useless logging.
2018-07-02 17:08:41 +08:00
hongming
8547b366db Remove useless logging. 2018-07-01 20:02:33 +08:00
zryfish
3530f1158d Merge pull request #135 from zryfish/fix_service_type
fix router type
2018-07-01 17:40:45 +08:00
jeff
08fd9c7f77 fix router type 2018-07-01 15:16:46 +08:00
richardxz
b1380028f4 Merge pull request #134 from richardxz/master
add fuzzy search function in list page
2018-06-30 16:30:36 +08:00
richardxz
24fcbd7206 add fuzzy search function in list page 2018-06-30 04:15:03 -04:00
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