opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,561 Commits 27 Branches 687 Tags
3e87c17e720b6c1d2a040c17dbe85b0d25438ae6
Commit Graph
1663 Commits
Author SHA1 Message Date
Qiu Jian 3e87c17e72 support prepaid server create and renew 2018-12-05 00:40:15 +08:00
Qiu Jian c54c102541 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-03 17:31:40 +08:00
邱剑 5be54bad55 Merge pull request #639 in YUNIONIO/onecloud from release/2.3.0 to release/2.4.0 
* commit '37578c8a6ddaf8c0f4b6b65a9bad9552aba3b201':
  修复规则缺失优先级及描述信息
 2018-12-03 15:12:43 +08:00
邱剑 37578c8a6d Merge pull request #638 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-rule to release/2.3.0 
* commit '5c6a5c937516575dc5336d672dd083dd7a99f9d7':
  修复规则缺失优先级及描述信息
 2018-12-03 15:08:47 +08:00
Qiu Jian b3d8936a80 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181203-1 
Conflicts:
	Gopkg.lock
 2018-12-03 15:08:03 +08:00
邱剑 a906b1827e Merge pull request #636 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-usercred-policy-fail-task to release/2.3.0 
* commit '9ca04590c35e82070ef2d7636206ce985354119c':
  update vendor
  修正：SPolicyCredential导致task失败
 2018-12-03 14:54:49 +08:00
屈轩 5c6a5c9375 修复规则缺失优先级及描述信息 2018-12-03 12:19:54 +08:00
Qiu Jian fe7d54e6cb fix aws missing init 2018-12-03 07:36:30 +08:00
Qiu Jian de7ca3a589 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181203 
Conflicts:
	pkg/compute/hostdrivers/aliyun.go
	pkg/compute/hostdrivers/aws.go
	pkg/compute/hostdrivers/azure.go
	pkg/compute/hostdrivers/qcloud.go
 2018-12-03 07:34:11 +08:00
邱剑 34f0a20bef Merge pull request #630 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-validate-create-disk to release/2.3.0 
* commit '719a8a1db572243337194fc71c58cc12357ae075':
  检查磁盘扩容大小
  检查公有云磁盘创建限制
 2018-12-03 07:19:38 +08:00
Qiu Jian c292a1e311 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181203 
Conflicts:
	pkg/compute/models/storages.go
 2018-12-03 07:18:27 +08:00
Qiu Jian 94fcb7a400 修正：SPolicyCredential导致task失败 2018-12-03 07:14:43 +08:00
邱剑 b9a931d015 Merge pull request #634 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/resolve-conflict-20181201 to release/2.4.0 
* commit 'ecc750107b4f25c738ad8f15fa9ab615e9cc36de':
  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-03 07:13:48 +08:00
Qiu Jian 7aa31407a7 temp commit 2018-12-02 02:11:50 +08:00
wanyaoqi 93100dd305 fix import not use and not enough arguments in call 2018-12-01 16:24:18 +08:00
wanyaoqi ecc750107b fix conflict 2018-12-01 16:18:11 +08:00
屈轩 719a8a1db5 检查磁盘扩容大小 2018-12-01 15:50:00 +08:00
邱剑 f30c79d969 Merge pull request #629 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-kvm-sku-support to release/2.4.0 
* commit '8d4266afad4f0174ed88f6586857a070de921a5f':
  bugfix
  skus update
  InstanceTypeCategory chaset
 2018-12-01 15:00:00 +08:00
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
Qiu Jian 6b19a7a1e8 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181201 
Conflicts:
	pkg/compute/guestdrivers/azure.go
	pkg/compute/guestdrivers/managedvirtual.go
	pkg/compute/guestdrivers/qcloud.go
	pkg/compute/models/guest_actions.go
 2018-12-01 14:19:53 +08:00
屈轩 7b2fed8d85 检查公有云磁盘创建限制 2018-12-01 13:05:02 +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
TangBin 8d4266afad bugfix 2018-12-01 12:52:40 +08:00
TangBin cec80f4a62 skus update 2018-12-01 12:47:21 +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
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