opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
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
TangBin 19afa629e6 InstanceTypeCategory chaset 2018-12-01 11:24:19 +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
邱剑 4d45ac36eb Merge pull request #619 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/misc-bugs-on-2.4 to release/2.4.0 
* commit 'b241961dc06f480243a9f8dc4972e5498f60507c':
  fix release/2.4.0 bugs
 2018-11-30 23:08:42 +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
邱剑 d0bdc0045d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ed77d515d128b4ffcf2dde6d2948a1c2e3af3f3c':
  大部分公有云不需要将安全组拆分为单个单个的规则
 2018-11-30 23:04:04 +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
邱剑 31f7129b50 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'bfed7c25c3035163336f4e9cad7c157b91fdbe3a':
  修复同步规则缺失问题
  磁盘名称为未命名时使用磁盘ID
  补充腾讯云webconsole
 2018-11-30 20:06:10 +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
wanyaoqi b241961dc0 fix release/2.4.0 bugs 2018-11-30 17:13:30 +08:00
屈轩 45ddeaf084 补充腾讯云webconsole 2018-11-30 17:08:39 +08:00
邱剑 c9fb4364b4 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'de281472b02ce19a23d03cf50836d130ea67abd4':
  修复密钥对同步问题及绑定eip问题
 2018-11-30 16:41:43 +08:00
邱剑 837e35f149 Merge pull request #617 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-use-cloudmeta to release/2.4.0 
* commit 'e68377729d150ef3ae54d7bfc69983263b6b9b2f':
  返回值keyfix
 2018-11-30 16:41:21 +08:00
TangBin e68377729d 返回值keyfix 2018-11-30 16:24:33 +08:00
屈轩 3e6c9d7496 修复密钥对同步问题及绑定eip问题 2018-11-30 16:12:47 +08:00
邱剑 f18c9a3289 Merge pull request #605 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-use-cloudmeta to release/2.4.0 
* commit 'c8bb6ff9f713bf78918b8dcdaaffbe3e802213b6':
  fix sku nil errror
  comment fix
  bugfix
  sync skus table from cloudmeta service && aws bugfix
  remove useless method
 2018-11-30 16:11:25 +08:00
邱剑 549fbbb6b1 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f9899a6e59c7b3ab1ef9581e7fe4340da22225b1':
  忽略known_hosts影响
 2018-11-30 16:05:02 +08:00
屈轩 7caeab976c 忽略known_hosts影响 2018-11-30 16:04:08 +08:00
TangBin c8bb6ff9f7 fix sku nil errror 2018-11-30 16:00:37 +08:00
邱剑 84ca24fed0 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '70c2b8255796b292a3fe91788b6dc0486a24aec3':
  忽略known_hosts记录
 2018-11-30 15:48:50 +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
TangBin 085eebbe7e comment fix 2018-11-30 15:48:48 +08:00
屈轩 0e68f6d486 冲突解决 2018-11-30 15:33:33 +08:00
邱剑 8641b69255 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '7f02eaa982022767dcc004b8f70b61415baf66f0':
  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
邱剑 5d3006c971 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b4150df337286fbfa40597d7247a8e9b594f152c':
  修正rbac，非管理模式下权限有deny, owner, user, guest四个级别，管理模式下，有deny, allow两个级别。只有非管理模式下，才会应用缺省的权限设置。
 2018-11-30 13:56:01 +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
邱剑 6e9f010fa9 Merge pull request #604 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/guest-backup to release/2.4.0 
* commit '976411c10fd70fa0a0efc285aa1b07157307038a':
  fix code
 2018-11-30 12:20:43 +08:00
邱剑 18b6944fd8 Merge pull request #599 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/v2-add-misc-handler to release/2.4.0 
* commit 'bcaa0bf4f66195297f53cc52a38f3da21a5f5093':
  add configure rbd storage
  add misc handler, register baremetal handler; change the monitor request to POST
 2018-11-30 12:20:32 +08:00
Yousong Zhou 3213cf047a webconsole: 修正httperrors.GeneralServerError调用 2018-11-30 03:07:01 +00:00