opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,052 Commits 27 Branches 687 Tags
a543901e2f95d7a717ef7599bf8ecb4de3ea6f96
Commit Graph
1443 Commits
Author SHA1 Message Date
TangBin a543901e2f yunionconfig build error fix 2018-12-01 14:52:01 +08:00
邱剑 36435eeb28 Merge pull request #626 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-remove-usercred-issystemadmin to release/2.3.0 
* commit 'a95b396f2407b782d6d76dd02d6387591cb58a47':
  remove inframanager.go
  recode
  allow zone_id empty for hosts
  Remove SInfrastructureManager & SInfrasture
  minor fixes
  fix userCred.IsSystemAdmin() for set/del extra option
  1. 取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred 2. 在应用启动时候，必须设置 SetServiceType，否则退出
 2018-12-01 14:27:50 +08:00
邱剑 4a0087d260 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'd58a7e091588eea6446b31d5d622ab62b84b567b':
  避免eip关联主机或解绑失败后，不能再次操作
 2018-12-01 12:54:32 +08:00
邱剑 d58a7e0915 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '4aa4f427b66ea7c985002b31a939a300f1f83ba0':
  避免eip关联主机或解绑失败后，不能再次操作
 2018-12-01 12:54:32 +08:00
Qiu Jian a95b396f24 remove inframanager.go 2018-12-01 12:08:02 +08:00
Qiu Jian e42f1a7744 recode 2018-12-01 12:05:41 +08:00
李泽玺 fea8c29fa7 Merge pull request #620 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-release-rollback to release/2.3.0 
* commit '8e4c1e1672f4d4aa38cf221892888c95bc93d9f2':
  climc: k8s release rollback
 2018-12-01 11:47:13 +08:00
屈轩 80478ca92c 避免eip关联主机或解绑失败后，不能再次操作 2018-12-01 11:23:43 +08:00
Qiu Jian 0a7b736336 allow zone_id empty for hosts 2018-12-01 01:12:12 +08:00
Qiu Jian b4fcb63b64 Remove SInfrastructureManager & SInfrasture 2018-12-01 01:05:13 +08:00
Qiu Jian 334f3605ba minor fixes 2018-12-01 00:42:29 +08:00
Qiu Jian bc0b5d1e44 fix userCred.IsSystemAdmin() for set/del extra option 2018-11-30 23:29:03 +08:00
Qiu Jian e99e941b2f Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-remove-usercred-issystemadmin 2018-11-30 23:26:28 +08:00
Qiu Jian 9cac0cd0f7 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.3.0-20181130 
Conflicts:
	cmd/climc/shell/servers.go
	pkg/compute/models/guest_actions.go
 2018-11-30 23:13:51 +08:00
邱剑 0e7b95abc0 Merge pull request #621 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroupcache-log to release/2.3.0 
* commit 'f905e01012f52654ad9e97c0110c2d28e489a83a':
  同步同一个secgroupcache需要加锁
 2018-11-30 23:08:26 +08:00
邱剑 3e3b9566c3 Merge pull request #622 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/add-guest-extra-options-2.2.0 to release/2.2.0 
* commit '1530ca8914b96b987685e48f3690ea667783eb19':
  add guest extra options
 2018-11-30 23:04:52 +08:00
邱剑 ed77d515d1 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '309a2ca0b459a0466eab0229e8e25a899d888946':
  大部分公有云不需要将安全组拆分为单个单个的规则
 2018-11-30 23:04:03 +08:00
邱剑 309a2ca0b4 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '2239592dcbafd7afe6e2786be4e99ba611fd6df4':
  大部分公有云不需要将安全组拆分为单个单个的规则
 2018-11-30 23:04:03 +08:00
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
屈轩 0f78dd1ffc 大部分公有云不需要将安全组拆分为单个单个的规则 2018-11-30 20:40:59 +08:00
wanyaoqi 1530ca8914 add guest extra options 2018-11-30 20:30:10 +08:00
屈轩 f905e01012 同步同一个secgroupcache需要加锁 2018-11-30 20:22:17 +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
Zexi Li 8e4c1e1672 climc: k8s release rollback 2018-11-30 19:57:40 +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
屈轩 3e6c9d7496 修复密钥对同步问题及绑定eip问题 2018-11-30 16:12:47 +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
邱剑 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
邱剑 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