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
1,584 Commits 27 Branches 687 Tags
07ddd4651e5affc8a018e69b8d4970211ea2cd82
Commit Graph
1055 Commits
Author SHA1 Message Date
邱剑 07ddd4651e Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '9dcfc7215cea837fc60c7fe32c0c8217c572d205':
  添加Azure挂载磁盘时允许的虚机状态
 2018-11-10 17:58:15 +08:00
邱剑 9dcfc7215c Merge pull request #458 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-auzre-attach-disk to release/2.2.0 
* commit '22c8899f9c0860effc50091268d53225d39b89b9':
  添加Azure挂载磁盘时允许的虚机状态
 2018-11-10 17:58:15 +08:00
屈轩 22c8899f9c 添加Azure挂载磁盘时允许的虚机状态 2018-11-10 15:32:18 +08:00
邱剑 0b384660a4 Merge pull request #447 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-admin-capable-test to release/2.3.0 
* commit 'dbab380d734d0de1684f5cb4472869d5d981d773':
  增加climc policy-admin-capable命令
 2018-11-10 15:30:57 +08:00
邱剑 9c91085004 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '12a03a8f7deea52a25b293a9cf6ba5012359e636':
  避免调度到Azure经典类型主机上
 2018-11-10 15:30:31 +08:00
邱剑 13d38e8029 Merge pull request #456 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.3.0 to release/2.3.0 
* commit '650a166e604e08d9ba52828e32c29e5531542d16':
  挂载磁盘失败时自动解除与虚机的关系
 2018-11-10 15:29:28 +08:00
屈轩 84559581d4 避免调度到Azure经典类型主机上 2018-11-10 15:28:22 +08:00
屈轩 650a166e60 解决冲突 2018-11-10 14:38:28 +08:00
李泽玺 bd548462a4 Merge pull request #452 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-scheduler-extender to release/2.3.0 
* commit '95f49ead841ef7918c5d7d7a96f05806dc13902f':
  scheduler: k8s scheduler extender
 2018-11-10 14:32:43 +08:00
邱剑 04578af02d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '2e7c12ba1bc21d9b50a7c00956d05e1971382f9f':
  挂载磁盘失败时自动解除与虚机的关系
 2018-11-10 14:31:12 +08:00
屈轩 46752230df 添加腾讯云可挂载磁盘虚机状态 2018-11-10 14:20:08 +08:00
屈轩 89574e954a 挂载磁盘失败时自动解除与虚机的关系 2018-11-10 13:55:21 +08:00
邱剑 492469887b Merge pull request #431 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-qcloud to release/2.3.0 
* commit 'aab792ffa8ee7f873ab24d5d9ae66bc7ef3ec548':
  添加部分aliyun操作
  支持腾讯云资源导入
 2018-11-10 13:35:05 +08:00
Zexi Li 95f49ead84 scheduler: k8s scheduler extender 2018-11-10 13:27:00 +08:00
邱剑 fb6d1082af Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '182db4cd4e16a384be25ad05ffbe63df2a7f3efa':
  跟随主机创建的磁盘，跟随主机删除
  fix: reverseproxy out of fds
 2018-11-09 20:40:20 +08:00
邱剑 182db4cd4e Merge pull request #451 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-auto-delete to release/2.2.0 
* commit 'd73fd872273ea885334ffdfe8496a49cbeb6d936':
  跟随主机创建的磁盘，跟随主机删除
 2018-11-09 20:40:19 +08:00
屈轩 d73fd87227 跟随主机创建的磁盘，跟随主机删除 2018-11-09 20:30:56 +08:00
邱剑 ee088a9b52 Merge pull request #444 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-workermanager-bugs to release/2.3.0 
* commit '77ed2af387c5863f9d8447150ea916f704330983':
  minor fixes
  修正：1. panic后不返回500 2. 超时还会阻塞worker
 2018-11-09 17:27:50 +08:00
Zexi Li 88fdb47fb6 resolve confict 2018-11-09 17:18:17 +08:00
邱剑 568b46f209 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e5a2a9e850720c398a9f3b6f7ac863a519bd8f77':
  fix: reverseproxy out of fds
 2018-11-09 17:14:39 +08:00
Zexi Li df1e3f1d47 fix: reverseproxy out of fds 2018-11-09 16:43:01 +08:00
Qiu Jian dbab380d73 增加climc policy-admin-capable命令 2018-11-09 15:52:46 +08:00
邱剑 f98c3275ba Merge pull request #446 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181109-2.3.0 to release/2.3.0 
* commit 'd00dd6c42aa191521031653242cf01d2a4c058b3':
  optimize export list make dep
 2018-11-09 15:39:50 +08:00
周有松 ff4b6ecad9 Merge pull request #441 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit '09e511883cf481bf8142ee9ed3f0892fe1418821':
  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:24 +08:00
Qiu Jian d00dd6c42a Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181109-2.3.0 
Conflicts:
	Gopkg.lock
	pkg/cloudcommon/db/modelbase.go
 2018-11-09 12:37:21 +08:00
Qiu Jian 77ed2af387 minor fixes 2018-11-09 12:28:18 +08:00
邱剑 9f4ff99db8 Merge pull request #415 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/export-list-optimize to release/2.2.0 
* commit '721ac4b9121752ee1f47401f10e2af8ade8af382':
  optimize export list make dep
 2018-11-09 12:21:17 +08:00
wanyaoqi 721ac4b912 optimize export list 
make dep
 2018-11-09 11:55:31 +08:00
Qiu Jian caf0e3c36f 修正：1. panic后不返回500 2. 超时还会阻塞worker 2018-11-09 11:17:14 +08:00
Yousong Zhou 09e511883c cloudcommon: validators: return 400 for struct validation failure 2018-11-08 15:54:38 +00:00
Yousong Zhou 73ec3d67fa loadbalancers: show loadbalancer name for listener and backend group 2018-11-08 15:37:48 +00:00
Yousong Zhou 13bc224202 mcclient: loadbalancers: allow updating names 
- loadbalanceracls: allow updating only name
 2018-11-08 15:37:48 +00:00
Yousong Zhou 24172a26f4 loadbalancers: more compact backendGroup validation 2018-11-08 15:37:48 +00:00
Yousong Zhou 9a73d5c095 lbagent: list with details=true explicitly 
Previously we depend on .Params() of mcclient to set it for us.  Set it
explicitly just in case
 2018-11-08 15:37:48 +00:00
Yousong Zhou 7acc86b021 lbagent: fix unused imports 2018-11-08 15:37:48 +00:00
Yousong Zhou 9388748e45 pkg: httputils: ParseJSONResponse(): rewrite for clearness 
Make it more clear that it's possible the function can return with
body==nil and err==nil
 2018-11-08 15:36:24 +00:00
邱剑 0b08b4a3eb Merge pull request #443 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-config-node-docker to release/2.3.0 
* commit '5fae00ed962bd7aabe2f0152ed2ddff4a3d7821c':
  climc: allow config k8s node docker registry
 2018-11-08 20:54:24 +08:00
Zexi Li 5fae00ed96 climc: allow config k8s node docker registry 2018-11-08 20:29:32 +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
Yousong Zhou 25641f49c9 mcclient: options: set details correctly 
details=false is already the default
 2018-11-08 12:21:51 +00:00
邱剑 8ce134fc7e Merge pull request #438 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-tenant to release/2.3.0 
* commit '77128909aeeece8cca66c7ff11366897b70ab050':
  同步安全组规则时携带项目信息
 2018-11-08 20:04:07 +08:00
邱剑 4b4dd155c7 Merge pull request #436 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-rbac-owner-privilege to release/2.3.0 
* commit '1d0ad17e360de5bf7ac772d4e721985453be9708':
  fix format
  修正：增加owner级别权限，放置普通用户可以访问系统资源
 2018-11-08 19:59:50 +08:00
Zexi Li 6bf33cfed5 region: server-list add cdrom 2018-11-08 19:21:47 +08:00
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
邱剑 78b8294a82 Merge pull request #439 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-create-container-no-disk to release/2.3.0 
* commit 'e9095d4b1ba06de34c9e5b4acf3c584d1b2f73bd':
  region: no disks created when create container
 2018-11-08 11:59:16 +08:00
Zexi Li e9095d4b1b region: no disks created when create container 2018-11-08 11:55:13 +08:00
Qiu Jian 1d0ad17e36 fix format 2018-11-08 11:39:48 +08:00
屈轩 77128909ae Merge branch 'release/2.3.0' of ssh://git.yunion.io/yunionio/onecloud into bugfix/qx-secgroup-tenant 2018-11-08 11:37:17 +08:00
屈轩 be3e4c6e38 同步安全组规则时携带项目信息 2018-11-08 11:31:17 +08:00
邱剑 0e5c80e35f Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '1df1be46a8fd98a63360b191dfe21eb3863bd3f1':
  同步安全组规则时携带项目信息
 2018-11-08 11:26:48 +08:00