opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,027 Commits 27 Branches 687 Tags
bc02b3b433c56af54fee254bc6aec3c4fef019bb
Commit Graph
2027 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiu Jian bc02b3b433 1. 
取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred
2. 在应用启动时候，必须设置 SetServiceType，否则退出
 2018-11-30 23:00:11 +08:00
邱剑 bfed7c25c3 Merge pull request #618 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-webconsole to release/2.3.0 
* commit 'd15aa96f861fd6f388c6a26f9b94c1d2f90feaf8':
  修复同步规则缺失问题
  磁盘名称为未命名时使用磁盘ID
  补充腾讯云webconsole
 2018-11-30 20:06:10 +08:00
屈轩 d15aa96f86 修复同步规则缺失问题 2018-11-30 17:44:47 +08:00
屈轩 511de80349 磁盘名称为未命名时使用磁盘ID 2018-11-30 17:15:46 +08:00
屈轩 45ddeaf084 补充腾讯云webconsole 2018-11-30 17:08:39 +08:00
邱剑 de281472b0 Merge pull request #616 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-keypair-eip to release/2.3.0 
* commit '3e6c9d74960ecd87a6ad806bc080363a0dc766d5':
  修复密钥对同步问题及绑定eip问题
 2018-11-30 16:41:43 +08:00
屈轩 3e6c9d7496 修复密钥对同步问题及绑定eip问题 2018-11-30 16:12:47 +08:00
邱剑 f9899a6e59 Merge pull request #615 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webconsole-known-host to release/2.3.0 
* commit '7caeab976c28ed8300845a49716b815c76851557':
  忽略known_hosts影响
 2018-11-30 16:05:02 +08:00
屈轩 7caeab976c 忽略known_hosts影响 2018-11-30 16:04:08 +08:00
邱剑 70c2b82557 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'b51cb3a1cf8493cd3085b6268711d4d568d47e15':
  忽略known_hosts记录
 2018-11-30 15:48:50 +08:00
邱剑 b51cb3a1cf Merge pull request #613 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-resolve-webconsole to release/2.2.0 
* commit '0e68f6d486b3e57a795f825b78370492569db49d':
  忽略known_hosts记录
 2018-11-30 15:48:49 +08:00
屈轩 0e68f6d486 冲突解决 2018-11-30 15:33:33 +08:00
邱剑 7f02eaa982 Merge pull request #612 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-host-usage-panic to release/2.3.0 
* commit 'b28c3783cbbe6c220ab48519a49262972405887c':
  region: host usage 取消关于 zone 的 filter
 2018-11-30 15:32:25 +08:00
邱剑 6bb5f1de09 Merge pull request #610 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webconsole-knownhosts to release/2.1.0 
* commit '223c5aeb351c9fa9170dbf756bb2172f663aac62':
  忽略known_hosts记录
 2018-11-30 15:31:39 +08:00
Zexi Li b28c3783cb region: host usage 取消关于 zone 的 filter 2018-11-30 15:30:36 +08:00
屈轩 223c5aeb35 忽略known_hosts记录 2018-11-30 15:23:40 +08:00
邱剑 b4150df337 Merge pull request #608 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-refactor-rbac to release/2.3.0 
* commit '2f22ebe0a889ac7ce78e0dd980e59227a954c3eb':
  修正rbac，非管理模式下权限有deny, owner, user, guest四个级别，管理模式下，有deny, allow两个级别。只有非管理模式下，才会应用缺省的权限设置。
 2018-11-30 13:56:01 +08:00
李泽玺 314f309b35 Merge pull request #601 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-ingress-create to release/2.3.0 
* commit 'd6ca22694d6de441b7b55e4ce095c1a4675b9cb5':
  climc: ingress create
 2018-11-29 23:55:14 +08:00
Qiu Jian 2f22ebe0a8 修正rbac，非管理模式下权限有deny, owner, user, 
guest四个级别，管理模式下，有deny,
allow两个级别。只有非管理模式下，才会应用缺省的权限设置。
 2018-11-29 23:13:53 +08:00
邱剑 946ba4afa0 Merge pull request #603 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-resource-count to release/2.3.0 
* commit 'ecc99010370fa404db6183bd2752241255486df5':
  创建eip后等待状态为ready
 2018-11-29 21:39:13 +08:00
邱剑 7b36be5aad Merge pull request #600 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-type to release/2.3.0 
* commit '00cd0382755459167da9f28963f4471b8155e08d':
  迁移storagetype到2.3.0
 2018-11-29 21:27:56 +08:00
邱剑 b9edd5419e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '55f0ae9c9ee2a3b16e3588d21eb568e309d93520':
  避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败
  修复: aliyun创建主机失败时，正确返回失败信息
 2018-11-29 18:27:15 +08:00
邱剑 55f0ae9c9e Merge pull request #598 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-aliyun-create-instance-error to release/2.1.0 
* commit '171e4f2347d34ffbea11ac9f7f52ce64bd4ea967':
  避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败
  修复: aliyun创建主机失败时，正确返回失败信息
 2018-11-29 18:27:15 +08:00
邱剑 a081993d25 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'b9edd5419ef0f92a651dbf0f9687b3c46d44bfb9':
  避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败
  修复: aliyun创建主机失败时，正确返回失败信息
 2018-11-29 18:27:15 +08:00
屈轩 ecc9901037 创建eip后等待状态为ready 2018-11-29 18:26:30 +08:00
邱剑 7f82c75854 Merge pull request #602 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-resource-count to release/2.3.0 
* commit '642d49f574117a56e9897a60365bea643dce89e9':
  腾讯云返回TotalCount有可能是浮点型，统一使用Float转换
 2018-11-29 18:25:33 +08:00
屈轩 642d49f574 腾讯云返回TotalCount有可能是浮点型，统一使用Float转换 2018-11-29 18:13:16 +08:00
Zexi Li d6ca22694d climc: ingress create 2018-11-29 16:55:30 +08:00
屈轩 00cd038275 迁移storagetype到2.3.0 2018-11-29 16:27:43 +08:00
屈轩 171e4f2347 避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败 2018-11-29 14:27:01 +08:00
屈轩 4f2d759fb6 修复: aliyun创建主机失败时，正确返回失败信息 2018-11-29 14:02:35 +08:00
邱剑 7d4309fb69 Merge pull request #590 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-nic-storage to release/2.3.0 
* commit 'fbc3fc5889cc93f96506555f9b4ea2d4ae8289b3':
  补充同步腾讯云安全组规则
  修正赋值顺序
  添加disk hypervisor
  关联安全组
  私网IP同步及storage名称统一小写
 2018-11-29 12:28:49 +08:00
邱剑 cbc87b89d3 Merge pull request #595 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-delete-vm to release/2.3.0 
* commit '3d76a82d788a784ccd22d3ce072f91fd32bcaa1e':
  删除虚拟机时避免无限循环
 2018-11-29 12:08:48 +08:00
屈轩 3d76a82d78 删除虚拟机时避免无限循环 2018-11-29 11:38:30 +08:00
邱剑 741ab54f2d Merge pull request #594 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-normal-user-usage to release/2.3.0 
* commit 'e8f647809dd31ad11abefd6e4e20e7acc19ef8d8':
  修复: 没开启 RBAC 时没有 common usage
 2018-11-28 21:33:20 +08:00
Zexi Li e8f647809d 修复: 没开启 RBAC 时没有 common usage 2018-11-28 21:30:54 +08:00
邱剑 b22c5dfc6b Merge pull request #592 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-validate-update-credential to release/2.3.0 
* commit 'cdeff01d378cf142fa3dc44bcc6a261ce8a0b4a3':
  更新密钥时检查密钥正确性
 2018-11-28 21:23:59 +08:00
邱剑 4bc9600e7a Merge pull request #588 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/reslove-conflict to release/2.3.0 
* commit 'bdb60e3acd18a2e4159d582fd27cd80d210dfdba':
  add guest actions
 2018-11-28 21:20:48 +08:00
屈轩 cdeff01d37 更新密钥时检查密钥正确性 2018-11-28 19:33:36 +08:00
屈轩 fbc3fc5889 补充同步腾讯云安全组规则 2018-11-28 18:43:09 +08:00
屈轩 48974ebd48 修正赋值顺序 2018-11-28 16:52:06 +08:00
屈轩 87a1cce5eb 添加disk hypervisor 2018-11-28 16:50:20 +08:00
屈轩 46a4cbd4a4 关联安全组 2018-11-28 16:47:04 +08:00
屈轩 396da0de61 私网IP同步及storage名称统一小写 2018-11-28 16:04:22 +08:00
wanyaoqi bdb60e3acd resolve conflict 2018-11-28 15:23:56 +08:00
邱剑 95c9e544ee Merge pull request #586 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/guest_actions to release/2.2.0 
* commit 'eb57a4c5312f124a366799914a4ec0301be5c7a9':
  add guest actions
 2018-11-28 14:44:14 +08:00
wanyaoqi eb57a4c531 add guest actions 2018-11-28 11:23:58 +08:00
李泽玺 e49180a3f5 Merge pull request #585 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-app to release/2.3.0 
* commit 'f1fcea29f520555ad8b7d5f217019cd55af11ead':
  climc: support job, statefulset, secret create
 2018-11-28 10:47:34 +08:00
Zexi Li f1fcea29f5 climc: support job, statefulset, secret create 2018-11-27 22:07:40 +08:00
邱剑 f8d0421f7a Merge pull request #580 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-rebuild-root-2.1.0 to release/2.1.0 
* commit '957a4c074446600dd2feb1378948ef972d7ad557':
  避免image_id未做转换后导致rebuild-root任务失败
 2018-11-27 21:06:38 +08:00