Commit Graph

81 Commits

Author SHA1 Message Date
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
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
alex.fan
35ac135469 Merge pull request #61 from littlebeer2100/components
components
2018-06-07 17:19:18 +08:00
不羁
64909a0d8e Merge pull request #59 from wansir/master
Refine rules definition
2018-06-07 03:42:59 -05:00
jeff
a75761c7d9 fix dockerfile 2018-06-07 15:51:33 +08:00
zryfish
92b52619fb Merge pull request #56 from zryfish/fix_router_bugs
fix router bugs
2018-06-07 14:27:26 +08:00
yanmingfan
a99233ee1e add istio kubesphere components 2018-06-06 19:33:05 +08:00
hongming
114255b482 Refine rules definition 2018-06-06 17:04:15 +08:00
jeff
e9e2ab1e11 fix router bugs 2018-06-06 14:36:41 +08:00
calvinyv
6b43e18056 Merge pull request #53 from kubesphere/zryfish-patch-1
Update README.md
2018-06-06 11:21:40 +08:00
zryfish
f26aeda622 Update README.md
Add travis build status
2018-06-06 10:24:06 +08:00
zryfish
484b135700 Merge pull request #52 from zryfish/master
format code
2018-06-06 10:16:34 +08:00
jeff
85d35e42ea format code 2018-06-05 20:52:50 +08:00
zryfish
41a64c4017 Merge pull request #49 from zryfish/router
add route
2018-06-05 20:22:48 +08:00
alex.fan
028656fd91 Merge pull request #2 from kubesphere/master
fork code
2018-06-05 16:12:19 +08:00
alex.fan
6b1ff0e05e Merge pull request #51 from littlebeer2100/reg
add extend apis
2018-06-05 16:11:31 +08:00
jeff
a64153b1c7 add route 2018-06-05 16:03:27 +08:00
yanmingfan
49e32284d6 1. add registries create, query apis
2.  fix components bug
2018-06-05 15:58:42 +08:00
alex.fan
d71f7770b8 Merge pull request #1 from kubesphere/master
fork code
2018-06-05 15:46:18 +08:00
alex.fan
354fb5a997 Merge pull request #44 from wansir/master
fix bug in iam api to add additional data check logic
2018-06-05 15:13:39 +08:00
alex.fan
40a0be0836 Merge pull request #47 from littlebeer2100/components
alter  Components struct
2018-06-02 15:49:28 +08:00
yanmingfan
50228688c2 add label and namespace to components 2018-06-02 15:13:47 +08:00
yanmingfan
861971a85e add label and namespace to components 2018-06-02 14:29:11 +08:00
yanmingfan
8030c795fb alter components status fault to unhealth 2018-06-02 13:45:01 +08:00
hongming
0e54c4df87 bug fixed 2018-06-01 23:58:48 +08:00
hongming
91404d4b23 Merge remote-tracking branch 'upstream/master' 2018-06-01 23:57:42 +08:00
alex.fan
820a27d01d Merge pull request #42 from littlebeer2100/components
Components
2018-06-01 20:28:28 +08:00
calvinyv
b5572e50f1 Merge pull request #43 from calvinyv/refactor_monitor_apis
refactor monitor apis to adopt new response format
2018-06-01 20:21:48 +08:00
Calvin Yu
1683f44594 refactor monitor apis to adopt new response format 2018-06-01 20:13:57 +08:00
yanmingfan
c8236735ae add component model 2018-06-01 20:02:33 +08:00
yanmingfan
fdf928cd13 add component model 2018-06-01 18:15:44 +08:00
hongming
5e1cb6b79d bug fixed 2018-06-01 16:31:25 +08:00
yanmingfan
ff7148aea8 Merge remote-tracking branch 'origin/master' 2018-06-01 11:10:37 +08:00
不羁
b65ba97e77 Merge pull request #39 from wansir/master
Add IAM API
2018-05-31 21:56:04 -05:00
Wiley Wang
d4063f1225 Merge pull request #38 from wnxn/master
move API handlers in webservice resource files
2018-06-01 10:26:05 +08:00
alex.fan
1e93ae3596 Merge pull request #1 from kubesphere/master
fork code
2018-06-01 10:04:04 +08:00
hongming
85f3a83e8f add IAM API 2018-05-31 21:15:08 +08:00
hongming
5c223fced9 Change filename to route_filter.go 2018-05-31 21:10:35 +08:00
hongming
a2ac779b31 Update .gitignore to ignore OSX trash file 2018-05-31 21:07:35 +08:00
Wang Xin
786eaefb7d move API handlers in webservice resource files 2018-05-31 19:51:46 +08:00
不羁
1a1cd8f644 Merge pull request #36 from wansir/master
add response struct
2018-05-31 01:14:09 -05:00
hongming
649cf50893 add response struct 2018-05-31 14:08:24 +08:00
calvinyv
9d6a7a52bc Merge pull request #31 from calvinyv/fix_issue_#30_missing_api
fix issue #30 missing pod count in nodes api
2018-05-29 11:07:24 +08:00
Calvin Yu
2646b74a41 fix issue #30 missing pod count in nodes api 2018-05-29 10:55:01 +08:00
calvinyv
55478b5d9b Merge pull request #29 from calvinyv/realtime_api_container
add real time cpu/memory monitor api for container level
2018-05-28 14:03:12 +08:00
Calvin Yu
c7307e4d7a add real time cpu/memory monitor api for container level 2018-05-28 11:36:47 +08:00
Calvin Yu
f5cb88afc2 add real time cpu/memory monitor api for container level 2018-05-28 10:42:27 +08:00
calvinyv
3067c47681 Merge pull request #28 from calvinyv/realtime_monitor_api
add api to get cpu/memory realtime data
2018-05-26 16:56:20 +08:00
Calvin Yu
64485f478c add api to get cpu/memory realtime data 2018-05-26 16:02:33 +08:00