Commit Graph
316 Commits
Author SHA1 Message Date
李泽玺 6301b2b6af Merge pull request #467 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-schedule-disk to release/2.3.0
* commit '0244e70516fa14222350673c757ba279d687eb27':
  support schedule disk
2018-11-12 21:16:39 +08:00
Zexi Li 0244e70516 support schedule disk 2018-11-12 18:51:34 +08:00
TangBin 4c3ae8f976 Merge branch 'release/2.3.0' into feature/tb-support-aws 2018-11-10 20:03:07 +08:00
TangBin 74e3f9a699 update vendor 2018-11-10 20:00:36 +08:00
邱剑 0b384660a4 Merge pull request #447 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-admin-capable-test to release/2.3.0
* commit 'dbab380d734d0de1684f5cb4472869d5d981d773':
  增加climc policy-admin-capable命令
2018-11-10 15:30:57 +08:00
邱剑 492469887b Merge pull request #431 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-qcloud to release/2.3.0
* commit 'aab792ffa8ee7f873ab24d5d9ae66bc7ef3ec548':
  添加部分aliyun操作
  支持腾讯云资源导入
2018-11-10 13:35:05 +08:00
Qiu Jian dbab380d73 增加climc policy-admin-capable命令 2018-11-09 15:52:46 +08:00
周有松 ff4b6ecad9 Merge pull request #441 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0
* commit '09e511883cf481bf8142ee9ed3f0892fe1418821':
  cloudcommon: validators: return 400 for struct validation failure
  loadbalancers: show loadbalancer name for listener and backend group
  mcclient: loadbalancers: allow updating names
  loadbalancers: more compact backendGroup validation
  lbagent: list with details=true explicitly
  lbagent: fix unused imports
  pkg: httputils: ParseJSONResponse(): rewrite for clearness
  mcclient: base: guard against empty repsonse
  mcclient: options: set details correctly
2018-11-09 14:11:24 +08:00
Yousong Zhou 13bc224202 mcclient: loadbalancers: allow updating names
- loadbalanceracls: allow updating only name
2018-11-08 15:37:48 +00:00
Zexi Li 5fae00ed96 climc: allow config k8s node docker registry 2018-11-08 20:29:32 +08:00
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
邱剑 cded919ce0 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '83299b849b473abaa49881a89ffe61576a6ea779':
  Image添加description字段
2018-11-08 01:44:23 +08:00
屈轩 3716e88878 Image添加description字段 2018-11-07 17:56:28 +08:00
TangBin 1f341232de update vendor and fix conficlt 2018-11-07 17:47:00 +08:00
Qiu Jian a497f4dae8 角色增加描述(description)字段 2018-11-05 18:12:47 +08:00
李泽玺 f91760e20d Merge pull request #427 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-helm-app to release/2.3.0
* commit '2feb414106d138a471c3f31c71998f31287cfbd7':
  climc: add k8s servicetree and notify app
2018-11-05 17:32:33 +08:00
Zexi Li 2feb414106 climc: add k8s servicetree and notify app 2018-11-05 16:50:13 +08:00
李泽玺 a534b14586 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'a5f9d9c6871a2d29b6774cf609c87410e7222c7c':
  2.0.0: make qunar happy
2018-11-05 16:30:22 +08:00
李泽玺 272b2f0983 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'a534b14586c3fb83476044fe35460ea079641a66':
  2.0.0: make qunar happy
2018-11-05 16:30:22 +08:00
李泽玺 a5f9d9c687 Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'b1dade9701606d505315271a09ef1c88cfc48827':
  2.0.0: make qunar happy
2018-11-05 16:30:22 +08:00
Yousong Zhou 1da2255d4f 2.0.0: make qunar happy 2018-11-05 08:27:14 +00:00
Qiu Jian 57203202ec Add dynamic schedtag show command 2018-11-04 01:13:07 +08:00
屈轩 9833767fb2 支持腾讯云资源导入 2018-11-03 17:32:54 +08:00
TangBin bab62348fc support aws china 2018-11-03 17:31:46 +08:00
邱剑 96bc0c5cdb Merge pull request #419 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-scheduler-add-ssl-support to release/2.3.0
* commit '7e463a4644fc774061305fcacfc82f3722947ce4':
  hack: scheduler ping/version escape auth
  make reverse proxy insecure ssl (for influxdb)
  make webconsole ssl capable
  scheduler add ssl support
2018-11-03 13:33:19 +08:00
Qiu Jian 0ad9260186 scheduler add ssl support 2018-11-02 22:20:38 +08:00
邱剑 e095948e99 Merge pull request #407 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-project-add-tag to release/2.3.0
* commit 'c303afcb4644e4fac09da0ca18a8a3ce18e5a144':
  增加keystone project add tag接口支持
2018-11-02 20:34:37 +08:00
邱剑 d73cf3699e Merge pull request #416 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-endpoint-list to release/2.3.0
* commit '85af9754d7f56f2d065011b44a43297271670b7d':
  climc: endpoint list by service id
2018-11-02 20:34:19 +08:00
Zexi Li 85af9754d7 climc: endpoint list by service id 2018-11-02 20:32:56 +08:00
李泽玺 2952d4ab12 Merge pull request #409 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-helm-app to release/2.3.0
* commit 'af97ebe0bc6cb68968f6d320a9b53284be9bdab8':
  climc: k8s-repo-sync
  climc: helm release app
2018-11-02 16:55:03 +08:00
Zexi Li af97ebe0bc climc: k8s-repo-sync 2018-11-02 12:36:51 +08:00
Qiu Jian c303afcb46 增加keystone project add tag接口支持 2018-11-01 22:30:13 +08:00
邱剑 5ce6eafb4e Merge pull request #380 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-migrate to release/2.3.0
* commit '24c08ed178bd8b7411a0defc92dc7ab74ffc52fd':
  server migrate all some bugfix
2018-11-01 21:19:18 +08:00
Zexi Li c2e628d6ef climc: helm release app 2018-11-01 16:31:29 +08:00
Qiu Jian e83e1966d2 policyManager增加IsAdminCapable接口 2018-10-31 18:38:19 +08:00
wanyaoqi 24c08ed178 server migrate all
some bugfix
2018-10-31 12:25:40 +08:00
李泽玺 d3dd39f88f Automatic merge from release/2.2.0 -> release/2.3.0
* commit '4f0c608935b696dadc69abad67d593646c659d10':
  region: usage support filter by project
2018-10-31 12:11:39 +08:00
李泽玺 4f0c608935 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '75f61cf9c86a0433b7f644d6ee1ac7e3ad79a889':
  region: usage support filter by project
2018-10-31 12:11:38 +08:00
Zexi Li 7c04773c72 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into hotfix/lzx-resolve-conflict-2.1.0-20181031 2018-10-31 12:10:39 +08:00
Zexi Li 25c712e213 region: usage support filter by project 2018-10-30 21:39:50 +08:00
邱剑 908111bcf2 Merge pull request #383 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-restruct-policy-code to release/2.3.0
* commit '33f546aafd9455f228db22d4bc01e62039382105':
  重构代码,将policy从db中分离出来,代码更干净一些
2018-10-30 10:24:39 +08:00
李泽玺 b2cfcf9f0f Merge pull request #384 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/monitor-add-treenode-change-project-type to release/2.2.0
* commit '3feb2839aec46dc6f6b3889c6ac889e655d09041':
  change-project-type
  change-project-type
2018-10-30 10:18:23 +08:00
李泽玺 b6bcf301a9 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'b2cfcf9f0ffe5e67eb1ae6003320b4f7cc48ae03':
  change-project-type
  change-project-type
2018-10-30 10:18:23 +08:00
zhengjiajie 3feb2839ae change-project-type 2018-10-30 09:31:02 +08:00
zhengjiajie 751f0b39cb change-project-type 2018-10-30 09:14:24 +08:00
Qiu Jian 33f546aafd 重构代码,将policy从db中分离出来,代码更干净一些 2018-10-30 00:12:19 +08:00
邱剑 926fc3a3dd Merge pull request #369 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-rbac-support to release/2.3.0
* commit '5a8bd4848509782e3ce953e9faae864ee09a0d8b':
  改进:rpc支持
  make fmt
  remove slice nil check
  fix quota check rbac check logic
  增加 usages get 和 quotas get/update 的RBAC检查
  JointModel support
  改进:model资源支持rbac认证,需要打开enable_rbac选项,默认关闭。非model资源还不支持
2018-10-29 22:22:31 +08:00
Qiu Jian 5a8bd48485 改进:rpc支持 2018-10-29 22:10:00 +08:00
Yousong Zhou 719a4686ce lbagent: add telegraf support 2018-10-27 09:40:38 +00:00
Qiu Jian 0c06216364 JointModel support 2018-10-27 16:40:41 +08:00