opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-25 10:16:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,710 Commits 30 Branches 710 Tags
8fc4b2920aa4b49068ded01ff644c144fdf57504
Commit Graph
485 Commits
Author SHA1 Message Date
屈轩 7d3af78f8b 修复: webconsole参数缺失，导致yunionapi RPC调用失败 2018-12-05 20:42:37 +08:00
邱剑 3e99850231 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '79390632d02d1cd9471aac0c9c2e09c790e23f94':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
 2018-12-05 20:38:17 +08:00
邱剑 0ab310fc7d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '1e0ad11e2ad4e15dd03d10f12c89df1d5b524e89':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
 2018-12-05 20:38:17 +08:00
邱剑 1e0ad11e2a Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '3e998502317ae0b7c6e99b066ad24e2b439054dc':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
 2018-12-05 20:38:17 +08:00
屈轩 e66be4ca42 修复: webconsole参数缺失，导致yunionapi RPC调用失败 2018-12-05 20:35:53 +08:00
Qiu Jian dfb2e0e00c Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-05 18:09:11 +08:00
TangBin a0ea5fb76b sku sync add limit & offset 2018-12-05 16:09:25 +08:00
Qiu Jian 3e87c17e72 support prepaid server create and renew 2018-12-05 00:40:15 +08:00
wanyaoqi ecc750107b fix conflict 2018-12-01 16:18:11 +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
TangBin e68377729d 返回值keyfix 2018-11-30 16:24:33 +08:00
TangBin 085eebbe7e comment fix 2018-11-30 15:48:48 +08:00
TangBin 36e58a813d bugfix 2018-11-30 10:26:23 +08:00
TangBin 4cb87d487e fix conflict 2018-11-29 21:37:53 +08:00
TangBin d9d66329dc sync skus table from cloudmeta service && aws bugfix 2018-11-29 20:18:20 +08:00
Yousong Zhou 49382934e5 treewide: 保留httperrors的格式 2018-11-28 07:33:22 +00:00
李泽玺 1946accc28 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'e49180a3f5c6d1d0ab919ac7b5d28306754daf6f':
  climc: support job, statefulset, secret create
 2018-11-28 10:47:35 +08:00
Zexi Li f1fcea29f5 climc: support job, statefulset, secret create 2018-11-27 22:07:40 +08:00
屈轩 bf06bcdc8a 解决冲突 2018-11-26 16:52:02 +08:00
Yousong Zhou 2c430b4430 routetables: initial version 2018-11-23 03:17:41 +00:00
邱剑 6b7a952159 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b63d5bbb932daf5654e73c198d03b1c2ed451d85':
  refacotr: 配置建议，增加阈值参数和当前的TOP95值
 2018-11-21 10:10:15 +08:00
ningyu aece52666d refacotr: 配置建议，增加阈值参数和当前的TOP95值 2018-11-20 21:46:36 +08:00
TangBin b36f054c8a Merge branch 'release/2.4.0' into feature/tb-support-aws-2 2018-11-20 10:33:41 +08:00
TangBin 7f51e6d919 fix confilict 2018-11-20 10:33:19 +08:00
邱剑 ae804ae93c Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '088bf418796f7338a943bec0ae692e9f4221179c':
  fix: 修改未充分利用的实例列表API的climc命名，目的是避免过长不易读
  feat: 添加cloudmon模块和climc underutilizedinstances-list
 2018-11-19 21:13:22 +08:00
ningyu 5071e8ae6a feat: 添加cloudmon模块和climc underutilizedinstances-list 2018-11-19 20:56:53 +08:00
李泽玺 d6770c0073 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '2a220c7f6ebdd212a7db50a8d6dbdc18ea7ad69e':
  修正：如果policy blob错误，则无法修改和删除policy
 2018-11-12 20:41:50 +08:00
Qiu Jian c6ae93a2ea 修正：如果policy blob错误，则无法修改和删除policy 2018-11-12 20:39:54 +08:00
周有松 09b1d480d6 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ff4b6ecad93cd9c6c6d83e4fe31019c51c951d41':
  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:25 +08:00
Yousong Zhou 2e0c9741b1 mcclient: base: guard against empty repsonse 
panic: runtime error: invalid memory address or nil pointer dereference
	[signal SIGSEGV: segmentation violation code=0x1 addr=0x48 pc=0x768977]

	goroutine 1 [running]:
	yunion.io/x/onecloud/pkg/mcclient/modules.(*BaseManager)._list(0x11a8100, 0xc00026b730, 0xc0005ba0e0, 0x69, 0xb794a3, 0x14, 0x69, 0x0, 0x0)
		/home/yunion/go/src/yunion.io/x/onecloud/pkg/mcclient/modules/base.go:118 +0x1d7
	yunion.io/x/onecloud/pkg/mcclient/modules.(*ResourceManager).ListInContexts(0x11a8100, 0xc00026b730, 0xc1cbe0, 0xc00000ef28, 0x0, 0x0, 0x0, 0xc00010ad80, 0xa919c0, 0xc00010ad80)
		/home/yunion/go/src/yunion.io/x/onecloud/pkg/mcclient/modules/resource.go:254 +0x150
	yunion.io/x/onecloud/pkg/mcclient/modules.(*ResourceManager).List(0x11a8100, 0xc00026b730, 0xc1cbe0, 0xc00000ef28, 0x0, 0xc0005a79e0, 0x6)
		/home/yunion/go/src/yunion.io/x/onecloud/pkg/mcclient/modules/resource.go:239 +0x5a
	yunion.io/x/onecloud/cmd/climc/shell.init.40.func3(0xc00026b730, 0xc00010ad80, 0x0, 0x0)
		/home/yunion/go/src/yunion.io/x/onecloud/cmd/climc/shell/loadbalancerbackends.go:35 +0x7e
	reflect.Value.call(0xa7e6c0, 0xb98170, 0x13, 0xb6b4b8, 0x4, 0xc00059c120, 0x2, 0x2, 0xc000297dc8, 0xc00003c6a0, ...)
		/home/yunion/.usr/go/goroot-1.11.1/src/reflect/value.go:447 +0x449
	reflect.Value.Call(0xa7e6c0, 0xb98170, 0x13, 0xc00059c120, 0x2, 0x2, 0x1, 0x2, 0x18)
		/home/yunion/.usr/go/goroot-1.11.1/src/reflect/value.go:308 +0xa4
	yunion.io/x/onecloud/vendor/yunion.io/x/structarg.(*SubcommandArgument).Invoke(0xc000174620, 0xc0005a7e60, 0x2, 0x2, 0xa67760, 0xc000297db0)
		/home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/structarg/structarg.go:702 +0x1fb
	main.executeSubcommand(0xc000174620, 0xc0000f19d0, 0xc000174540, 0xc000262ab0)
		/home/yunion/go/src/yunion.io/x/onecloud/cmd/climc/climc.go:220 +0xcf
	main.main()
		/home/yunion/go/src/yunion.io/x/onecloud/cmd/climc/climc.go:271 +0x256
 2018-11-08 12:21:51 +00:00
邱剑 7db5cee6f0 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'cded919ce0b585b99e398f5adcbcc2d37caa5798':
  Image添加description字段
 2018-11-08 01:44:23 +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
Qiu Jian 4d43fcd39c 增加server sku资源，还需要和创建资源流程，以及公有云接口改造支持 2018-11-07 15:47:46 +08:00
Qiu Jian 7208814421 修正：policy删除报错找不到blob 2018-11-05 18:33:10 +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
Qiu Jian bf456729fe 1. 
mcclient.resource增加readfilter和writerfilter，允许为resource增加自定义字段
2. 增加mcclient的获取的缓存，方便缓存mcclient拉取资源
 2018-11-03 19:53:53 +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
Qiu Jian c303afcb46 增加keystone project add tag接口支持 2018-11-01 22:30:13 +08:00
Zexi Li c2e628d6ef climc: helm release app 2018-11-01 16:31:29 +08:00
邱剑 c6a13a6326 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '614768215739d1bc846c839a77fd55abee123c97':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:34 +08:00
邱剑 8e17da94f6 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c6a13a63265d09ce4f78d6c6e5bd5e71c0277fa0':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:34 +08:00
邱剑 6147682157 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'fd4bc440f259874c3dd152ebe211408b1d820df2':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:33 +08:00
TangBin b64c6dc736 bugfix 2018-10-30 19:57:21 +08:00
TangBin 97c06ee0bf add rpc batch host create 2018-10-30 19:36:15 +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 751f0b39cb change-project-type 2018-10-30 09:14:24 +08:00